* [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-25 17:03 ` Łukasz Stelmach
0 siblings, 0 replies; 57+ messages in thread
From: Łukasz Stelmach @ 2020-08-25 17:03 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Krzysztof Kozlowski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree
Cc: b.zolnierkie, Łukasz Stelmach, m.szyprowski
ASIX AX88796[1] is a versatile ethernet adapter chip, that can be
connected to a CPU with a 8/16-bit bus or with an SPI. This driver
supports SPI connection.
The driver has been ported from the vendor kernel for ARTIK5[2]
boards. Several changes were made to adapt it to the current kernel
which include:
+ updated DT configuration,
+ clock configuration moved to DT,
+ new timer, ethtool and gpio APIs
+ dev_* instead of pr_* and custom printk() wrappers.
[1] https://www.asix.com.tw/products.php?op=pItemdetail&PItemID=104;65;86&PLine=65
[2] https://git.tizen.org/cgit/profile/common/platform/kernel/linux-3.10-artik/
The other ax88796 driver is for NE2000 compatible AX88796L chip. These
chips are not compatible. Hence, two separate drivers are required.
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/asix/Kconfig | 20 +
drivers/net/ethernet/asix/Makefile | 6 +
drivers/net/ethernet/asix/ax88796c_ioctl.c | 293 +++++
drivers/net/ethernet/asix/ax88796c_ioctl.h | 21 +
drivers/net/ethernet/asix/ax88796c_main.c | 1373 ++++++++++++++++++++
drivers/net/ethernet/asix/ax88796c_main.h | 596 +++++++++
drivers/net/ethernet/asix/ax88796c_spi.c | 103 ++
drivers/net/ethernet/asix/ax88796c_spi.h | 67 +
10 files changed, 2481 insertions(+)
create mode 100644 drivers/net/ethernet/asix/Kconfig
create mode 100644 drivers/net/ethernet/asix/Makefile
create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.c
create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.h
create mode 100644 drivers/net/ethernet/asix/ax88796c_main.c
create mode 100644 drivers/net/ethernet/asix/ax88796c_main.h
create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.c
create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.h
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index de50e8b9e656..f3b218e45ea5 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -32,6 +32,7 @@ source "drivers/net/ethernet/apm/Kconfig"
source "drivers/net/ethernet/apple/Kconfig"
source "drivers/net/ethernet/aquantia/Kconfig"
source "drivers/net/ethernet/arc/Kconfig"
+source "drivers/net/ethernet/asix/Kconfig"
source "drivers/net/ethernet/atheros/Kconfig"
source "drivers/net/ethernet/aurora/Kconfig"
source "drivers/net/ethernet/broadcom/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index f8f38dcb5f8a..9eb368d93607 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_NET_XGENE) += apm/
obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
obj-$(CONFIG_NET_VENDOR_AQUANTIA) += aquantia/
obj-$(CONFIG_NET_VENDOR_ARC) += arc/
+obj-$(CONFIG_NET_VENDOR_ASIX) += asix/
obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/
obj-$(CONFIG_NET_VENDOR_CADENCE) += cadence/
diff --git a/drivers/net/ethernet/asix/Kconfig b/drivers/net/ethernet/asix/Kconfig
new file mode 100644
index 000000000000..4b127a4a659a
--- /dev/null
+++ b/drivers/net/ethernet/asix/Kconfig
@@ -0,0 +1,20 @@
+#
+# Asix network device configuration
+#
+
+config NET_VENDOR_ASIX
+ bool "Asix devices"
+ depends on SPI
+ help
+ If you have a network (Ethernet) interface based on a chip from ASIX, say Y
+
+if NET_VENDOR_ASIX
+
+config SPI_AX88796C
+ tristate "Asix AX88796C-SPI support"
+ depends on SPI
+ depends on GPIOLIB
+ help
+ Say Y here if you intend to attach a Asix AX88796C as SPI mode
+
+endif # NET_VENDOR_ASIX
diff --git a/drivers/net/ethernet/asix/Makefile b/drivers/net/ethernet/asix/Makefile
new file mode 100644
index 000000000000..0bfbbb042634
--- /dev/null
+++ b/drivers/net/ethernet/asix/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Asix network device drivers.
+#
+
+obj-$(CONFIG_SPI_AX88796C) += ax88796c.o
+ax88796c-y := ax88796c_main.o ax88796c_ioctl.o ax88796c_spi.o
diff --git a/drivers/net/ethernet/asix/ax88796c_ioctl.c b/drivers/net/ethernet/asix/ax88796c_ioctl.c
new file mode 100644
index 000000000000..eba361e2a8b7
--- /dev/null
+++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
@@ -0,0 +1,293 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2010 ASIX Electronics Corporation
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * ASIX AX88796C SPI Fast Ethernet Linux driver
+ */
+
+#include "ax88796c_main.h"
+#include "ax88796c_spi.h"
+#include "ax88796c_ioctl.h"
+
+u8 ax88796c_check_power(struct ax88796c_device *ax_local)
+{
+ struct spi_status ax_status;
+
+ /* Check media link status first */
+ if (netif_carrier_ok(ax_local->ndev) ||
+ (ax_local->ps_level == AX_PS_D0) ||
+ (ax_local->ps_level == AX_PS_D1)) {
+ return 0;
+ }
+
+ AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
+ if (!(ax_status.status & AX_STATUS_READY))
+ return 1;
+
+ return 0;
+}
+
+u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local)
+{
+ struct spi_status ax_status;
+ unsigned long start_time;
+
+ /* Check media link status first */
+ if (netif_carrier_ok(ax_local->ndev) ||
+ (ax_local->ps_level == AX_PS_D0) ||
+ (ax_local->ps_level == AX_PS_D1)) {
+ return 0;
+ }
+
+ AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
+ if (!(ax_status.status & AX_STATUS_READY)) {
+
+ /* AX88796C in power saving mode */
+ AX_WAKEUP(&ax_local->ax_spi);
+
+ /* Check status */
+ start_time = jiffies;
+ do {
+ if (time_after(jiffies, start_time + HZ/2)) {
+ netdev_err(ax_local->ndev,
+ "timeout waiting for wakeup"
+ " from power saving\n");
+ break;
+ }
+
+ AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
+
+ } while (!(ax_status.status & AX_STATUS_READY));
+
+ ax88796c_set_power_saving(ax_local, AX_PS_D0);
+
+ return 1;
+ }
+
+ return 0;
+}
+
+void ax88796c_set_power_saving(struct ax88796c_device *ax_local, u8 ps_level)
+{
+ u16 pmm;
+
+ if (ps_level == AX_PS_D1)
+ pmm = PSCR_PS_D1;
+ else if (ps_level == AX_PS_D2)
+ pmm = PSCR_PS_D2;
+ else
+ pmm = PSCR_PS_D0;
+
+ AX_WRITE(&ax_local->ax_spi, (AX_READ(&ax_local->ax_spi, P0_PSCR)
+ & PSCR_PS_MASK) | pmm, P0_PSCR);
+}
+
+int ax88796c_mdio_read(struct net_device *ndev, int phy_id, int loc)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ unsigned long start_time;
+
+ AX_WRITE(&ax_local->ax_spi, MDIOCR_RADDR(loc)
+ | MDIOCR_FADDR(phy_id) | MDIOCR_READ, P2_MDIOCR);
+
+ start_time = jiffies;
+ while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
+ if (time_after(jiffies, start_time + HZ/100))
+ return -EBUSY;
+ }
+
+ return AX_READ(&ax_local->ax_spi, P2_MDIODR);
+}
+
+void
+ax88796c_mdio_write(struct net_device *ndev, int phy_id, int loc, int val)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ unsigned long start_time;
+
+ AX_WRITE(&ax_local->ax_spi, val, P2_MDIODR);
+
+ AX_WRITE(&ax_local->ax_spi,
+ MDIOCR_RADDR(loc) | MDIOCR_FADDR(phy_id)
+ | MDIOCR_WRITE, P2_MDIOCR);
+
+ start_time = jiffies;
+ while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
+ if (time_after(jiffies, start_time + HZ/100))
+ return;
+ }
+
+ if (loc == MII_ADVERTISE) {
+ AX_WRITE(&ax_local->ax_spi, (BMCR_FULLDPLX | BMCR_ANRESTART |
+ BMCR_ANENABLE | BMCR_SPEED100), P2_MDIODR);
+ AX_WRITE(&ax_local->ax_spi, (MDIOCR_RADDR(MII_BMCR) |
+ MDIOCR_FADDR(phy_id) | MDIOCR_WRITE),
+ P2_MDIOCR);
+
+ start_time = jiffies;
+ while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR)
+ & MDIOCR_VALID) == 0) {
+ if (time_after(jiffies, start_time + HZ/100))
+ return;
+ }
+ }
+}
+
+void ax88796c_set_csums(struct ax88796c_device *ax_local)
+{
+ if (ax_local->checksum & AX_RX_CHECKSUM) {
+ AX_WRITE(&ax_local->ax_spi, COERCR0_DEFAULT, P4_COERCR0);
+ AX_WRITE(&ax_local->ax_spi, COERCR1_DEFAULT, P4_COERCR1);
+ } else {
+ AX_WRITE(&ax_local->ax_spi, 0, P4_COERCR0);
+ AX_WRITE(&ax_local->ax_spi, 0, P4_COERCR1);
+ }
+
+ if (ax_local->checksum & AX_TX_CHECKSUM) {
+ AX_WRITE(&ax_local->ax_spi, COETCR0_DEFAULT, P4_COETCR0);
+ AX_WRITE(&ax_local->ax_spi, COETCR1_TXPPPE, P4_COETCR1);
+ } else {
+ AX_WRITE(&ax_local->ax_spi, 0, P4_COETCR0);
+ AX_WRITE(&ax_local->ax_spi, 0, P4_COETCR1);
+ }
+}
+
+static void ax88796c_get_drvinfo(struct net_device *ndev,
+ struct ethtool_drvinfo *info)
+{
+ /* Inherit standard device info */
+ strncpy(info->driver, DRV_NAME, sizeof(info->driver));
+ strncpy(info->version, DRV_VERSION, sizeof(info->version));
+}
+
+static u32 ax88796c_get_link(struct net_device *ndev)
+{
+ u32 link;
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ u8 power;
+
+ down(&ax_local->spi_lock);
+ power = ax88796c_check_power_and_wake(ax_local);
+
+ link = mii_link_ok(&ax_local->mii);
+
+ if (power)
+ ax88796c_set_power_saving(ax_local, ax_local->ps_level);
+ up(&ax_local->spi_lock);
+
+ return link;
+
+
+}
+
+static u32 ax88796c_get_msglevel(struct net_device *ndev)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ return ax_local->msg_enable;
+}
+
+static void ax88796c_set_msglevel(struct net_device *ndev, u32 level)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ ax_local->msg_enable = level;
+}
+
+
+static int
+ax88796c_get_link_ksettings(struct net_device *ndev,
+ struct ethtool_link_ksettings *cmd)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ u8 power;
+
+ down(&ax_local->spi_lock);
+ power = ax88796c_check_power_and_wake(ax_local);
+
+ mii_ethtool_get_link_ksettings(&ax_local->mii, cmd);
+
+ if (power)
+ ax88796c_set_power_saving(ax_local, ax_local->ps_level);
+ up(&ax_local->spi_lock);
+
+ return 0;
+}
+
+static int
+ax88796c_set_link_ksettings(struct net_device *ndev,
+ const struct ethtool_link_ksettings *cmd)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ u8 power;
+
+ down(&ax_local->spi_lock);
+ power = ax88796c_check_power_and_wake(ax_local);
+
+ mii_ethtool_set_link_ksettings(&ax_local->mii, cmd);
+
+ if (power)
+ ax88796c_set_power_saving(ax_local, ax_local->ps_level);
+ up(&ax_local->spi_lock);
+ return 0;
+
+}
+
+static int ax88796c_nway_reset(struct net_device *ndev)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ int ret;
+ u8 power;
+
+ down(&ax_local->spi_lock);
+ power = ax88796c_check_power_and_wake(ax_local);
+
+ ret = mii_nway_restart(&ax_local->mii);
+
+ if (power)
+ ax88796c_set_power_saving(ax_local, ax_local->ps_level);
+ up(&ax_local->spi_lock);
+ return ret;
+}
+
+static u32 ax88796c_ethtool_getmsglevel(struct net_device *ndev)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ return ax_local->msg_enable;
+}
+
+static void ax88796c_ethtool_setmsglevel(struct net_device *ndev, u32 level)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ ax_local->msg_enable = level;
+}
+
+struct ethtool_ops ax88796c_ethtool_ops = {
+ .get_drvinfo = ax88796c_get_drvinfo,
+ .get_link = ax88796c_get_link,
+ .get_msglevel = ax88796c_get_msglevel,
+ .set_msglevel = ax88796c_set_msglevel,
+ .get_link_ksettings = ax88796c_get_link_ksettings,
+ .set_link_ksettings = ax88796c_set_link_ksettings,
+ .nway_reset = ax88796c_nway_reset,
+ .get_msglevel = ax88796c_ethtool_getmsglevel,
+ .set_msglevel = ax88796c_ethtool_setmsglevel,
+};
+
+int ax88796c_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ int ret;
+ u8 power;
+
+ down(&ax_local->spi_lock);
+ power = ax88796c_check_power_and_wake(ax_local);
+
+ ret = generic_mii_ioctl(&ax_local->mii, if_mii(ifr), cmd, NULL);
+
+ if (power)
+ ax88796c_set_power_saving(ax_local, ax_local->ps_level);
+ up(&ax_local->spi_lock);
+
+ return ret;
+}
+
diff --git a/drivers/net/ethernet/asix/ax88796c_ioctl.h b/drivers/net/ethernet/asix/ax88796c_ioctl.h
new file mode 100644
index 000000000000..bafd573bd813
--- /dev/null
+++ b/drivers/net/ethernet/asix/ax88796c_ioctl.h
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2010 ASIX Electronics Corporation
+ *
+ * ASIX AX88796C SPI Fast Ethernet Linux driver
+ */
+
+#ifndef _AX88796C_IOCTL_H
+#define _AX88796C_IOCTL_H
+
+extern struct ethtool_ops ax88796c_ethtool_ops;
+
+u8 ax88796c_check_power(struct ax88796c_device *ax_local);
+u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local);
+void ax88796c_set_power_saving(struct ax88796c_device *ax_local, u8 ps_level);
+int ax88796c_mdio_read(struct net_device *dev, int phy_id, int loc);
+void ax88796c_mdio_write(struct net_device *dev, int phy_id, int loc, int val);
+void ax88796c_set_csums(struct ax88796c_device *ax_local);
+int ax88796c_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
+
+#endif
diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c
new file mode 100644
index 000000000000..c28cfb931319
--- /dev/null
+++ b/drivers/net/ethernet/asix/ax88796c_main.c
@@ -0,0 +1,1373 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2010 ASIX Electronics Corporation
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * ASIX AX88796C SPI Fast Ethernet Linux driver
+ */
+
+#include "ax88796c_main.h"
+#include "ax88796c_ioctl.h"
+
+static int comp;
+static int ps_level = AX_PS_D0;
+static int msg_enable = NETIF_MSG_PROBE |
+ NETIF_MSG_LINK |
+ /* NETIF_MSG_TIMER | */
+ NETIF_MSG_RX_ERR |
+ NETIF_MSG_TX_ERR |
+ /* NETIF_MSG_TX_QUEUED | */
+ /* NETIF_MSG_INTR | */
+ /* NETIF_MSG_TX_DONE | */
+ /* NETIF_MSG_RX_STATUS | */
+ /* NETIF_MSG_PKTDATA | */
+ /* NETIF_MSG_HW | */
+ NETIF_MSG_WOL;
+
+module_param(comp, int, 0);
+MODULE_PARM_DESC(comp, "0=Non-Compression Mode, 1=Compression Mode");
+
+module_param(ps_level, int, 0);
+MODULE_PARM_DESC(ps_level,
+ "Power Saving Level (0:disable 1:level 1 2:level 2)");
+
+module_param(msg_enable, int, 0);
+MODULE_PARM_DESC(msg_enable, "Message mask (see linux/netdevice.h for bitmap)");
+
+static char *macaddr;
+module_param(macaddr, charp, 0);
+MODULE_PARM_DESC(macaddr, "MAC address");
+
+MODULE_AUTHOR("ASIX");
+MODULE_DESCRIPTION("ASIX AX88796C SPI Ethernet driver");
+MODULE_LICENSE("GPL");
+
+static void ax88796c_dump_regs(struct ax88796c_device *ax_local)
+{
+ struct net_device *ndev = ax_local->ndev;
+ u8 i, j;
+
+ netdev_info(ndev,
+ " Page0 Page1 Page2 Page3 "
+ "Page4 Page5 Page6 Page7\n");
+ for (i = 0; i < 0x20; i += 2) {
+ netdev_info(ndev, "0x%02x ", i);
+ for (j = 0; j < 8; j++) {
+ netdev_info(ndev, "0x%04x ",
+ AX_READ(&ax_local->ax_spi, j * 0x20 + i));
+ }
+ netdev_info(ndev, "\n");
+ }
+ netdev_info(ndev, "\n");
+}
+
+static void ax88796c_dump_phy_regs(struct ax88796c_device *ax_local)
+{
+ struct net_device *ndev = ax_local->ndev;
+ int i;
+
+ netdev_info(ndev, "Dump PHY registers:\n");
+ for (i = 0; i < 6; i++) {
+ netdev_info(ndev, " MR%d = 0x%04x\n", i,
+ ax88796c_mdio_read(ax_local->ndev,
+ ax_local->mii.phy_id, i));
+ }
+}
+
+static void ax88796c_watchdog(struct ax88796c_device *ax_local)
+{
+ struct net_device *ndev = ax_local->ndev;
+ u16 phy_status;
+ unsigned long time_to_chk = AX88796C_WATCHDOG_PERIOD;
+
+ if (ax88796c_check_power(ax_local)) {
+ mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
+ return;
+ }
+
+ ax88796c_set_power_saving(ax_local, AX_PS_D0);
+
+ phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
+ if (phy_status & PSCR_PHYLINK) {
+
+ ax_local->w_state = ax_nop;
+ time_to_chk = 0;
+
+ } else if (!(phy_status & PSCR_PHYCOFF)) {
+ /* The ethernet cable has been plugged */
+ if (ax_local->w_state == chk_cable) {
+ if (netif_msg_timer(ax_local))
+ netdev_info(ndev, "Cable connected\n");
+
+ ax_local->w_state = chk_link;
+ ax_local->w_ticks = 0;
+ } else {
+ if (netif_msg_timer(ax_local))
+ netdev_info(ndev, "Check media status\n");
+
+ if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
+ if (netif_msg_timer(ax_local))
+ netdev_info(ndev, "Restart autoneg\n");
+ ax88796c_mdio_write(ndev,
+ ax_local->mii.phy_id, MII_BMCR,
+ (BMCR_SPEED100 | BMCR_ANENABLE |
+ BMCR_ANRESTART));
+
+ if (netif_msg_hw(ax_local))
+ ax88796c_dump_phy_regs(ax_local);
+ ax_local->w_ticks = 0;
+ }
+ }
+ } else {
+ if (netif_msg_timer(ax_local))
+ netdev_info(ndev, "Check cable status\n");
+
+ ax_local->w_state = chk_cable;
+ }
+
+ ax88796c_set_power_saving(ax_local, ax_local->ps_level);
+
+ if (time_to_chk)
+ mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
+}
+
+static void ax88796c_watchdog_timer(struct timer_list *t)
+{
+ struct ax88796c_device *ax_local = from_timer(ax_local, t, watchdog);
+ //struct net_device *ndev = ax_local->ndev;
+
+ set_bit(EVENT_WATCHDOG, &ax_local->flags);
+ queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
+}
+
+static int ax88796c_soft_reset(struct ax88796c_device *ax_local)
+{
+ unsigned long start;
+ u16 temp;
+
+ AX_WRITE(&ax_local->ax_spi, PSR_RESET, P0_PSR);
+ AX_WRITE(&ax_local->ax_spi, PSR_RESET_CLR, P0_PSR);
+
+ start = jiffies;
+ while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
+ if (time_after(jiffies, start + (160 * HZ / 1000))) {
+ dev_err(&ax_local->spi->dev,
+ "timeout waiting for reset completion\n");
+ return -1;
+ }
+ }
+
+ temp = AX_READ(&ax_local->ax_spi, P4_SPICR);
+ if (ax_local->capabilities & AX_CAP_COMP) {
+ AX_WRITE(&ax_local->ax_spi,
+ (temp | SPICR_RCEN | SPICR_QCEN), P4_SPICR);
+ ax_local->ax_spi.comp = 1;
+ } else {
+ AX_WRITE(&ax_local->ax_spi,
+ (temp & ~(SPICR_RCEN | SPICR_QCEN)), P4_SPICR);
+ ax_local->ax_spi.comp = 0;
+ }
+
+ return 0;
+}
+
+static int ax88796c_reload_eeprom(struct ax88796c_device *ax_local)
+{
+ unsigned long start;
+
+ AX_WRITE(&ax_local->ax_spi, EECR_RELOAD, P3_EECR);
+
+ start = jiffies;
+ while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
+ if (time_after(jiffies, start + (2 * HZ / 100))) {
+ dev_err(&ax_local->spi->dev,
+ "timeout waiting for reload eeprom\n");
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+static void ax88796c_set_hw_multicast(struct net_device *ndev)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ u16 rx_ctl = RXCR_AB;
+ int mc_count = netdev_mc_count(ndev);
+
+ memset(ax_local->multi_filter, 0, AX_MCAST_FILTER_SIZE);
+
+ if (ndev->flags & IFF_PROMISC) {
+ rx_ctl |= RXCR_PRO;
+
+ } else if (ndev->flags & IFF_ALLMULTI
+ || mc_count > AX_MAX_MCAST) {
+ rx_ctl |= RXCR_AMALL;
+
+ } else if (mc_count == 0) {
+ /* just broadcast and directed */
+ } else {
+ u32 crc_bits;
+ int i;
+ struct netdev_hw_addr *ha;
+ netdev_for_each_mc_addr(ha, ndev) {
+ crc_bits = ether_crc(ETH_ALEN, ha->addr);
+ ax_local->multi_filter[crc_bits >> 29] |=
+ (1 << ((crc_bits >> 26) & 7));
+ }
+
+ for (i = 0; i < 4; i++) {
+ AX_WRITE(&ax_local->ax_spi,
+ ((ax_local->multi_filter[i*2+1] << 8) |
+ ax_local->multi_filter[i*2]), P3_MFAR(i));
+
+ }
+ }
+
+ AX_WRITE(&ax_local->ax_spi, rx_ctl, P2_RXCR);
+
+}
+
+#if 0
+static void ax88796c_set_multicast(struct net_device *ndev)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+
+ set_bit(EVENT_SET_MULTI, &ax_local->flags);
+ queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
+}
+#endif
+
+static void ax88796c_set_mac_addr(struct net_device *ndev)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+
+ AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[4] << 8) |
+ (u16)ndev->dev_addr[5]), P3_MACASR0);
+ AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[2] << 8) |
+ (u16)ndev->dev_addr[3]), P3_MACASR1);
+ AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[0] << 8) |
+ (u16)ndev->dev_addr[1]), P3_MACASR2);
+}
+
+static int ax88796c_set_mac_address(struct net_device *ndev, void *p)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ struct sockaddr *addr = p;
+
+ if (!is_valid_ether_addr(addr->sa_data))
+ return -EADDRNOTAVAIL;
+
+ memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len);
+
+ down(&ax_local->spi_lock);
+
+ ax88796c_set_mac_addr(ndev);
+
+ up(&ax_local->spi_lock);
+
+ return 0;
+}
+
+static int ax88796c_load_mac_addr(struct net_device *ndev)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ u16 temp;
+
+ /* Read the MAC address from AX88796C */
+ temp = AX_READ(&ax_local->ax_spi, P3_MACASR0);
+ ndev->dev_addr[5] = (u8)temp;
+ ndev->dev_addr[4] = (u8)(temp >> 8);
+
+ temp = AX_READ(&ax_local->ax_spi, P3_MACASR1);
+ ndev->dev_addr[3] = (u8)temp;
+ ndev->dev_addr[2] = (u8)(temp >> 8);
+
+ temp = AX_READ(&ax_local->ax_spi, P3_MACASR2);
+ ndev->dev_addr[1] = (u8)temp;
+ ndev->dev_addr[0] = (u8)(temp >> 8);
+
+ /* Supported for no EEPROM */
+ if (!is_valid_ether_addr(ndev->dev_addr)) {
+ if (macaddr && mac_pton(macaddr, ndev->dev_addr))
+ return 0;
+
+ if (netif_msg_probe(ax_local))
+ dev_info(&ax_local->spi->dev, "Use random MAC address\n");
+
+ random_ether_addr(ndev->dev_addr);
+ }
+
+ return 0;
+}
+
+static void ax88796c_proc_tx_hdr(struct tx_pkt_info *info, u8 ip_summed)
+{
+ u16 pkt_len_bar = (~info->pkt_len & TX_HDR_SOP_PKTLENBAR);
+
+ /* Prepare SOP header */
+ info->sop.flags_len = info->pkt_len |
+ (ip_summed == CHECKSUM_NONE ? TX_HDR_SOP_DICF : 0);
+
+ info->sop.seq_lenbar = ((info->seq_num << 11) & TX_HDR_SOP_SEQNUM)
+ | pkt_len_bar;
+ cpu_to_be16s(&info->sop.flags_len);
+ cpu_to_be16s(&info->sop.seq_lenbar);
+
+ /* Prepare Segment header */
+ info->seg.flags_seqnum_seglen = TX_HDR_SEG_FS | TX_HDR_SEG_LS
+ | info->pkt_len;
+
+ info->seg.eo_so_seglenbar = pkt_len_bar;
+
+ cpu_to_be16s(&info->seg.flags_seqnum_seglen);
+ cpu_to_be16s(&info->seg.eo_so_seglenbar);
+
+ /* Prepare EOP header */
+ info->eop.seq_len = ((info->seq_num << 11) &
+ TX_HDR_EOP_SEQNUM) | info->pkt_len;
+ info->eop.seqbar_lenbar = ((~info->seq_num << 11) &
+ TX_HDR_EOP_SEQNUMBAR) | pkt_len_bar;
+
+ cpu_to_be16s(&info->eop.seq_len);
+ cpu_to_be16s(&info->eop.seqbar_lenbar);
+}
+
+static int
+ax88796c_check_free_pages(struct ax88796c_device *ax_local, u8 need_pages)
+{
+ u8 free_pages;
+ u16 tmp;
+
+ free_pages = AX_READ(&ax_local->ax_spi, P0_TFBFCR) & TX_FREEBUF_MASK;
+ if (free_pages < need_pages) {
+ /* schedule free page interrupt */
+ tmp = AX_READ(&ax_local->ax_spi, P0_TFBFCR)
+ & TFBFCR_SCHE_FREE_PAGE;
+ AX_WRITE(&ax_local->ax_spi, tmp | TFBFCR_TX_PAGE_SET |
+ TFBFCR_SET_FREE_PAGE(need_pages),
+ P0_TFBFCR);
+ return -ENOMEM;
+ }
+
+ return 0;
+}
+
+static struct sk_buff *
+ax88796c_tx_fixup(struct net_device *ndev, struct sk_buff_head *q)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ struct sk_buff *skb, *tx_skb;
+ struct tx_pkt_info *info;
+ struct skb_data *entry;
+ int headroom;
+ int tailroom;
+ u8 need_pages;
+ u16 tol_len, pkt_len;
+ u8 padlen, seq_num;
+ u8 spi_len = ax_local->ax_spi.comp ? 1 : 4;
+
+ if (skb_queue_empty(q))
+ return NULL;
+
+ skb = skb_peek(q);
+ pkt_len = skb->len;
+ need_pages = (pkt_len + TX_OVERHEAD + 127) >> 7;
+ if (ax88796c_check_free_pages(ax_local, need_pages) != 0)
+ return NULL;
+
+ headroom = skb_headroom(skb);
+ tailroom = skb_tailroom(skb);
+ padlen = ((pkt_len + 3) & 0x7FC) - pkt_len;
+ tol_len = ((pkt_len + 3) & 0x7FC) +
+ TX_OVERHEAD + TX_EOP_SIZE + spi_len;
+ seq_num = ++ax_local->seq_num & 0x1F;
+
+ info = (struct tx_pkt_info *) skb->cb;
+ info->pkt_len = pkt_len;
+
+ if ((!skb_cloned(skb)) &&
+ (headroom >= (TX_OVERHEAD + spi_len)) &&
+ (tailroom >= (padlen + TX_EOP_SIZE))) {
+
+ info->seq_num = seq_num;
+ ax88796c_proc_tx_hdr(info, skb->ip_summed);
+
+ /* SOP and SEG header */
+ memcpy(skb_push(skb, TX_OVERHEAD), &info->sop, TX_OVERHEAD);
+
+ /* Write SPI TXQ header */
+ memcpy(skb_push(skb, spi_len), tx_cmd_buf, spi_len);
+
+ /* Make 32-bit aligment */
+ skb_put(skb, padlen);
+
+ /* EOP header */
+ memcpy(skb_put(skb, TX_EOP_SIZE), &info->eop, TX_EOP_SIZE);
+
+ tx_skb = skb;
+ skb_unlink(skb, q);
+
+ } else {
+
+ tx_skb = alloc_skb(tol_len, GFP_KERNEL);
+ if (!tx_skb)
+ return NULL;
+
+ /* Write SPI TXQ header */
+ memcpy(skb_put(tx_skb, spi_len), tx_cmd_buf, spi_len);
+
+ info->seq_num = seq_num;
+ ax88796c_proc_tx_hdr(info, skb->ip_summed);
+
+ /* SOP and SEG header */
+ memcpy(skb_put(tx_skb, TX_OVERHEAD),
+ &info->sop, TX_OVERHEAD);
+
+ /* Packet */
+ memcpy(skb_put(tx_skb, ((pkt_len + 3) & 0xFFFC)),
+ skb->data, pkt_len);
+
+ /* EOP header */
+ memcpy(skb_put(tx_skb, TX_EOP_SIZE),
+ &info->eop, TX_EOP_SIZE);
+
+ skb_unlink(skb, q);
+ dev_kfree_skb(skb);
+ }
+
+ entry = (struct skb_data *) tx_skb->cb;
+ memset(entry, 0, sizeof(*entry));
+ entry->len = pkt_len;
+
+ if (netif_msg_pktdata(ax_local)) {
+ int loop;
+ netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
+ pkt_len, tx_skb->len, seq_num);
+
+ netdev_info(ndev, " Dump SPI Header:\n ");
+ for (loop = 0; loop < 4; loop++)
+ netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
+
+ netdev_info(ndev, "\n");
+
+ netdev_info(ndev, " Dump TX SOP:\n ");
+ for (loop = 0; loop < TX_OVERHEAD; loop++)
+ netdev_info(ndev, "%02x ", *(tx_skb->data + 4 + loop));
+
+ netdev_info(ndev, "\n");
+
+ netdev_info(ndev, " Dump TX packet:");
+ for (loop = TX_OVERHEAD + 4;
+ loop < (tx_skb->len - TX_EOP_SIZE); loop++) {
+ if (((loop + 8) % 16) == 0)
+ netdev_info(ndev, "\n ");
+ netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
+ }
+ netdev_info(ndev, "\n");
+
+ netdev_info(ndev, " Dump TX EOP:\n %02x %02x %02x %02x\n",
+ *(tx_skb->data + tx_skb->len - 4),
+ *(tx_skb->data + tx_skb->len - 3),
+ *(tx_skb->data + tx_skb->len - 2),
+ *(tx_skb->data + tx_skb->len - 1));
+ }
+
+ return tx_skb;
+}
+
+static int ax88796c_hard_xmit(struct ax88796c_device *ax_local)
+{
+ struct sk_buff *tx_skb;
+ struct skb_data *entry;
+
+ tx_skb = ax88796c_tx_fixup(ax_local->ndev, &ax_local->tx_wait_q);
+
+ if (!tx_skb)
+ return 0;
+
+ entry = (struct skb_data *)tx_skb->cb;
+
+ AX_WRITE(&ax_local->ax_spi,
+ (TSNR_TXB_START | TSNR_PKT_CNT(1)), P0_TSNR);
+
+ axspi_write_txq(&ax_local->ax_spi, tx_skb->data, tx_skb->len);
+
+ if (((AX_READ(&ax_local->ax_spi, P0_TSNR) & TXNR_TXB_IDLE) == 0) ||
+ ((ISR_TXERR & AX_READ(&ax_local->ax_spi, P0_ISR)) != 0)) {
+
+ /* Ack tx error int */
+ AX_WRITE(&ax_local->ax_spi, ISR_TXERR, P0_ISR);
+
+ ax_local->stats.tx_dropped++;
+
+ if (netif_msg_tx_err(ax_local))
+ netdev_err(ax_local->ndev,
+ "TX FIFO error, re-initialize the TX bridge\n");
+
+ /* Reinitial tx bridge */
+ AX_WRITE(&ax_local->ax_spi, TXNR_TXB_REINIT |
+ AX_READ(&ax_local->ax_spi, P0_TSNR), P0_TSNR);
+ ax_local->seq_num = 0;
+ } else {
+ ax_local->stats.tx_packets++;
+ ax_local->stats.tx_bytes += entry->len;
+ }
+
+ entry->state = tx_done;
+ dev_kfree_skb(tx_skb);
+
+ return 1;
+}
+
+static int
+ax88796c_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+
+ skb_queue_tail(&ax_local->tx_wait_q, skb);
+ if (skb_queue_len(&ax_local->tx_wait_q) > TX_QUEUE_HIGH_WATER) {
+ if (netif_msg_tx_queued(ax_local))
+ netdev_err(ndev, "Too much TX packets in queue %d\n",
+ skb_queue_len(&ax_local->tx_wait_q));
+
+ netif_stop_queue(ndev);
+ }
+
+ set_bit(EVENT_TX, &ax_local->flags);
+ queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
+
+ return NETDEV_TX_OK;
+
+}
+
+
+static inline void
+ax88796c_skb_return(struct ax88796c_device *ax_local, struct sk_buff *skb,
+ struct rx_header *rxhdr)
+{
+ struct net_device *ndev = ax_local->ndev;
+ int status;
+
+ do {
+ if (!(ax_local->checksum & AX_RX_CHECKSUM))
+ break;
+
+ /* checksum error bit is set */
+ if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
+ (rxhdr->flags & RX_HDR3_L4_ERR))
+ break;
+
+ if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
+ (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
+ }
+ } while (0);
+
+ ax_local->stats.rx_packets++;
+ ax_local->stats.rx_bytes += skb->len;
+ skb->dev = ndev;
+
+ skb->truesize = skb->len + sizeof(struct sk_buff);
+ skb->protocol = eth_type_trans(skb, ax_local->ndev);
+
+ if (netif_msg_rx_status(ax_local))
+ netdev_info(ndev, "< rx, len %zu, type 0x%x\n",
+ skb->len + sizeof(struct ethhdr), skb->protocol);
+
+ status = netif_rx(skb);
+ if (status != NET_RX_SUCCESS && netif_msg_rx_err(ax_local))
+ netdev_info(ndev, "netif_rx status %d\n", status);
+}
+
+static void dump_packet(struct net_device *ndev, const char *msg, int len, const char *data)
+{
+ netdev_printk(KERN_DEBUG, ndev, DRV_NAME ": %s - packet len:%d\n", msg, len);
+ print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
+ data, len, true);
+}
+
+static void
+ax88796c_rx_fixup(struct ax88796c_device *ax_local, struct sk_buff *rx_skb)
+{
+ struct rx_header *rxhdr = (struct rx_header *) rx_skb->data;
+ struct net_device *ndev = ax_local->ndev;
+ u16 len;
+
+ be16_to_cpus(&rxhdr->flags_len);
+ be16_to_cpus(&rxhdr->seq_lenbar);
+ be16_to_cpus(&rxhdr->flags);
+
+ if ((((short)rxhdr->flags_len) & RX_HDR1_PKT_LEN) !=
+ (~((short)rxhdr->seq_lenbar) & 0x7FF)) {
+ if (netif_msg_rx_err(ax_local)) {
+ int i;
+ netdev_err(ndev, "Header error\n");
+ //netdev_err(ndev, "Dump received frame\n");
+ /* for (i = 0; i < rx_skb->len; i++) { */
+ /* netdev_err(ndev, "%02x ", */
+ /* *(rx_skb->data + i)); */
+ /* if (((i + 1) % 16) == 0) */
+ /* netdev_err(ndev, "\n"); */
+ /* } */
+ dump_packet(ndev, __func__, rx_skb->len, rx_skb->data);
+ }
+ ax_local->stats.rx_frame_errors++;
+ kfree_skb(rx_skb);
+ return;
+ }
+
+ if ((rxhdr->flags_len & RX_HDR1_MII_ERR) ||
+ (rxhdr->flags_len & RX_HDR1_CRC_ERR)) {
+ if (netif_msg_rx_err(ax_local))
+ netdev_err(ndev, "CRC or MII error\n");
+
+ ax_local->stats.rx_crc_errors++;
+ kfree_skb(rx_skb);
+ return;
+ }
+
+ len = rxhdr->flags_len & RX_HDR1_PKT_LEN;
+ if (netif_msg_pktdata(ax_local)) {
+ int loop;
+ netdev_info(ndev, "RX data, total len %d, packet len %d\n",
+ rx_skb->len, len);
+
+ netdev_info(ndev, " Dump RX packet header:\n ");
+ for (loop = 0; loop < sizeof(*rxhdr); loop++)
+ netdev_info(ndev, "%02x ", *(rx_skb->data + loop));
+
+ netdev_info(ndev, "\n Dump RX packet:");
+ for (loop = 0; loop < len; loop++) {
+ if ((loop % 16) == 0)
+ netdev_info(ndev, "\n ");
+ netdev_info(ndev, "%02x ",
+ *(rx_skb->data + loop + sizeof(*rxhdr)));
+ }
+ netdev_info(ndev, "\n");
+ }
+
+ skb_pull(rx_skb, sizeof(*rxhdr));
+ __pskb_trim(rx_skb, len);
+
+ return ax88796c_skb_return(ax_local, rx_skb, rxhdr);
+}
+
+static int ax88796c_receive(struct net_device *ndev)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ struct sk_buff *skb;
+ struct skb_data *entry;
+ u16 w_count, pkt_len;
+ u8 pkt_cnt;
+
+ /* check rx packet and total word count */
+ AX_WRITE(&ax_local->ax_spi, AX_READ(&ax_local->ax_spi, P0_RTWCR)
+ | RTWCR_RX_LATCH, P0_RTWCR);
+
+ pkt_cnt = AX_READ(&ax_local->ax_spi, P0_RXBCR2) & RXBCR2_PKT_MASK;
+ if (!pkt_cnt)
+ return 0;
+
+ pkt_len = AX_READ(&ax_local->ax_spi, P0_RCPHR) & 0x7FF;
+
+ w_count = ((pkt_len + 6 + 3) & 0xFFFC) >> 1;
+
+ skb = alloc_skb((w_count * 2), GFP_KERNEL);
+ if (!skb) {
+ if (netif_msg_rx_err(ax_local))
+ netdev_err(ndev,
+ "Couldn't allocate a sk_buff of size %d\n",
+ w_count * 2);
+
+ AX_WRITE(&ax_local->ax_spi, RXBCR1_RXB_DISCARD, P0_RXBCR1);
+ return 0;
+ }
+ entry = (struct skb_data *) skb->cb;
+
+ AX_WRITE(&ax_local->ax_spi, RXBCR1_RXB_START | w_count, P0_RXBCR1);
+
+ axspi_read_rxq(&ax_local->ax_spi,
+ skb_put(skb, w_count * 2), skb->len);
+
+ /* Check if rx bridge is idle */
+ if ((AX_READ(&ax_local->ax_spi, P0_RXBCR2) & RXBCR2_RXB_IDLE) == 0) {
+
+ if (netif_msg_rx_err(ax_local))
+ netdev_err(ndev, "Rx Bridge is not idle\n");
+ AX_WRITE(&ax_local->ax_spi, RXBCR2_RXB_REINIT, P0_RXBCR2);
+
+ entry->state = rx_err;
+
+ } else {
+
+ entry->state = rx_done;
+ }
+
+ AX_WRITE(&ax_local->ax_spi, ISR_RXPKT, P0_ISR);
+
+ ax88796c_rx_fixup(ax_local, skb);
+
+ return 1;
+}
+
+static void ax88796c_check_media(struct ax88796c_device *ax_local)
+{
+ struct net_device *ndev = ax_local->ndev;
+ u16 bmsr, bmcr;
+
+ if (netif_msg_hw(ax_local))
+ ax88796c_dump_phy_regs(ax_local);
+
+ bmsr = ax88796c_mdio_read(ndev,
+ ax_local->mii.phy_id, MII_BMSR);
+
+ if (!(bmsr & BMSR_LSTATUS) && netif_carrier_ok(ndev)) {
+
+ netif_carrier_off(ndev);
+ if (netif_msg_link(ax_local))
+ netdev_info(ndev, "link down\n");
+
+ ax_local->w_state = chk_cable;
+ mod_timer(&ax_local->watchdog,
+ jiffies + AX88796C_WATCHDOG_PERIOD);
+
+ } else if ((bmsr & BMSR_LSTATUS) &&
+ !netif_carrier_ok(ndev)) {
+ bmcr = ax88796c_mdio_read(ndev,
+ ax_local->mii.phy_id, MII_BMCR);
+ if (netif_msg_link(ax_local))
+ netdev_info(ndev, "link up, %sMbps, %s-duplex\n",
+ (bmcr & BMCR_SPEED100) ? "100" : "10",
+ (bmcr & BMCR_FULLDPLX) ? "full" : "half");
+
+ netif_carrier_on(ndev);
+ }
+
+ return;
+}
+
+static int ax88796c_process_isr(struct ax88796c_device *ax_local)
+{
+ u16 isr;
+ u8 done = 0;
+ struct net_device *ndev = ax_local->ndev;
+
+ isr = AX_READ(&ax_local->ax_spi, P0_ISR);
+ AX_WRITE(&ax_local->ax_spi, isr, P0_ISR);
+
+ if (netif_msg_intr(ax_local))
+ netdev_info(ndev, " ISR 0x%04x\n", isr);
+
+ if (isr & ISR_TXERR) {
+ if (netif_msg_intr(ax_local))
+ netdev_info(ndev, " TXERR interrupt\n");
+ AX_WRITE(&ax_local->ax_spi, TXNR_TXB_REINIT, P0_TSNR);
+ ax_local->seq_num = 0x1f;
+ }
+
+ if (isr & ISR_TXPAGES) {
+
+ if (netif_msg_intr(ax_local))
+ netdev_info(ndev, " TXPAGES interrupt\n");
+
+ set_bit(EVENT_TX, &ax_local->flags);
+ }
+
+ if (isr & ISR_LINK) {
+
+ if (netif_msg_intr(ax_local))
+ netdev_info(ndev, " Link change interrupt\n");
+
+ ax88796c_check_media(ax_local);
+ }
+
+ if (isr & ISR_RXPKT) {
+
+ if (netif_msg_intr(ax_local))
+ netdev_info(ndev, " RX interrupt\n");
+
+ done = ax88796c_receive(ax_local->ndev);
+ }
+
+ return done;
+}
+
+static irqreturn_t ax88796c_interrupt(int irq, void *dev_instance)
+{
+ struct net_device *ndev = dev_instance;
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+
+ if (ndev == NULL) {
+ pr_err("irq %d for unknown device.\n", irq);
+ return IRQ_RETVAL(0);
+ }
+
+ disable_irq_nosync(irq);
+
+ if (netif_msg_intr(ax_local))
+ netdev_info(ndev, "Interrupt occurred\n");
+
+ set_bit(EVENT_INTR, &ax_local->flags);
+ queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
+
+ return IRQ_HANDLED;
+}
+
+
+static void ax88796c_work(struct work_struct *work)
+{
+ struct ax88796c_device *ax_local =
+ container_of(work, struct ax88796c_device, ax_work);
+ u8 power = 0;
+
+ down(&ax_local->spi_lock);
+
+ if (test_bit(EVENT_WATCHDOG, &ax_local->flags)) {
+
+ ax88796c_watchdog(ax_local);
+
+ clear_bit(EVENT_WATCHDOG, &ax_local->flags);
+ }
+
+ if (test_bit(EVENT_SET_MULTI, &ax_local->flags)) {
+
+ power = ax88796c_check_power_and_wake(ax_local);
+
+ ax88796c_set_hw_multicast(ax_local->ndev);
+ clear_bit(EVENT_SET_MULTI, &ax_local->flags);
+ }
+
+ if (test_bit(EVENT_INTR, &ax_local->flags)) {
+
+ power = ax88796c_check_power_and_wake(ax_local);
+
+ AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
+
+ while (1) {
+ if (!ax88796c_process_isr(ax_local))
+ break;
+ }
+
+ clear_bit(EVENT_INTR, &ax_local->flags);
+
+ AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
+
+ enable_irq(ax_local->ndev->irq);
+ }
+
+ if (test_bit(EVENT_TX, &ax_local->flags)) {
+
+ power = ax88796c_check_power_and_wake(ax_local);
+
+ while (skb_queue_len(&ax_local->tx_wait_q)) {
+ if (!ax88796c_hard_xmit(ax_local))
+ break;
+ }
+
+ clear_bit(EVENT_TX, &ax_local->flags);
+
+ if (netif_queue_stopped(ax_local->ndev) &&
+ (skb_queue_len(&ax_local->tx_wait_q) < TX_QUEUE_LOW_WATER))
+ netif_wake_queue(ax_local->ndev);
+ }
+
+ if (power)
+ ax88796c_set_power_saving(ax_local, ax_local->ps_level);
+
+ up(&ax_local->spi_lock);
+}
+
+static struct net_device_stats *ax88796c_get_stats(struct net_device *ndev)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ return &ax_local->stats;
+}
+
+void ax88796c_phy_init(struct ax88796c_device *ax_local)
+{
+ u16 advertise = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
+
+ /* Setup LED mode */
+ AX_WRITE(&ax_local->ax_spi,
+ (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |
+ LCR_LED1_100MODE), P2_LCR0);
+ AX_WRITE(&ax_local->ax_spi,
+ (AX_READ(&ax_local->ax_spi, P2_LCR1) & LCR_LED2_MASK) |
+ LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);
+
+ /* Enable PHY auto-polling */
+ AX_WRITE(&ax_local->ax_spi,
+ POOLCR_PHYID(ax_local->mii.phy_id) | POOLCR_POLL_EN |
+ POOLCR_POLL_FLOWCTRL | POOLCR_POLL_BMCR, P2_POOLCR);
+
+ ax88796c_mdio_write(ax_local->ndev,
+ ax_local->mii.phy_id, MII_ADVERTISE, advertise);
+
+ ax88796c_mdio_write(ax_local->ndev, ax_local->mii.phy_id, MII_BMCR,
+ BMCR_SPEED100 | BMCR_ANENABLE | BMCR_ANRESTART);
+}
+
+static int
+ax88796c_open(struct net_device *ndev)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ int ret;
+ u8 power;
+ unsigned long irq_flag = IRQF_SHARED;
+
+ netif_carrier_off(ax_local->ndev);
+
+ down(&ax_local->spi_lock);
+
+ power = ax88796c_check_power_and_wake(ax_local);
+
+ ret = ax88796c_soft_reset(ax_local);
+ if (ret < 0) {
+ return -ENODEV;
+ }
+
+ ret = request_irq(ndev->irq, ax88796c_interrupt,
+ irq_flag, ndev->name, ndev);
+ if (ret) {
+ netdev_err(ndev, "unable to get IRQ %d (errno=%d).\n",
+ ndev->irq, ret);
+ return -ENXIO;
+ }
+
+ ax_local->seq_num = 0x1f;
+
+ ax88796c_set_mac_addr(ndev);
+ ax88796c_set_csums(ax_local);
+
+ /* Disable stuffing packet */
+ AX_WRITE(&ax_local->ax_spi,
+ AX_READ(&ax_local->ax_spi, P1_RXBSPCR)
+ & ~RXBSPCR_STUF_ENABLE, P1_RXBSPCR);
+
+ /* Enable RX packet process */
+ AX_WRITE(&ax_local->ax_spi, RPPER_RXEN, P1_RPPER);
+
+ AX_WRITE(&ax_local->ax_spi, AX_READ(&ax_local->ax_spi, P0_FER)
+ | FER_RXEN | FER_TXEN | FER_BSWAP | FER_IRQ_PULL, P0_FER);
+
+ ax88796c_phy_init(ax_local);
+
+ netif_start_queue(ndev);
+
+ AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
+
+ if (netif_msg_hw(ax_local)) {
+ netdev_info(ndev,
+ "Dump all MAC registers after initialization:\n");
+ ax88796c_dump_regs(ax_local);
+ ax88796c_dump_phy_regs(ax_local);
+ }
+
+ if (power)
+ ax88796c_set_power_saving(ax_local, ax_local->ps_level);
+
+ spi_message_init(&ax_local->ax_spi.rx_msg);
+
+ up(&ax_local->spi_lock);
+
+ timer_setup(&ax_local->watchdog, ax88796c_watchdog_timer, 0);
+ /* init_timer(&ax_local->watchdog); */
+ /* ax_local->watchdog.function = &ax88796c_watchdog_timer; */
+ /* ax_local->watchdog.data = (unsigned long) ndev; */
+ ax_local->watchdog.expires = jiffies + AX88796C_WATCHDOG_PERIOD;
+ ax_local->w_state = chk_cable;
+ ax_local->w_ticks = 0;
+
+ add_timer(&ax_local->watchdog);
+
+ return 0;
+}
+
+static void ax88796c_free_skb_queue(struct sk_buff_head *q)
+{
+ struct sk_buff *skb;
+
+ while (q->qlen) {
+ skb = skb_dequeue(q);
+ kfree_skb(skb);
+ }
+}
+
+static int
+ax88796c_close(struct net_device *ndev)
+{
+ struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
+ u8 power;
+
+ netif_stop_queue(ndev);
+
+ del_timer_sync(&ax_local->watchdog);
+
+ free_irq(ndev->irq, ndev);
+
+ down(&ax_local->spi_lock);
+
+ power = ax88796c_check_power_and_wake(ax_local);
+
+ AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
+ ax88796c_free_skb_queue(&ax_local->tx_wait_q);
+
+ ax88796c_soft_reset(ax_local);
+
+ if (power)
+ ax88796c_set_power_saving(ax_local, ax_local->ps_level);
+
+ up(&ax_local->spi_lock);
+
+ return 0;
+}
+
+static const struct net_device_ops ax88796c_netdev_ops = {
+ .ndo_open = ax88796c_open,
+ .ndo_stop = ax88796c_close,
+ .ndo_start_xmit = ax88796c_start_xmit,
+ .ndo_get_stats = ax88796c_get_stats,
+ /* .ndo_set_multicast_list = ax88796c_set_multicast, */
+ .ndo_do_ioctl = ax88796c_ioctl,
+ .ndo_set_mac_address = ax88796c_set_mac_address,
+};
+
+
+static int ax88796c_hard_reset(struct ax88796c_device *ax_local)
+{
+ struct device *dev = (struct device*)&ax_local->spi->dev;
+ struct gpio_desc *reset_gpio;
+
+ /* reset info */
+ reset_gpio = gpiod_get(dev, "reset", 0);
+ if (IS_ERR(reset_gpio)) {
+ dev_err(dev, "Could not get 'reset' GPIO: %ld", PTR_ERR(reset_gpio));
+ return PTR_ERR(reset_gpio);
+ }
+
+ /* set reset */
+ gpiod_direction_output(reset_gpio, 1);
+ msleep(100);
+ gpiod_direction_output(reset_gpio, 0);
+ gpiod_put(reset_gpio);
+ msleep(10);
+
+ return 0;
+}
+
+static int ax88796c_probe(struct spi_device *spi)
+{
+ struct net_device *ndev;
+ struct ax88796c_device *ax_local;
+ int ret;
+ u16 temp;
+
+ ndev = devm_alloc_etherdev(&spi->dev, sizeof(*ax_local));
+ if (!ndev) {
+ dev_err(&spi->dev, "AX88796C SPI: Could not allocate ethernet device\n");
+ return -ENOMEM;
+ }
+
+ ax_local = to_ax88796c_device(ndev);
+ memset(ax_local, 0, sizeof(*ax_local));
+
+ dev_set_drvdata(&spi->dev, ax_local);
+ ax_local->spi = spi;
+ ax_local->ax_spi.spi = spi;
+
+ ndev->irq = spi->irq;
+
+ ax_local->msg_enable = msg_enable;
+ if (ps_level > AX_PS_D2 || ps_level < 0)
+ ax_local->ps_level = 0;
+ else
+ ax_local->ps_level = ps_level;
+
+ ax_local->capabilities |= comp ? AX_CAP_COMP : 0;
+
+ if (netif_msg_probe(ax_local)) {
+ dev_info(&spi->dev, "AX88796C-SPI Configuration:\n");
+ dev_info(&spi->dev, " Compression : %s\n",
+ ax_local->capabilities & AX_CAP_COMP ? "ON" : "OFF");
+ dev_info(&spi->dev, " Power Saving Level: %d\n",
+ ax_local->ps_level);
+ }
+
+ ndev->netdev_ops = &ax88796c_netdev_ops;
+ ndev->ethtool_ops = &ax88796c_ethtool_ops;
+
+ ax_local->ndev = ndev;
+
+ /* Initialize MII structure */
+ ax_local->mii.dev = ndev;
+ ax_local->mii.mdio_read = ax88796c_mdio_read;
+ ax_local->mii.mdio_write = ax88796c_mdio_write;
+ ax_local->mii.phy_id_mask = 0x3f;
+ ax_local->mii.reg_num_mask = 0x1f;
+ ax_local->mii.phy_id = 0x10;
+
+ /* ax88796c gpio reset */
+ ax88796c_hard_reset(ax_local);
+
+ /* Reset AX88796C */
+ ret = ax88796c_soft_reset(ax_local);
+ if (ret < 0) {
+ return -ENODEV;
+ }
+
+ /* Check board revision */
+ temp = AX_READ(&ax_local->ax_spi, P2_CRIR);
+ if ((temp & 0xF) != 0x0) {
+ dev_err(&spi->dev, "spi read failed: %d\n", temp);
+ return -ENODEV;
+ }
+
+ temp = AX_READ(&ax_local->ax_spi, P0_BOR);
+ if (temp == 0x1234) {
+ ax_local->plat_endian = PLAT_LITTLE_ENDIAN;
+ } else {
+ AX_WRITE(&ax_local->ax_spi, 0xFFFF, P0_BOR);
+ ax_local->plat_endian = PLAT_BIG_ENDIAN;
+ }
+
+ if (netif_msg_hw(ax_local)) {
+ dev_info(&spi->dev,
+ "Dump all MAC registers before initialization:\n");
+ ax88796c_dump_regs(ax_local);
+ ax88796c_dump_phy_regs(ax_local);
+ }
+
+ /*Reload EEPROM*/
+ ax88796c_reload_eeprom(ax_local);
+
+ ax88796c_load_mac_addr(ndev);
+
+ if (netif_msg_probe(ax_local))
+ dev_info(&spi->dev,
+ "irq %d, MAC addr "
+ "%02X:%02X:%02X:%02X:%02X:%02X\n",
+ ndev->irq,
+ ndev->dev_addr[0], ndev->dev_addr[1],
+ ndev->dev_addr[2], ndev->dev_addr[3],
+ ndev->dev_addr[4], ndev->dev_addr[5]);
+
+ ax88796c_set_power_saving(ax_local, ax_local->ps_level);
+
+ INIT_WORK(&ax_local->ax_work, ax88796c_work);
+
+ ax_local->ax_work_queue =
+ create_singlethread_workqueue("ax88796c_work");
+
+ sema_init(&ax_local->spi_lock, 1);
+
+ skb_queue_head_init(&ax_local->tx_wait_q);
+
+ ndev->features |= NETIF_F_HW_CSUM;
+ ax_local->checksum = AX_RX_CHECKSUM | AX_TX_CHECKSUM;
+ ndev->hard_header_len += (TX_OVERHEAD + 4);
+
+ ret = register_netdev(ndev);
+ if (!ret) {
+ if (netif_msg_probe(ax_local))
+ netdev_info(ndev, "%s %s registered\n",
+ dev_driver_string(&spi->dev),
+ dev_name(&spi->dev));
+ return ret;
+ }
+
+ dev_err(&spi->dev, "failed to register a network device\n");
+ destroy_workqueue(ax_local->ax_work_queue);
+
+ return ret;
+}
+
+static int
+ax88796c_suspend(struct spi_device *spi, pm_message_t mesg)
+{
+ struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
+ struct net_device *ndev = ax_local->ndev;
+ u8 power;
+
+ if (!ndev || !netif_running(ndev))
+ return 0;
+
+ netif_device_detach(ndev);
+
+ netif_stop_queue(ndev);
+
+ down(&ax_local->spi_lock);
+
+ power = ax88796c_check_power_and_wake(ax_local);
+
+ AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
+ ax88796c_free_skb_queue(&ax_local->tx_wait_q);
+
+ if (ax_local->wol) {
+
+ AX_WRITE(&ax_local->ax_spi, 0, P5_WFTR);
+
+ if (ax_local->wol & WFCR_LINKCH) { /* Link change */
+
+ /* Disable wol power saving in link change mode */
+ AX_WRITE(&ax_local->ax_spi,
+ (AX_READ(&ax_local->ax_spi, P0_PSCR)
+ & ~PSCR_WOLPS), P0_PSCR);
+
+ if (netif_msg_wol(ax_local))
+ netdev_info(ndev,
+ "Enable link change wakeup\n");
+
+ AX_WRITE(&ax_local->ax_spi, WFTR_8192MS, P5_WFTR);
+ }
+ if (ax_local->wol & WFCR_MAGICP) { /* Magic packet */
+ if (netif_msg_wol(ax_local))
+ netdev_info(ndev,
+ "Enable magic packet wakeup\n");
+ }
+
+ AX_WRITE(&ax_local->ax_spi,
+ ax_local->wol | WFCR_WAKEUP | WFCR_PMEEN, P0_WFCR);
+ }
+
+ if (power)
+ ax88796c_set_power_saving(ax_local, ax_local->ps_level);
+
+ up(&ax_local->spi_lock);
+
+ return 0;
+}
+
+static int
+ax88796c_resume(struct spi_device *spi)
+{
+ struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
+ struct net_device *ndev = ax_local->ndev;
+ u16 pme;
+
+ down(&ax_local->spi_lock);
+
+ /* Wakeup AX88796C first */
+ ax88796c_check_power_and_wake(ax_local);
+ msleep(200);
+
+ pme = AX_READ(&ax_local->ax_spi, P0_WFCR);
+ if (ax_local->wol && ~(pme & WFCR_WAITEVENT)) {
+
+ if (pme & WFCR_LINKCHS) {
+ if (netif_msg_wol(ax_local))
+ netdev_info(ndev,
+ "Wakeuped from link change.\n");
+ } else if (pme & WFCR_MAGICPS) {
+ if (netif_msg_wol(ax_local))
+ netdev_info(ndev,
+ "Wakeuped from magic packet.\n");
+ }
+
+ AX_WRITE(&ax_local->ax_spi, WFCR_CLRWAKE, P0_WFCR);
+ }
+
+ netif_device_attach(ndev);
+
+ /* Initialize all the local variables*/
+ ax88796c_soft_reset(ax_local);
+
+ ax_local->seq_num = 0x1f;
+
+ ax88796c_set_mac_addr(ndev);
+ ax88796c_set_csums(ax_local);
+
+ /* Disable stuffing packet */
+ AX_WRITE(&ax_local->ax_spi,
+ AX_READ(&ax_local->ax_spi, P1_RXBSPCR)
+ & ~RXBSPCR_STUF_ENABLE, P1_RXBSPCR);
+
+ /* Enable RX packet process */
+ AX_WRITE(&ax_local->ax_spi, RPPER_RXEN, P1_RPPER);
+
+ AX_WRITE(&ax_local->ax_spi,
+ AX_READ(&ax_local->ax_spi, P0_FER)
+ | FER_RXEN | FER_TXEN | FER_BSWAP, P0_FER);
+
+ ax88796c_phy_init(ax_local);
+
+ AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
+
+ if (netif_msg_hw(ax_local)) {
+ netdev_info(ndev,
+ "Dump all MAC registers after initialization:\n");
+ ax88796c_dump_regs(ax_local);
+ ax88796c_dump_phy_regs(ax_local);
+ }
+
+ ax88796c_set_power_saving(ax_local, ax_local->ps_level);
+
+ netif_start_queue(ndev);
+
+ up(&ax_local->spi_lock);
+
+ return 0;
+}
+
+static int ax88796c_remove(struct spi_device *spi)
+{
+ struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
+ struct net_device *ndev = ax_local->ndev;
+
+ if (netif_msg_probe(ax_local))
+ netdev_info(ndev, "removing network device %s %s\n",
+ dev_driver_string(&spi->dev),
+ dev_name(&spi->dev));
+
+ destroy_workqueue(ax_local->ax_work_queue);
+
+ unregister_netdev(ndev);
+
+ if (netif_msg_probe(ax_local))
+ dev_info(&spi->dev, "device removed\n");
+
+ return 0;
+}
+
+#ifdef CONFIG_USE_OF
+static const struct of_device_id ax88796c_dt_ids[] = {
+ { .compatible = "asix,ax88796c" },
+ {},
+};
+MODULE_DEVICE_TABLE(of, ax88796c_dt_ids);
+#endif
+
+static const struct spi_device_id asix_id[] = {
+ { "ax88796c", 0 },
+ { }
+};
+MODULE_DEVICE_TABLE(spi, asix_id);
+
+static struct spi_driver ax88796c_spi_driver = {
+ .driver = {
+ .name = DRV_NAME,
+ .owner = THIS_MODULE,
+#ifdef CONFIG_USE_OF
+ .of_match_table = of_match_ptr(ax88796c_dt_ids),
+#endif
+ },
+ .probe = ax88796c_probe,
+ .remove = ax88796c_remove,
+// .suspend = ax88796c_suspend,
+// .resume = ax88796c_resume,
+ .id_table = asix_id,
+};
+
+static __init int ax88796c_spi_init(void)
+{
+ pr_info("Register AX88796C SPI Ethernet Driver.\n");
+ return spi_register_driver(&ax88796c_spi_driver);
+}
+
+static __exit void ax88796c_spi_exit(void)
+{
+ spi_unregister_driver(&ax88796c_spi_driver);
+}
+
+module_init(ax88796c_spi_init);
+module_exit(ax88796c_spi_exit);
diff --git a/drivers/net/ethernet/asix/ax88796c_main.h b/drivers/net/ethernet/asix/ax88796c_main.h
new file mode 100644
index 000000000000..6c61766b1788
--- /dev/null
+++ b/drivers/net/ethernet/asix/ax88796c_main.h
@@ -0,0 +1,596 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2010 ASIX Electronics Corporation
+ * Copyright (c) 2020 Samsung Electronics
+ *
+ * ASIX AX88796C SPI Fast Ethernet Linux driver
+ */
+
+#ifndef _AX88796C_MAIN_H
+#define _AX88796C_MAIN_H
+
+#define pr_fmt(fmt) "ax88796c: " fmt
+
+/* INCLUDE FILE DECLARATIONS */
+#ifdef CONFIG_USE_OF
+#include <linux/of.h>
+#endif
+#include <linux/crc32.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/gpio/consumer.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kmod.h>
+#include <linux/mii.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/platform_device.h>
+#include <linux/sched.h>
+#include <linux/spi/spi.h>
+#include <linux/timer.h>
+#include <linux/uaccess.h>
+#include <linux/usb.h>
+#include <linux/version.h>
+#include <linux/workqueue.h>
+
+#include <asm/dma.h>
+
+#include "ax88796c_spi.h"
+
+/* NAMING CONSTANT AND TYPE DECLARATIONS */
+/* These identify the driver base version and may not be removed. */
+#define DRV_NAME "ax88796c"
+#define ADP_NAME "ASIX AX88796C SPI Ethernet Adapter"
+#define DRV_VERSION "1.2.0"
+
+#define TX_QUEUE_HIGH_WATER 45 /* Tx queue high water mark */
+#define TX_QUEUE_LOW_WATER 20 /* Tx queue low water mark */
+
+#define AX88796C_WATCHDOG_PERIOD (1 * HZ)
+#define AX88796C_WATCHDOG_RESTART 7
+
+#define TX_OVERHEAD 8
+#define TX_EOP_SIZE 4
+
+#define AX_MCAST_FILTER_SIZE 8
+#define AX_MAX_MCAST 64
+#define AX_MAX_CLK 80000000
+#define TX_HDR_SOP_DICF 0x8000
+#define TX_HDR_SOP_CPHI 0x4000
+#define TX_HDR_SOP_INT 0x2000
+#define TX_HDR_SOP_MDEQ 0x1000
+#define TX_HDR_SOP_PKTLEN 0x07FF
+#define TX_HDR_SOP_SEQNUM 0xF800
+#define TX_HDR_SOP_PKTLENBAR 0x07FF
+
+#define TX_HDR_SEG_FS 0x8000
+#define TX_HDR_SEG_LS 0x4000
+#define TX_HDR_SEG_SEGNUM 0x3800
+#define TX_HDR_SEG_SEGLEN 0x0700
+#define TX_HDR_SEG_EOFST 0xC000
+#define TX_HDR_SEG_SOFST 0x3800
+#define TX_HDR_SEG_SEGLENBAR 0x07FF
+
+#define TX_HDR_EOP_SEQNUM 0xF800
+#define TX_HDR_EOP_PKTLEN 0x07FF
+#define TX_HDR_EOP_SEQNUMBAR 0xF800
+#define TX_HDR_EOP_PKTLENBAR 0x07FF
+
+/* Rx header fields mask */
+#define RX_HDR1_MCBC 0x8000
+#define RX_HDR1_STUFF_PKT 0x4000
+#define RX_HDR1_MII_ERR 0x2000
+#define RX_HDR1_CRC_ERR 0x1000
+#define RX_HDR1_PKT_LEN 0x07FF
+
+#define RX_HDR2_SEQ_NUM 0xF800
+#define RX_HDR2_PKT_LEN_BAR 0x7FFF
+
+#define RX_HDR3_PE 0x8000
+#define RX_HDR3_L4_TYPE_TCP 0x1000
+#define RX_HDR3_L4_TYPE_UDP 0x0400
+#define RX_HDR3_L3_ERR 0x0200
+#define RX_HDR3_L4_ERR 0x0100
+#define RX_HDR3_PRIORITY(x) ((x) << 4)
+#define RX_HDR3_STRIP 0x0008
+#define RX_HDR3_VLAN_ID 0x0007
+
+#define AX_RX_CHECKSUM 1
+#define AX_TX_CHECKSUM 2
+
+enum watchdog_state {
+ chk_link = 0,
+ chk_cable,
+ ax_nop,
+};
+
+struct ax88796c_device {
+
+ struct resource *addr_res; /* resources found */
+ struct resource *addr_req; /* resources requested */
+ struct resource *irq_res;
+
+ struct spi_device *spi;
+ struct net_device *ndev;
+ struct mii_if_info mii;
+ struct net_device_stats stats;
+
+ struct timer_list watchdog;
+ enum watchdog_state w_state;
+ size_t w_ticks;
+
+ struct work_struct ax_work;
+ struct workqueue_struct *ax_work_queue;
+ struct tasklet_struct bh;
+
+ struct semaphore spi_lock;
+
+ struct sk_buff_head tx_wait_q;
+
+ struct axspi_data ax_spi;
+
+ int msg_enable;
+
+ u16 seq_num;
+
+ u16 wol;
+
+ u8 checksum;
+
+ u8 multi_filter[AX_MCAST_FILTER_SIZE];
+
+ unsigned long capabilities;
+ #define AX_CAP_DMA 1
+ #define AX_CAP_COMP 2
+ #define AX_CAP_BIDIR 4
+
+ u8 plat_endian;
+ #define PLAT_LITTLE_ENDIAN 0
+ #define PLAT_BIG_ENDIAN 1
+
+ unsigned long flags;
+ #define EVENT_INTR 1
+ #define EVENT_TX 2
+ #define EVENT_SET_MULTI 4
+ #define EVENT_WATCHDOG 8
+
+ u8 ps_level;
+ #define AX_PS_D0 0
+ #define AX_PS_D1 1
+ #define AX_PS_D2 2
+
+
+};
+
+#define to_ax88796c_device(ndev) ((struct ax88796c_device *)netdev_priv(ndev))
+
+enum skb_state {
+ illegal = 0,
+ tx_done,
+ rx_done,
+ rx_err,
+};
+
+struct skb_data;
+
+struct skb_data {
+ enum skb_state state;
+ struct net_device *ndev;
+ struct sk_buff *skb;
+ size_t len;
+ dma_addr_t phy_addr;
+};
+
+/* A88796C register definition */
+ /* Definition of PAGE0 */
+#define P0_PSR (0x00)
+ #define PSR_DEV_READY (1 << 7)
+ #define PSR_RESET (0 << 15)
+ #define PSR_RESET_CLR (1 << 15)
+#define P0_BOR (0x02)
+#define P0_FER (0x04)
+ #define FER_IPALM (1 << 0)
+ #define FER_DCRC (1 << 1)
+ #define FER_RH3M (1 << 2)
+ #define FER_HEADERSWAP (1 << 7)
+ #define FER_WSWAP (1 << 8)
+ #define FER_BSWAP (1 << 9)
+ #define FER_INTHI (1 << 10)
+ #define FER_INTLO (0 << 10)
+ #define FER_IRQ_PULL (1 << 11)
+ #define FER_RXEN (1 << 14)
+ #define FER_TXEN (1 << 15)
+#define P0_ISR (0x06)
+ #define ISR_RXPKT (1 << 0)
+ #define ISR_MDQ (1 << 4)
+ #define ISR_TXT (1 << 5)
+ #define ISR_TXPAGES (1 << 6)
+ #define ISR_TXERR (1 << 8)
+ #define ISR_LINK (1 << 9)
+#define P0_IMR (0x08)
+ #define IMR_RXPKT (1 << 0)
+ #define IMR_MDQ (1 << 4)
+ #define IMR_TXT (1 << 5)
+ #define IMR_TXPAGES (1 << 6)
+ #define IMR_TXERR (1 << 8)
+ #define IMR_LINK (1 << 9)
+ #define IMR_MASKALL (0xFFFF)
+ #define IMR_DEFAULT (IMR_TXERR)
+#define P0_WFCR (0x0A)
+ #define WFCR_PMEIND (1 << 0) /* PME indication */
+ #define WFCR_PMETYPE (1 << 1) /* PME I/O type */
+ #define WFCR_PMEPOL (1 << 2) /* PME polarity */
+ #define WFCR_PMERST (1 << 3) /* Reset PME */
+ #define WFCR_SLEEP (1 << 4) /* Enable sleep mode */
+ #define WFCR_WAKEUP (1 << 5) /* Enable wakeup mode */
+ #define WFCR_WAITEVENT (1 << 6) /* Reserved */
+ #define WFCR_CLRWAKE (1 << 7) /* Clear wakeup */
+ #define WFCR_LINKCH (1 << 8) /* Enable link change */
+ #define WFCR_MAGICP (1 << 9) /* Enable magic packet */
+ #define WFCR_WAKEF (1 << 10) /* Enable wakeup frame */
+ #define WFCR_PMEEN (1 << 11) /* Enable PME pin */
+ #define WFCR_LINKCHS (1 << 12) /* Link change status */
+ #define WFCR_MAGICPS (1 << 13) /* Magic packet status */
+ #define WFCR_WAKEFS (1 << 14) /* Wakeup frame status */
+ #define WFCR_PMES (1 << 15) /* PME pin status */
+#define P0_PSCR (0x0C)
+ #define PSCR_PS_MASK (0xFFF0)
+ #define PSCR_PS_D0 (0)
+ #define PSCR_PS_D1 (1 << 0)
+ #define PSCR_PS_D2 (1 << 1)
+ #define PSCR_FPS (1 << 3) /* Enable fiber mode PS */
+ #define PSCR_SWPS (1 << 4) /* Enable software */
+ /* PS control */
+ #define PSCR_WOLPS (1 << 5) /* Enable WOL PS */
+ #define PSCR_SWWOL (1 << 6) /* Enable software select */
+ /* WOL PS */
+ #define PSCR_PHYOSC (1 << 7) /* Internal PHY OSC control */
+ #define PSCR_FOFEF (1 << 8) /* Force PHY generate FEF */
+ #define PSCR_FOF (1 << 9) /* Force PHY in fiber mode */
+ #define PSCR_PHYPD (1 << 10) /* PHY power down. */
+ /* Active high */
+ #define PSCR_PHYRST (1 << 11) /* PHY reset signal. */
+ /* Active low */
+ #define PSCR_PHYCSIL (1 << 12) /* PHY cable energy detect */
+ #define PSCR_PHYCOFF (1 << 13) /* PHY cable off */
+ #define PSCR_PHYLINK (1 << 14) /* PHY link status */
+ #define PSCR_EEPOK (1 << 15) /* EEPROM load complete */
+#define P0_MACCR (0x0E)
+ #define MACCR_RXFC_ENABLE (1 << 3)
+ #define MACCR_RXFC_MASK 0xFFF7
+ #define MACCR_TXFC_ENABLE (1 << 4)
+ #define MACCR_TXFC_MASK 0xFFEF
+ #define MACCR_PF (1 << 7)
+ #define MACCR_PMM_BITS 8
+ #define MACCR_PMM_MASK (0x1F00)
+ #define MACCR_PMM_RESET (1 << 8)
+ #define MACCR_PMM_WAIT (2 << 8)
+ #define MACCR_PMM_READY (3 << 8)
+ #define MACCR_PMM_D1 (4 << 8)
+ #define MACCR_PMM_D2 (5 << 8)
+ #define MACCR_PMM_WAKE (7 << 8)
+ #define MACCR_PMM_D1_WAKE (8 << 8)
+ #define MACCR_PMM_D2_WAKE (9 << 8)
+ #define MACCR_PMM_SLEEP (10 << 8)
+ #define MACCR_PMM_PHY_RESET (11 << 8)
+ #define MACCR_PMM_SOFT_D1 (16 << 8)
+ #define MACCR_PMM_SOFT_D2 (17 << 8)
+#define P0_TFBFCR (0x10)
+ #define TFBFCR_SCHE_FREE_PAGE 0xE07F
+ #define TFBFCR_FREE_PAGE_BITS 0x07
+ #define TFBFCR_FREE_PAGE_LATCH (1 << 6)
+ #define TFBFCR_SET_FREE_PAGE(x) ((x & 0x3F) << TFBFCR_FREE_PAGE_BITS)
+ #define TFBFCR_TX_PAGE_SET (1 << 13)
+ #define TFBFCR_MANU_ENTX (1 << 15)
+ #define TX_FREEBUF_MASK 0x003F
+ #define TX_DPTSTART 0x4000
+
+#define P0_TSNR (0x12)
+ #define TXNR_TXB_ERR (1 << 5)
+ #define TXNR_TXB_IDLE (1 << 6)
+ #define TSNR_PKT_CNT(x) (((x) & 0x3F) << 8)
+ #define TXNR_TXB_REINIT (1 << 14)
+ #define TSNR_TXB_START (1 << 15)
+#define P0_RTDPR (0x14)
+#define P0_RXBCR1 (0x16)
+ #define RXBCR1_RXB_DISCARD (1 << 14)
+ #define RXBCR1_RXB_START (1 << 15)
+#define P0_RXBCR2 (0x18)
+ #define RXBCR2_PKT_MASK (0xFF)
+ #define RXBCR2_RXPC_MASK (0x7F)
+ #define RXBCR2_RXB_READY (1 << 13)
+ #define RXBCR2_RXB_IDLE (1 << 14)
+ #define RXBCR2_RXB_REINIT (1 << 15)
+#define P0_RTWCR (0x1A)
+ #define RTWCR_RXWC_MASK (0x3FFF)
+ #define RTWCR_RX_LATCH (1 << 15)
+#define P0_RCPHR (0x1C)
+
+ /* Definition of PAGE1 */
+#define P1_RPPER (0x22)
+ #define RPPER_RXEN (1 << 0)
+#define P1_MRCR (0x28)
+#define P1_MDR (0x2A)
+#define P1_RMPR (0x2C)
+#define P1_TMPR (0x2E)
+#define P1_RXBSPCR (0x30)
+ #define RXBSPCR_STUF_WORD_CNT(x) (((x) & 0x7000) >> 12)
+ #define RXBSPCR_STUF_ENABLE (1 << 15)
+#define P1_MCR (0x32)
+ #define MCR_SBP (1 << 8)
+ #define MCR_SM (1 << 9)
+ #define MCR_CRCENLAN (1 << 11)
+ #define MCR_STP (1 << 12)
+ /* Definition of PAGE2 */
+#define P2_CIR (0x42)
+#define P2_POOLCR (0x44)
+ #define POOLCR_POLL_EN (1 << 0)
+ #define POOLCR_POLL_FLOWCTRL (1 << 1)
+ #define POOLCR_POLL_BMCR (1 << 2)
+ #define POOLCR_PHYID(x) ((x) << 8)
+#define P2_PHYSR (0x46)
+#define P2_MDIODR (0x48)
+#define P2_MDIOCR (0x4A)
+ #define MDIOCR_RADDR(x) ((x) & 0x1F)
+ #define MDIOCR_FADDR(x) (((x) & 0x1F) << 8)
+ #define MDIOCR_VALID (1 << 13)
+ #define MDIOCR_READ (1 << 14)
+ #define MDIOCR_WRITE (1 << 15)
+#define P2_LCR0 (0x4C)
+ #define LCR_LED0_EN (1 << 0)
+ #define LCR_LED0_100MODE (1 << 1)
+ #define LCR_LED0_DUPLEX (1 << 2)
+ #define LCR_LED0_LINK (1 << 3)
+ #define LCR_LED0_ACT (1 << 4)
+ #define LCR_LED0_COL (1 << 5)
+ #define LCR_LED0_10MODE (1 << 6)
+ #define LCR_LED0_DUPCOL (1 << 7)
+ #define LCR_LED1_EN (1 << 8)
+ #define LCR_LED1_100MODE (1 << 9)
+ #define LCR_LED1_DUPLEX (1 << 10)
+ #define LCR_LED1_LINK (1 << 11)
+ #define LCR_LED1_ACT (1 << 12)
+ #define LCR_LED1_COL (1 << 13)
+ #define LCR_LED1_10MODE (1 << 14)
+ #define LCR_LED1_DUPCOL (1 << 15)
+#define P2_LCR1 (0x4E)
+ #define LCR_LED2_MASK (0xFF00)
+ #define LCR_LED2_EN (1 << 0)
+ #define LCR_LED2_100MODE (1 << 1)
+ #define LCR_LED2_DUPLEX (1 << 2)
+ #define LCR_LED2_LINK (1 << 3)
+ #define LCR_LED2_ACT (1 << 4)
+ #define LCR_LED2_COL (1 << 5)
+ #define LCR_LED2_10MODE (1 << 6)
+ #define LCR_LED2_DUPCOL (1 << 7)
+#define P2_IPGCR (0x50)
+#define P2_CRIR (0x52)
+#define P2_FLHWCR (0x54)
+#define P2_RXCR (0x56)
+ #define RXCR_PRO (1 << 0)
+ #define RXCR_AMALL (1 << 1)
+ #define RXCR_SEP (1 << 2)
+ #define RXCR_AB (1 << 3)
+ #define RXCR_AM (1 << 4)
+ #define RXCR_AP (1 << 5)
+ #define RXCR_ARP (1 << 6)
+#define P2_JLCR (0x58)
+#define P2_MPLR (0x5C)
+
+ /* Definition of PAGE3 */
+#define P3_MACASR0 (0x62)
+ #define P3_MACASR(x) (P3_MACASR0 + 2*x)
+ #define MACASR_LOWBYTE_MASK 0x00FF
+ #define MACASR_HIGH_BITS 0x08
+#define P3_MACASR1 (0x64)
+#define P3_MACASR2 (0x66)
+#define P3_MFAR01 (0x68)
+#define P3_MFAR_BASE (0x68)
+ #define P3_MFAR(x) (P3_MFAR_BASE + 2*x)
+
+#define P3_MFAR23 (0x6A)
+#define P3_MFAR45 (0x6C)
+#define P3_MFAR67 (0x6E)
+#define P3_VID0FR (0x70)
+#define P3_VID1FR (0x72)
+#define P3_EECSR (0x74)
+#define P3_EEDR (0x76)
+#define P3_EECR (0x78)
+ #define EECR_ADDR_MASK (0x00FF)
+ #define EECR_READ_ACT (1 << 8)
+ #define EECR_WRITE_ACT (1 << 9)
+ #define EECR_WRITE_DISABLE (1 << 10)
+ #define EECR_WRITE_ENABLE (1 << 11)
+ #define EECR_EE_READY (1 << 13)
+ #define EECR_RELOAD (1 << 14)
+ #define EECR_RESET (1 << 15)
+#define P3_TPCR (0x7A)
+ #define TPCR_PATT_MASK (0xFF)
+ #define TPCR_RAND_PKT_EN (1 << 14)
+ #define TPCR_FIXED_PKT_EN (1 << 15)
+#define P3_TPLR (0x7C)
+ /* Definition of PAGE4 */
+#define P4_SPICR (0x8A)
+ #define SPICR_RCEN (1 << 0)
+ #define SPICR_QCEN (1 << 1)
+ #define SPICR_RBRE (1 << 3)
+ #define SPICR_PMM (1 << 4)
+ #define SPICR_LOOPBACK (1 << 8)
+ #define SPICR_CORE_RES_CLR (1 << 10)
+ #define SPICR_SPI_RES_CLR (1 << 11)
+#define P4_SPIISMR (0x8C)
+
+#define P4_COERCR0 (0x92)
+ #define COERCR0_RXIPCE (1 << 0)
+ #define COERCR0_RXIPVE (1 << 1)
+ #define COERCR0_RXV6PE (1 << 2)
+ #define COERCR0_RXTCPE (1 << 3)
+ #define COERCR0_RXUDPE (1 << 4)
+ #define COERCR0_RXICMP (1 << 5)
+ #define COERCR0_RXIGMP (1 << 6)
+ #define COERCR0_RXICV6 (1 << 7)
+
+ #define COERCR0_RXTCPV6 (1 << 8)
+ #define COERCR0_RXUDPV6 (1 << 9)
+ #define COERCR0_RXICMV6 (1 << 10)
+ #define COERCR0_RXIGMV6 (1 << 11)
+ #define COERCR0_RXICV6V6 (1 << 12)
+
+ #define COERCR0_DEFAULT (COERCR0_RXIPCE | COERCR0_RXV6PE | \
+ COERCR0_RXTCPE | COERCR0_RXUDPE | \
+ COERCR0_RXTCPV6 | COERCR0_RXUDPV6)
+#define P4_COERCR1 (0x94)
+ #define COERCR1_IPCEDP (1 << 0)
+ #define COERCR1_IPVEDP (1 << 1)
+ #define COERCR1_V6VEDP (1 << 2)
+ #define COERCR1_TCPEDP (1 << 3)
+ #define COERCR1_UDPEDP (1 << 4)
+ #define COERCR1_ICMPDP (1 << 5)
+ #define COERCR1_IGMPDP (1 << 6)
+ #define COERCR1_ICV6DP (1 << 7)
+ #define COERCR1_RX64TE (1 << 8)
+ #define COERCR1_RXPPPE (1 << 9)
+ #define COERCR1_TCP6DP (1 << 10)
+ #define COERCR1_UDP6DP (1 << 11)
+ #define COERCR1_IC6DP (1 << 12)
+ #define COERCR1_IG6DP (1 << 13)
+ #define COERCR1_ICV66DP (1 << 14)
+ #define COERCR1_RPCE (1 << 15)
+
+ #define COERCR1_DEFAULT (COERCR1_RXPPPE)
+#define P4_COETCR0 (0x96)
+ #define COETCR0_TXIP (1 << 0)
+ #define COETCR0_TXTCP (1 << 1)
+ #define COETCR0_TXUDP (1 << 2)
+ #define COETCR0_TXICMP (1 << 3)
+ #define COETCR0_TXIGMP (1 << 4)
+ #define COETCR0_TXICV6 (1 << 5)
+ #define COETCR0_TXTCPV6 (1 << 8)
+ #define COETCR0_TXUDPV6 (1 << 9)
+ #define COETCR0_TXICMV6 (1 << 10)
+ #define COETCR0_TXIGMV6 (1 << 11)
+ #define COETCR0_TXICV6V6 (1 << 12)
+
+ #define COETCR0_DEFAULT (COETCR0_TXIP | COETCR0_TXTCP | \
+ COETCR0_TXUDP | COETCR0_TXTCPV6 | \
+ COETCR0_TXUDPV6)
+#define P4_COETCR1 (0x98)
+ #define COETCR1_TX64TE (1 << 0)
+ #define COETCR1_TXPPPE (1 << 1)
+
+#define P4_COECEDR (0x9A)
+#define P4_L2CECR (0x9C)
+
+ /* Definition of PAGE5 */
+#define P5_WFTR (0xA2)
+ #define WFTR_2MS (0x01)
+ #define WFTR_4MS (0x02)
+ #define WFTR_8MS (0x03)
+ #define WFTR_16MS (0x04)
+ #define WFTR_32MS (0x05)
+ #define WFTR_64MS (0x06)
+ #define WFTR_128MS (0x07)
+ #define WFTR_256MS (0x08)
+ #define WFTR_512MS (0x09)
+ #define WFTR_1024MS (0x0A)
+ #define WFTR_2048MS (0x0B)
+ #define WFTR_4096MS (0x0C)
+ #define WFTR_8192MS (0x0D)
+ #define WFTR_16384MS (0x0E)
+ #define WFTR_32768MS (0x0F)
+#define P5_WFCCR (0xA4)
+#define P5_WFCR03 (0xA6)
+ #define WFCR03_F0_EN (1 << 0)
+ #define WFCR03_F1_EN (1 << 4)
+ #define WFCR03_F2_EN (1 << 8)
+ #define WFCR03_F3_EN (1 << 12)
+#define P5_WFCR47 (0xA8)
+ #define WFCR47_F4_EN (1 << 0)
+ #define WFCR47_F5_EN (1 << 4)
+ #define WFCR47_F6_EN (1 << 8)
+ #define WFCR47_F7_EN (1 << 12)
+#define P5_WF0BMR0 (0xAA)
+#define P5_WF0BMR1 (0xAC)
+#define P5_WF0CR (0xAE)
+#define P5_WF0OBR (0xB0)
+#define P5_WF1BMR0 (0xB2)
+#define P5_WF1BMR1 (0xB4)
+#define P5_WF1CR (0xB6)
+#define P5_WF1OBR (0xB8)
+#define P5_WF2BMR0 (0xBA)
+#define P5_WF2BMR1 (0xBC)
+
+ /* Definition of PAGE6 */
+#define P6_WF2CR (0xC2)
+#define P6_WF2OBR (0xC4)
+#define P6_WF3BMR0 (0xC6)
+#define P6_WF3BMR1 (0xC8)
+#define P6_WF3CR (0xCA)
+#define P6_WF3OBR (0xCC)
+#define P6_WF4BMR0 (0xCE)
+#define P6_WF4BMR1 (0xD0)
+#define P6_WF4CR (0xD2)
+#define P6_WF4OBR (0xD4)
+#define P6_WF5BMR0 (0xD6)
+#define P6_WF5BMR1 (0xD8)
+#define P6_WF5CR (0xDA)
+#define P6_WF5OBR (0xDC)
+
+/* Definition of PAGE7 */
+#define P7_WF6BMR0 (0xE2)
+#define P7_WF6BMR1 (0xE4)
+#define P7_WF6CR (0xE6)
+#define P7_WF6OBR (0xE8)
+#define P7_WF7BMR0 (0xEA)
+#define P7_WF7BMR1 (0xEC)
+#define P7_WF7CR (0xEE)
+#define P7_WF7OBR (0xF0)
+#define P7_WFR01 (0xF2)
+#define P7_WFR23 (0xF4)
+#define P7_WFR45 (0xF6)
+#define P7_WFR67 (0xF8)
+#define P7_WFPC0 (0xFA)
+#define P7_WFPC1 (0xFC)
+
+
+/* Tx headers structure */
+struct tx_sop_header {
+ /* bit 15-11: flags, bit 10-0: packet length */
+ u16 flags_len;
+ /* bit 15-11: sequence number, bit 11-0: packet length bar */
+ u16 seq_lenbar;
+} __packed;
+
+struct tx_segment_header {
+ /* bit 15-14: flags, bit 13-11: segment number */
+ /* bit 10-0: segment length */
+ u16 flags_seqnum_seglen;
+ /* bit 15-14: end offset, bit 13-11: start offset */
+ /* bit 10-0: segment length bar */
+ u16 eo_so_seglenbar;
+} __packed;
+
+struct tx_eop_header {
+ /* bit 15-11: sequence number, bit 10-0: packet length */
+ u16 seq_len;
+ /* bit 15-11: sequence number bar, bit 10-0: packet length bar */
+ u16 seqbar_lenbar;
+} __packed;
+
+struct tx_pkt_info {
+ struct tx_sop_header sop;
+ struct tx_segment_header seg;
+ struct tx_eop_header eop;
+ u16 pkt_len;
+ u16 seq_num;
+} __packed;
+
+/* Rx headers structure */
+struct rx_header {
+ u16 flags_len;
+ u16 seq_lenbar;
+ u16 flags;
+} __packed;
+
+#endif /* #ifndef _AX88796C_MAIN_H */
diff --git a/drivers/net/ethernet/asix/ax88796c_spi.c b/drivers/net/ethernet/asix/ax88796c_spi.c
new file mode 100644
index 000000000000..5304eb33aad2
--- /dev/null
+++ b/drivers/net/ethernet/asix/ax88796c_spi.c
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2010 ASIX Electronics Corporation
+ *
+ * ASIX AX88796C SPI Fast Ethernet Linux driver
+ */
+
+#include "ax88796c_main.h"
+#include "ax88796c_spi.h"
+
+/* driver bus management functions */
+void axspi_wakeup(struct axspi_data *ax_spi)
+{
+ u8 tx_buf;
+ int ret;
+
+ tx_buf = AX_SPICMD_EXIT_PWD; /* OP */
+ ret = spi_write(ax_spi->spi, &tx_buf, 1);
+ if (ret)
+ dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
+}
+
+void axspi_read_status(struct axspi_data *ax_spi, struct spi_status *status)
+{
+ u8 tx_buf;
+ int ret;
+
+ /* OP */
+ tx_buf = AX_SPICMD_READ_STATUS;
+ ret = spi_write_then_read(ax_spi->spi, &tx_buf, 1, (u8 *)&status, 3);
+ if (ret)
+ dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
+ else
+ le16_to_cpus(&status->isr);
+}
+
+int axspi_read_rxq(struct axspi_data *ax_spi, void *data, int len)
+{
+ struct spi_transfer *xfer = ax_spi->spi_rx_xfer;
+ int ret;
+
+ memcpy(ax_spi->cmd_buf, rx_cmd_buf, 5);
+
+ xfer->tx_buf = ax_spi->cmd_buf;
+ xfer->rx_buf = NULL;
+ xfer->len = ax_spi->comp ? 2 : 5;
+ xfer->bits_per_word = 8;
+ spi_message_add_tail(xfer, &ax_spi->rx_msg);
+
+ xfer++;
+ xfer->rx_buf = data;
+ xfer->tx_buf = NULL;
+ xfer->len = len;
+ xfer->bits_per_word = 8;
+ spi_message_add_tail(xfer, &ax_spi->rx_msg);
+ ret = spi_sync(ax_spi->spi, &ax_spi->rx_msg);
+ if (ret)
+ dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
+
+ return ret;
+}
+
+int axspi_write_txq(struct axspi_data *ax_spi, void *data, int len)
+{
+ return spi_write(ax_spi->spi, data, len);
+}
+
+u16 axspi_read_reg(struct axspi_data *ax_spi, u8 reg)
+{
+ u8 tx_buf[4];
+ u16 rx_buf = 0;
+ int ret;
+ int len = ax_spi->comp ? 3 : 4;
+
+ tx_buf[0] = 0x03; /* OP code read register */
+ tx_buf[1] = reg; /* register address */
+ tx_buf[2] = 0xFF; /* dumy cycle */
+ tx_buf[3] = 0xFF; /* dumy cycle */
+ ret = spi_write_then_read(ax_spi->spi, tx_buf, len, (u8 *)&rx_buf, 2);
+ if (ret)
+ dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
+ else
+ le16_to_cpus(&rx_buf);
+
+ return rx_buf;
+}
+
+void axspi_write_reg(struct axspi_data *ax_spi, u8 reg, u16 value)
+{
+ u8 tx_buf[4];
+ int ret;
+
+ tx_buf[0] = AX_SPICMD_WRITE_REG; /* OP code read register */
+ tx_buf[1] = reg; /* register address */
+ tx_buf[2] = value;
+ tx_buf[3] = value >> 8;
+
+ ret = spi_write(ax_spi->spi, tx_buf, 4);
+ if (ret)
+ dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
+
+}
+
diff --git a/drivers/net/ethernet/asix/ax88796c_spi.h b/drivers/net/ethernet/asix/ax88796c_spi.h
new file mode 100644
index 000000000000..8c2cb4425d12
--- /dev/null
+++ b/drivers/net/ethernet/asix/ax88796c_spi.h
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2010 ASIX Electronics Corporation
+ *
+ * ASIX AX88796C SPI Fast Ethernet Linux driver
+ */
+
+#ifndef _AX88796C_SPI_H
+#define _AX88796C_SPI_H
+
+#include <linux/spi/spi.h>
+
+/* Definition of SPI command */
+#define AX_SPICMD_WRITE_TXQ 0x02
+#define AX_SPICMD_READ_REG 0x03
+#define AX_SPICMD_READ_STATUS 0x05
+#define AX_SPICMD_READ_RXQ 0x0B
+#define AX_SPICMD_BIDIR_WRQ 0xB2
+#define AX_SPICMD_WRITE_REG 0xD8
+#define AX_SPICMD_EXIT_PWD 0xAB
+
+static const u8 rx_cmd_buf[5] = {AX_SPICMD_READ_RXQ, 0xFF, 0xFF, 0xFF, 0xFF};
+static const u8 tx_cmd_buf[4] = {AX_SPICMD_WRITE_TXQ, 0xFF, 0xFF, 0xFF};
+
+struct axspi_data {
+ struct spi_device *spi;
+ struct spi_message rx_msg;
+ struct spi_transfer spi_rx_xfer[2];
+ u8 cmd_buf[6];
+ u8 comp;
+};
+
+struct spi_status {
+ u16 isr;
+ u8 status;
+# define AX_STATUS_READY 0x80
+};
+
+int axspi_read_rxq(struct axspi_data *ax_spi, void *data, int len);
+int axspi_write_txq(struct axspi_data *ax_spi, void *data, int len);
+u16 axspi_read_reg(struct axspi_data *ax_spi, u8 reg);
+void axspi_write_reg(struct axspi_data *ax_spi, u8 reg, u16 value);
+void axspi_read_status(struct axspi_data *ax_spi, struct spi_status *status);
+void axspi_wakeup(struct axspi_data *ax_spi);
+
+static inline u16 AX_READ(struct axspi_data *ax_spi, u8 offset)
+{
+ return axspi_read_reg(ax_spi, offset);
+}
+
+static inline void AX_WRITE(struct axspi_data *ax_spi, u16 value, u8 offset)
+{
+ axspi_write_reg(ax_spi, offset, value);
+}
+
+static inline void AX_READ_STATUS(struct axspi_data *ax_spi,
+ struct spi_status *status)
+{
+ axspi_read_status(ax_spi, status);
+}
+
+static inline void AX_WAKEUP(struct axspi_data *ax_spi)
+{
+ return axspi_wakeup(ax_spi);
+}
+#endif
+
--
2.26.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PATCH 2/3] ARM: dts: Add ethernet
2020-08-25 17:03 ` Łukasz Stelmach
@ 2020-08-25 17:03 ` Łukasz Stelmach
-1 siblings, 0 replies; 57+ messages in thread
From: Łukasz Stelmach @ 2020-08-25 17:03 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Krzysztof Kozlowski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree
Cc: m.szyprowski, b.zolnierkie, Łukasz Stelmach
Add node for ax88796c ethernet chip.
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
arch/arm/boot/dts/exynos3250-artik5-eval.dts | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/arm/boot/dts/exynos3250-artik5-eval.dts b/arch/arm/boot/dts/exynos3250-artik5-eval.dts
index 20446a846a98..44151a2cb35d 100644
--- a/arch/arm/boot/dts/exynos3250-artik5-eval.dts
+++ b/arch/arm/boot/dts/exynos3250-artik5-eval.dts
@@ -37,3 +37,24 @@ &mshc_2 {
&serial_2 {
status = "okay";
};
+
+&spi_0 {
+ status = "okay";
+ cs-gpios = <&gpx3 4 GPIO_ACTIVE_LOW>, <0>;
+
+ assigned-clocks = <&cmu CLK_MOUT_MPLL>, <&cmu CLK_DIV_MPLL_PRE>, <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>, <&cmu CLK_DIV_SPI0_PRE>, <&cmu CLK_SCLK_SPI0>;
+ assigned-clock-parents = <&cmu CLK_FOUT_MPLL>, <&cmu CLK_MOUT_MPLL>, <&cmu CLK_DIV_MPLL_PRE>, <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>, <&cmu CLK_DIV_SPI0_PRE>;
+
+ ax88796c@0 {
+ compatible = "asix,ax88796c";
+ interrupt-parent = <&gpx2>;
+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+ spi-max-frequency = <40000000>;
+ reg = <0x0>;
+ reset-gpios = <&gpe0 2 GPIO_ACTIVE_LOW>;
+ controller-data {
+ samsung,spi-feedback-delay = <2>;
+ samsung,spi-chip-select-mode;
+ };
+ };
+};
--
2.26.2
^ permalink raw reply related [flat|nested] 57+ messages in thread* [PATCH 2/3] ARM: dts: Add ethernet
@ 2020-08-25 17:03 ` Łukasz Stelmach
0 siblings, 0 replies; 57+ messages in thread
From: Łukasz Stelmach @ 2020-08-25 17:03 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Krzysztof Kozlowski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree
Cc: b.zolnierkie, Łukasz Stelmach, m.szyprowski
Add node for ax88796c ethernet chip.
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
arch/arm/boot/dts/exynos3250-artik5-eval.dts | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/arm/boot/dts/exynos3250-artik5-eval.dts b/arch/arm/boot/dts/exynos3250-artik5-eval.dts
index 20446a846a98..44151a2cb35d 100644
--- a/arch/arm/boot/dts/exynos3250-artik5-eval.dts
+++ b/arch/arm/boot/dts/exynos3250-artik5-eval.dts
@@ -37,3 +37,24 @@ &mshc_2 {
&serial_2 {
status = "okay";
};
+
+&spi_0 {
+ status = "okay";
+ cs-gpios = <&gpx3 4 GPIO_ACTIVE_LOW>, <0>;
+
+ assigned-clocks = <&cmu CLK_MOUT_MPLL>, <&cmu CLK_DIV_MPLL_PRE>, <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>, <&cmu CLK_DIV_SPI0_PRE>, <&cmu CLK_SCLK_SPI0>;
+ assigned-clock-parents = <&cmu CLK_FOUT_MPLL>, <&cmu CLK_MOUT_MPLL>, <&cmu CLK_DIV_MPLL_PRE>, <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>, <&cmu CLK_DIV_SPI0_PRE>;
+
+ ax88796c@0 {
+ compatible = "asix,ax88796c";
+ interrupt-parent = <&gpx2>;
+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+ spi-max-frequency = <40000000>;
+ reg = <0x0>;
+ reset-gpios = <&gpe0 2 GPIO_ACTIVE_LOW>;
+ controller-data {
+ samsung,spi-feedback-delay = <2>;
+ samsung,spi-chip-select-mode;
+ };
+ };
+};
--
2.26.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 57+ messages in thread* Re: [PATCH 2/3] ARM: dts: Add ethernet
2020-08-25 17:03 ` Łukasz Stelmach
@ 2020-08-25 18:03 ` Andrew Lunn
-1 siblings, 0 replies; 57+ messages in thread
From: Andrew Lunn @ 2020-08-25 18:03 UTC (permalink / raw)
To: Łukasz Stelmach
Cc: David S. Miller, Jakub Kicinski, Krzysztof Kozlowski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree, b.zolnierkie, m.szyprowski
On Tue, Aug 25, 2020 at 07:03:10PM +0200, Łukasz Stelmach wrote:
> Add node for ax88796c ethernet chip.
Hi Łukasz
You need to document the device tree binding.
Andrew
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 2/3] ARM: dts: Add ethernet
@ 2020-08-25 18:03 ` Andrew Lunn
0 siblings, 0 replies; 57+ messages in thread
From: Andrew Lunn @ 2020-08-25 18:03 UTC (permalink / raw)
To: Łukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Krzysztof Kozlowski, linux-kernel, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller, linux-arm-kernel, m.szyprowski
On Tue, Aug 25, 2020 at 07:03:10PM +0200, Łukasz Stelmach wrote:
> Add node for ax88796c ethernet chip.
Hi Łukasz
You need to document the device tree binding.
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 2/3] ARM: dts: Add ethernet
2020-08-25 17:03 ` Łukasz Stelmach
@ 2020-08-25 18:49 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 57+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-25 18:49 UTC (permalink / raw)
To: Łukasz Stelmach
Cc: David S. Miller, Jakub Kicinski, Kukjin Kim, Rob Herring,
Russell King, linux-arm-kernel, linux-kernel, linux-samsung-soc,
netdev, devicetree, m.szyprowski, b.zolnierkie
On Tue, Aug 25, 2020 at 07:03:10PM +0200, Łukasz Stelmach wrote:
> Add node for ax88796c ethernet chip.
Subject
ARM: dts: exynos: Add Ethernet to Artik 5 board
>
> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> ---
> arch/arm/boot/dts/exynos3250-artik5-eval.dts | 21 ++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/arch/arm/boot/dts/exynos3250-artik5-eval.dts b/arch/arm/boot/dts/exynos3250-artik5-eval.dts
> index 20446a846a98..44151a2cb35d 100644
> --- a/arch/arm/boot/dts/exynos3250-artik5-eval.dts
> +++ b/arch/arm/boot/dts/exynos3250-artik5-eval.dts
> @@ -37,3 +37,24 @@ &mshc_2 {
> &serial_2 {
> status = "okay";
> };
> +
> +&spi_0 {
> + status = "okay";
> + cs-gpios = <&gpx3 4 GPIO_ACTIVE_LOW>, <0>;
> +
> + assigned-clocks = <&cmu CLK_MOUT_MPLL>, <&cmu CLK_DIV_MPLL_PRE>, <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>, <&cmu CLK_DIV_SPI0_PRE>, <&cmu CLK_SCLK_SPI0>;
> + assigned-clock-parents = <&cmu CLK_FOUT_MPLL>, <&cmu CLK_MOUT_MPLL>, <&cmu CLK_DIV_MPLL_PRE>, <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>, <&cmu CLK_DIV_SPI0_PRE>;
> +
> + ax88796c@0 {
> + compatible = "asix,ax88796c";
Isn't checkpatch complaining about undocumented compatible? I didn't see
a binding here.
> + interrupt-parent = <&gpx2>;
> + interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> + spi-max-frequency = <40000000>;
> + reg = <0x0>;
> + reset-gpios = <&gpe0 2 GPIO_ACTIVE_LOW>;
One line break.
> + controller-data {
> + samsung,spi-feedback-delay = <2>;
> + samsung,spi-chip-select-mode;
What does samsung,spi-chip-select-mode mean? git grep does not find a binding.
> + };
> + };
Whatever formatting you used here, it is not Linux coding style. Please
fix indentation, linewrapping.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 2/3] ARM: dts: Add ethernet
@ 2020-08-25 18:49 ` Krzysztof Kozlowski
0 siblings, 0 replies; 57+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-25 18:49 UTC (permalink / raw)
To: Łukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Rob Herring, linux-kernel, Kukjin Kim, Jakub Kicinski,
David S. Miller, linux-arm-kernel, m.szyprowski
On Tue, Aug 25, 2020 at 07:03:10PM +0200, Łukasz Stelmach wrote:
> Add node for ax88796c ethernet chip.
Subject
ARM: dts: exynos: Add Ethernet to Artik 5 board
>
> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> ---
> arch/arm/boot/dts/exynos3250-artik5-eval.dts | 21 ++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/arch/arm/boot/dts/exynos3250-artik5-eval.dts b/arch/arm/boot/dts/exynos3250-artik5-eval.dts
> index 20446a846a98..44151a2cb35d 100644
> --- a/arch/arm/boot/dts/exynos3250-artik5-eval.dts
> +++ b/arch/arm/boot/dts/exynos3250-artik5-eval.dts
> @@ -37,3 +37,24 @@ &mshc_2 {
> &serial_2 {
> status = "okay";
> };
> +
> +&spi_0 {
> + status = "okay";
> + cs-gpios = <&gpx3 4 GPIO_ACTIVE_LOW>, <0>;
> +
> + assigned-clocks = <&cmu CLK_MOUT_MPLL>, <&cmu CLK_DIV_MPLL_PRE>, <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>, <&cmu CLK_DIV_SPI0_PRE>, <&cmu CLK_SCLK_SPI0>;
> + assigned-clock-parents = <&cmu CLK_FOUT_MPLL>, <&cmu CLK_MOUT_MPLL>, <&cmu CLK_DIV_MPLL_PRE>, <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>, <&cmu CLK_DIV_SPI0_PRE>;
> +
> + ax88796c@0 {
> + compatible = "asix,ax88796c";
Isn't checkpatch complaining about undocumented compatible? I didn't see
a binding here.
> + interrupt-parent = <&gpx2>;
> + interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> + spi-max-frequency = <40000000>;
> + reg = <0x0>;
> + reset-gpios = <&gpe0 2 GPIO_ACTIVE_LOW>;
One line break.
> + controller-data {
> + samsung,spi-feedback-delay = <2>;
> + samsung,spi-chip-select-mode;
What does samsung,spi-chip-select-mode mean? git grep does not find a binding.
> + };
> + };
Whatever formatting you used here, it is not Linux coding style. Please
fix indentation, linewrapping.
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* [PATCH 3/3] ARM: defconfig: Enable ax88796c driver
2020-08-25 17:03 ` Łukasz Stelmach
@ 2020-08-25 17:03 ` Łukasz Stelmach
-1 siblings, 0 replies; 57+ messages in thread
From: Łukasz Stelmach @ 2020-08-25 17:03 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Krzysztof Kozlowski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree
Cc: m.szyprowski, b.zolnierkie, Łukasz Stelmach
Enable ax88796c driver for the ethernet chip on Exynos3250-based
ARTIK5 boards.
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
arch/arm/configs/exynos_defconfig | 2 ++
arch/arm/configs/multi_v7_defconfig | 2 ++
2 files changed, 4 insertions(+)
Please DO NOT merge before these two
https://lore.kernel.org/lkml/20200821161401.11307-2-l.stelmach@samsung.com/
https://lore.kernel.org/lkml/20200821161401.11307-3-l.stelmach@samsung.com/
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index 6e8b5ff0859c..82480b2bf545 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -107,6 +107,8 @@ CONFIG_MD=y
CONFIG_BLK_DEV_DM=y
CONFIG_DM_CRYPT=m
CONFIG_NETDEVICES=y
+CONFIG_NET_VENDOR_ASIX=y
+CONFIG_SPI_AX88796C=y
CONFIG_SMSC911X=y
CONFIG_USB_RTL8150=m
CONFIG_USB_RTL8152=y
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index e9e76e32f10f..a8b4e95d4148 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -241,6 +241,8 @@ CONFIG_SATA_HIGHBANK=y
CONFIG_SATA_MV=y
CONFIG_SATA_RCAR=y
CONFIG_NETDEVICES=y
+CONFIG_NET_VENDOR_ASIX=y
+CONFIG_SPI_AX88796C=m
CONFIG_VIRTIO_NET=y
CONFIG_B53_SPI_DRIVER=m
CONFIG_B53_MDIO_DRIVER=m
--
2.26.2
^ permalink raw reply related [flat|nested] 57+ messages in thread
* [PATCH 3/3] ARM: defconfig: Enable ax88796c driver
@ 2020-08-25 17:03 ` Łukasz Stelmach
0 siblings, 0 replies; 57+ messages in thread
From: Łukasz Stelmach @ 2020-08-25 17:03 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Krzysztof Kozlowski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree
Cc: b.zolnierkie, Łukasz Stelmach, m.szyprowski
Enable ax88796c driver for the ethernet chip on Exynos3250-based
ARTIK5 boards.
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
arch/arm/configs/exynos_defconfig | 2 ++
arch/arm/configs/multi_v7_defconfig | 2 ++
2 files changed, 4 insertions(+)
Please DO NOT merge before these two
https://lore.kernel.org/lkml/20200821161401.11307-2-l.stelmach@samsung.com/
https://lore.kernel.org/lkml/20200821161401.11307-3-l.stelmach@samsung.com/
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index 6e8b5ff0859c..82480b2bf545 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -107,6 +107,8 @@ CONFIG_MD=y
CONFIG_BLK_DEV_DM=y
CONFIG_DM_CRYPT=m
CONFIG_NETDEVICES=y
+CONFIG_NET_VENDOR_ASIX=y
+CONFIG_SPI_AX88796C=y
CONFIG_SMSC911X=y
CONFIG_USB_RTL8150=m
CONFIG_USB_RTL8152=y
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index e9e76e32f10f..a8b4e95d4148 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -241,6 +241,8 @@ CONFIG_SATA_HIGHBANK=y
CONFIG_SATA_MV=y
CONFIG_SATA_RCAR=y
CONFIG_NETDEVICES=y
+CONFIG_NET_VENDOR_ASIX=y
+CONFIG_SPI_AX88796C=m
CONFIG_VIRTIO_NET=y
CONFIG_B53_SPI_DRIVER=m
CONFIG_B53_MDIO_DRIVER=m
--
2.26.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 57+ messages in thread
* Re: [PATCH 3/3] ARM: defconfig: Enable ax88796c driver
2020-08-25 17:03 ` Łukasz Stelmach
@ 2020-08-25 18:51 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 57+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-25 18:51 UTC (permalink / raw)
To: Łukasz Stelmach
Cc: David S. Miller, Jakub Kicinski, Kukjin Kim, Rob Herring,
Russell King, linux-arm-kernel, linux-kernel, linux-samsung-soc,
netdev, devicetree, m.szyprowski, b.zolnierkie
On Tue, Aug 25, 2020 at 07:03:11PM +0200, Łukasz Stelmach wrote:
> Enable ax88796c driver for the ethernet chip on Exynos3250-based
> ARTIK5 boards.
>
> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> ---
> arch/arm/configs/exynos_defconfig | 2 ++
> arch/arm/configs/multi_v7_defconfig | 2 ++
> 2 files changed, 4 insertions(+)
>
> Please DO NOT merge before these two
Sure, it can wait but shouldn't actually DT wait? It's only defconfig so
it does not change anything except automated systems booting these
defconfigs... The boards might be broken by DT.
Best regards,
Krzysztof
>
> https://lore.kernel.org/lkml/20200821161401.11307-2-l.stelmach@samsung.com/
> https://lore.kernel.org/lkml/20200821161401.11307-3-l.stelmach@samsung.com/
>
> diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
> index 6e8b5ff0859c..82480b2bf545 100644
> --- a/arch/arm/configs/exynos_defconfig
> +++ b/arch/arm/configs/exynos_defconfig
> @@ -107,6 +107,8 @@ CONFIG_MD=y
> CONFIG_BLK_DEV_DM=y
> CONFIG_DM_CRYPT=m
> CONFIG_NETDEVICES=y
> +CONFIG_NET_VENDOR_ASIX=y
> +CONFIG_SPI_AX88796C=y
> CONFIG_SMSC911X=y
> CONFIG_USB_RTL8150=m
> CONFIG_USB_RTL8152=y
> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> index e9e76e32f10f..a8b4e95d4148 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@ -241,6 +241,8 @@ CONFIG_SATA_HIGHBANK=y
> CONFIG_SATA_MV=y
> CONFIG_SATA_RCAR=y
> CONFIG_NETDEVICES=y
> +CONFIG_NET_VENDOR_ASIX=y
> +CONFIG_SPI_AX88796C=m
> CONFIG_VIRTIO_NET=y
> CONFIG_B53_SPI_DRIVER=m
> CONFIG_B53_MDIO_DRIVER=m
> --
> 2.26.2
>
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 3/3] ARM: defconfig: Enable ax88796c driver
@ 2020-08-25 18:51 ` Krzysztof Kozlowski
0 siblings, 0 replies; 57+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-25 18:51 UTC (permalink / raw)
To: Łukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Rob Herring, linux-kernel, Kukjin Kim, Jakub Kicinski,
David S. Miller, linux-arm-kernel, m.szyprowski
On Tue, Aug 25, 2020 at 07:03:11PM +0200, Łukasz Stelmach wrote:
> Enable ax88796c driver for the ethernet chip on Exynos3250-based
> ARTIK5 boards.
>
> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> ---
> arch/arm/configs/exynos_defconfig | 2 ++
> arch/arm/configs/multi_v7_defconfig | 2 ++
> 2 files changed, 4 insertions(+)
>
> Please DO NOT merge before these two
Sure, it can wait but shouldn't actually DT wait? It's only defconfig so
it does not change anything except automated systems booting these
defconfigs... The boards might be broken by DT.
Best regards,
Krzysztof
>
> https://lore.kernel.org/lkml/20200821161401.11307-2-l.stelmach@samsung.com/
> https://lore.kernel.org/lkml/20200821161401.11307-3-l.stelmach@samsung.com/
>
> diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
> index 6e8b5ff0859c..82480b2bf545 100644
> --- a/arch/arm/configs/exynos_defconfig
> +++ b/arch/arm/configs/exynos_defconfig
> @@ -107,6 +107,8 @@ CONFIG_MD=y
> CONFIG_BLK_DEV_DM=y
> CONFIG_DM_CRYPT=m
> CONFIG_NETDEVICES=y
> +CONFIG_NET_VENDOR_ASIX=y
> +CONFIG_SPI_AX88796C=y
> CONFIG_SMSC911X=y
> CONFIG_USB_RTL8150=m
> CONFIG_USB_RTL8152=y
> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> index e9e76e32f10f..a8b4e95d4148 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@ -241,6 +241,8 @@ CONFIG_SATA_HIGHBANK=y
> CONFIG_SATA_MV=y
> CONFIG_SATA_RCAR=y
> CONFIG_NETDEVICES=y
> +CONFIG_NET_VENDOR_ASIX=y
> +CONFIG_SPI_AX88796C=m
> CONFIG_VIRTIO_NET=y
> CONFIG_B53_SPI_DRIVER=m
> CONFIG_B53_MDIO_DRIVER=m
> --
> 2.26.2
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 3/3] ARM: defconfig: Enable ax88796c driver
2020-08-25 18:51 ` Krzysztof Kozlowski
@ 2020-08-26 5:11 ` Lukasz Stelmach
-1 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-08-26 5:11 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: David S. Miller, Jakub Kicinski, Kukjin Kim, Rob Herring,
Russell King, linux-arm-kernel, linux-kernel, linux-samsung-soc,
netdev, devicetree, m.szyprowski, b.zolnierkie
[-- Attachment #1: Type: text/plain, Size: 2199 bytes --]
It was <2020-08-25 wto 20:51>, when Krzysztof Kozlowski wrote:
> On Tue, Aug 25, 2020 at 07:03:11PM +0200, Łukasz Stelmach wrote:
>> Enable ax88796c driver for the ethernet chip on Exynos3250-based
>> ARTIK5 boards.
>>
>> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
>> ---
>> arch/arm/configs/exynos_defconfig | 2 ++
>> arch/arm/configs/multi_v7_defconfig | 2 ++
>> 2 files changed, 4 insertions(+)
>>
>> Please DO NOT merge before these two
>
> Sure, it can wait but shouldn't actually DT wait? It's only defconfig so
> it does not change anything except automated systems booting these
> defconfigs... The boards might be broken by DT.
I was told, to ask for deferred merge of defconfig and it makes sense to
me. DT won't break anything if the driver isn't compiled. However, I can
see that you have a word you may decide about DT too. My point is to
wait until spi-s3c64xx patches are merged and not to break ARTIK5
boards.
>>
>> https://lore.kernel.org/lkml/20200821161401.11307-2-l.stelmach@samsung.com/
>> https://lore.kernel.org/lkml/20200821161401.11307-3-l.stelmach@samsung.com/
>>
>> diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
>> index 6e8b5ff0859c..82480b2bf545 100644
>> --- a/arch/arm/configs/exynos_defconfig
>> +++ b/arch/arm/configs/exynos_defconfig
>> @@ -107,6 +107,8 @@ CONFIG_MD=y
>> CONFIG_BLK_DEV_DM=y
>> CONFIG_DM_CRYPT=m
>> CONFIG_NETDEVICES=y
>> +CONFIG_NET_VENDOR_ASIX=y
>> +CONFIG_SPI_AX88796C=y
>> CONFIG_SMSC911X=y
>> CONFIG_USB_RTL8150=m
>> CONFIG_USB_RTL8152=y
>> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
>> index e9e76e32f10f..a8b4e95d4148 100644
>> --- a/arch/arm/configs/multi_v7_defconfig
>> +++ b/arch/arm/configs/multi_v7_defconfig
>> @@ -241,6 +241,8 @@ CONFIG_SATA_HIGHBANK=y
>> CONFIG_SATA_MV=y
>> CONFIG_SATA_RCAR=y
>> CONFIG_NETDEVICES=y
>> +CONFIG_NET_VENDOR_ASIX=y
>> +CONFIG_SPI_AX88796C=m
>> CONFIG_VIRTIO_NET=y
>> CONFIG_B53_SPI_DRIVER=m
>> CONFIG_B53_MDIO_DRIVER=m
>> --
>> 2.26.2
>>
>
>
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 3/3] ARM: defconfig: Enable ax88796c driver
@ 2020-08-26 5:11 ` Lukasz Stelmach
0 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-08-26 5:11 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Rob Herring, linux-kernel, Kukjin Kim, Jakub Kicinski,
David S. Miller, linux-arm-kernel, m.szyprowski
[-- Attachment #1.1: Type: text/plain, Size: 2199 bytes --]
It was <2020-08-25 wto 20:51>, when Krzysztof Kozlowski wrote:
> On Tue, Aug 25, 2020 at 07:03:11PM +0200, Łukasz Stelmach wrote:
>> Enable ax88796c driver for the ethernet chip on Exynos3250-based
>> ARTIK5 boards.
>>
>> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
>> ---
>> arch/arm/configs/exynos_defconfig | 2 ++
>> arch/arm/configs/multi_v7_defconfig | 2 ++
>> 2 files changed, 4 insertions(+)
>>
>> Please DO NOT merge before these two
>
> Sure, it can wait but shouldn't actually DT wait? It's only defconfig so
> it does not change anything except automated systems booting these
> defconfigs... The boards might be broken by DT.
I was told, to ask for deferred merge of defconfig and it makes sense to
me. DT won't break anything if the driver isn't compiled. However, I can
see that you have a word you may decide about DT too. My point is to
wait until spi-s3c64xx patches are merged and not to break ARTIK5
boards.
>>
>> https://lore.kernel.org/lkml/20200821161401.11307-2-l.stelmach@samsung.com/
>> https://lore.kernel.org/lkml/20200821161401.11307-3-l.stelmach@samsung.com/
>>
>> diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
>> index 6e8b5ff0859c..82480b2bf545 100644
>> --- a/arch/arm/configs/exynos_defconfig
>> +++ b/arch/arm/configs/exynos_defconfig
>> @@ -107,6 +107,8 @@ CONFIG_MD=y
>> CONFIG_BLK_DEV_DM=y
>> CONFIG_DM_CRYPT=m
>> CONFIG_NETDEVICES=y
>> +CONFIG_NET_VENDOR_ASIX=y
>> +CONFIG_SPI_AX88796C=y
>> CONFIG_SMSC911X=y
>> CONFIG_USB_RTL8150=m
>> CONFIG_USB_RTL8152=y
>> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
>> index e9e76e32f10f..a8b4e95d4148 100644
>> --- a/arch/arm/configs/multi_v7_defconfig
>> +++ b/arch/arm/configs/multi_v7_defconfig
>> @@ -241,6 +241,8 @@ CONFIG_SATA_HIGHBANK=y
>> CONFIG_SATA_MV=y
>> CONFIG_SATA_RCAR=y
>> CONFIG_NETDEVICES=y
>> +CONFIG_NET_VENDOR_ASIX=y
>> +CONFIG_SPI_AX88796C=m
>> CONFIG_VIRTIO_NET=y
>> CONFIG_B53_SPI_DRIVER=m
>> CONFIG_B53_MDIO_DRIVER=m
>> --
>> 2.26.2
>>
>
>
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 3/3] ARM: defconfig: Enable ax88796c driver
2020-08-26 5:11 ` Lukasz Stelmach
@ 2020-08-26 6:46 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 57+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-26 6:46 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: David S. Miller, Jakub Kicinski, Kukjin Kim, Rob Herring,
Russell King, linux-arm-kernel, linux-kernel, linux-samsung-soc,
netdev, devicetree, m.szyprowski, b.zolnierkie
On Wed, Aug 26, 2020 at 07:11:18AM +0200, Lukasz Stelmach wrote:
> It was <2020-08-25 wto 20:51>, when Krzysztof Kozlowski wrote:
> > On Tue, Aug 25, 2020 at 07:03:11PM +0200, Łukasz Stelmach wrote:
> >> Enable ax88796c driver for the ethernet chip on Exynos3250-based
> >> ARTIK5 boards.
> >>
> >> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> >> ---
> >> arch/arm/configs/exynos_defconfig | 2 ++
> >> arch/arm/configs/multi_v7_defconfig | 2 ++
> >> 2 files changed, 4 insertions(+)
> >>
> >> Please DO NOT merge before these two
> >
> > Sure, it can wait but shouldn't actually DT wait? It's only defconfig so
> > it does not change anything except automated systems booting these
> > defconfigs... The boards might be broken by DT.
>
> I was told, to ask for deferred merge of defconfig and it makes sense to
> me. DT won't break anything if the driver isn't compiled. However, I can
> see that you have a word you may decide about DT too. My point is to
> wait until spi-s3c64xx patches are merged and not to break ARTIK5
> boards.
The config is chosen and adjusted by each person, during build. Merging
defconfig does not necessarily affect them. However merging DT affects -
you cannot disable it without source code modification.
Anyway, no problem for me with waiting with defconfig.
Best regards,
Krzysztof
>
> >>
> >> https://lore.kernel.org/lkml/20200821161401.11307-2-l.stelmach@samsung.com/
> >> https://lore.kernel.org/lkml/20200821161401.11307-3-l.stelmach@samsung.com/
> >>
> >> diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
> >> index 6e8b5ff0859c..82480b2bf545 100644
> >> --- a/arch/arm/configs/exynos_defconfig
> >> +++ b/arch/arm/configs/exynos_defconfig
> >> @@ -107,6 +107,8 @@ CONFIG_MD=y
> >> CONFIG_BLK_DEV_DM=y
> >> CONFIG_DM_CRYPT=m
> >> CONFIG_NETDEVICES=y
> >> +CONFIG_NET_VENDOR_ASIX=y
> >> +CONFIG_SPI_AX88796C=y
> >> CONFIG_SMSC911X=y
> >> CONFIG_USB_RTL8150=m
> >> CONFIG_USB_RTL8152=y
> >> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> >> index e9e76e32f10f..a8b4e95d4148 100644
> >> --- a/arch/arm/configs/multi_v7_defconfig
> >> +++ b/arch/arm/configs/multi_v7_defconfig
> >> @@ -241,6 +241,8 @@ CONFIG_SATA_HIGHBANK=y
> >> CONFIG_SATA_MV=y
> >> CONFIG_SATA_RCAR=y
> >> CONFIG_NETDEVICES=y
> >> +CONFIG_NET_VENDOR_ASIX=y
> >> +CONFIG_SPI_AX88796C=m
> >> CONFIG_VIRTIO_NET=y
> >> CONFIG_B53_SPI_DRIVER=m
> >> CONFIG_B53_MDIO_DRIVER=m
> >> --
> >> 2.26.2
> >>
> >
> >
>
> --
> Łukasz Stelmach
> Samsung R&D Institute Poland
> Samsung Electronics
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 3/3] ARM: defconfig: Enable ax88796c driver
@ 2020-08-26 6:46 ` Krzysztof Kozlowski
0 siblings, 0 replies; 57+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-26 6:46 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Rob Herring, linux-kernel, Kukjin Kim, Jakub Kicinski,
David S. Miller, linux-arm-kernel, m.szyprowski
On Wed, Aug 26, 2020 at 07:11:18AM +0200, Lukasz Stelmach wrote:
> It was <2020-08-25 wto 20:51>, when Krzysztof Kozlowski wrote:
> > On Tue, Aug 25, 2020 at 07:03:11PM +0200, Łukasz Stelmach wrote:
> >> Enable ax88796c driver for the ethernet chip on Exynos3250-based
> >> ARTIK5 boards.
> >>
> >> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> >> ---
> >> arch/arm/configs/exynos_defconfig | 2 ++
> >> arch/arm/configs/multi_v7_defconfig | 2 ++
> >> 2 files changed, 4 insertions(+)
> >>
> >> Please DO NOT merge before these two
> >
> > Sure, it can wait but shouldn't actually DT wait? It's only defconfig so
> > it does not change anything except automated systems booting these
> > defconfigs... The boards might be broken by DT.
>
> I was told, to ask for deferred merge of defconfig and it makes sense to
> me. DT won't break anything if the driver isn't compiled. However, I can
> see that you have a word you may decide about DT too. My point is to
> wait until spi-s3c64xx patches are merged and not to break ARTIK5
> boards.
The config is chosen and adjusted by each person, during build. Merging
defconfig does not necessarily affect them. However merging DT affects -
you cannot disable it without source code modification.
Anyway, no problem for me with waiting with defconfig.
Best regards,
Krzysztof
>
> >>
> >> https://lore.kernel.org/lkml/20200821161401.11307-2-l.stelmach@samsung.com/
> >> https://lore.kernel.org/lkml/20200821161401.11307-3-l.stelmach@samsung.com/
> >>
> >> diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
> >> index 6e8b5ff0859c..82480b2bf545 100644
> >> --- a/arch/arm/configs/exynos_defconfig
> >> +++ b/arch/arm/configs/exynos_defconfig
> >> @@ -107,6 +107,8 @@ CONFIG_MD=y
> >> CONFIG_BLK_DEV_DM=y
> >> CONFIG_DM_CRYPT=m
> >> CONFIG_NETDEVICES=y
> >> +CONFIG_NET_VENDOR_ASIX=y
> >> +CONFIG_SPI_AX88796C=y
> >> CONFIG_SMSC911X=y
> >> CONFIG_USB_RTL8150=m
> >> CONFIG_USB_RTL8152=y
> >> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> >> index e9e76e32f10f..a8b4e95d4148 100644
> >> --- a/arch/arm/configs/multi_v7_defconfig
> >> +++ b/arch/arm/configs/multi_v7_defconfig
> >> @@ -241,6 +241,8 @@ CONFIG_SATA_HIGHBANK=y
> >> CONFIG_SATA_MV=y
> >> CONFIG_SATA_RCAR=y
> >> CONFIG_NETDEVICES=y
> >> +CONFIG_NET_VENDOR_ASIX=y
> >> +CONFIG_SPI_AX88796C=m
> >> CONFIG_VIRTIO_NET=y
> >> CONFIG_B53_SPI_DRIVER=m
> >> CONFIG_B53_MDIO_DRIVER=m
> >> --
> >> 2.26.2
> >>
> >
> >
>
> --
> Łukasz Stelmach
> Samsung R&D Institute Poland
> Samsung Electronics
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-25 17:03 ` Łukasz Stelmach
@ 2020-08-25 17:19 ` Randy Dunlap
-1 siblings, 0 replies; 57+ messages in thread
From: Randy Dunlap @ 2020-08-25 17:19 UTC (permalink / raw)
To: Łukasz Stelmach, David S. Miller, Jakub Kicinski,
Krzysztof Kozlowski, Kukjin Kim, Rob Herring, Russell King,
linux-arm-kernel, linux-kernel, linux-samsung-soc, netdev,
devicetree
Cc: m.szyprowski, b.zolnierkie
On 8/25/20 10:03 AM, Łukasz Stelmach wrote:
> diff --git a/drivers/net/ethernet/asix/Kconfig b/drivers/net/ethernet/asix/Kconfig
> new file mode 100644
> index 000000000000..4b127a4a659a
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/Kconfig
> @@ -0,0 +1,20 @@
> +#
> +# Asix network device configuration
> +#
> +
> +config NET_VENDOR_ASIX
> + bool "Asix devices"
Most vendor entries also have:
default y
so that they will be displayed in the config menu.
> + depends on SPI
> + help
> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
> +
> +if NET_VENDOR_ASIX
> +
> +config SPI_AX88796C
> + tristate "Asix AX88796C-SPI support"
> + depends on SPI
That line is redundant (but not harmful).
> + depends on GPIOLIB
> + help
> + Say Y here if you intend to attach a Asix AX88796C as SPI mode
> +
> +endif # NET_VENDOR_ASIX
--
~Randy
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-25 17:19 ` Randy Dunlap
0 siblings, 0 replies; 57+ messages in thread
From: Randy Dunlap @ 2020-08-25 17:19 UTC (permalink / raw)
To: Łukasz Stelmach, David S. Miller, Jakub Kicinski,
Krzysztof Kozlowski, Kukjin Kim, Rob Herring, Russell King,
linux-arm-kernel, linux-kernel, linux-samsung-soc, netdev,
devicetree
Cc: b.zolnierkie, m.szyprowski
On 8/25/20 10:03 AM, Łukasz Stelmach wrote:
> diff --git a/drivers/net/ethernet/asix/Kconfig b/drivers/net/ethernet/asix/Kconfig
> new file mode 100644
> index 000000000000..4b127a4a659a
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/Kconfig
> @@ -0,0 +1,20 @@
> +#
> +# Asix network device configuration
> +#
> +
> +config NET_VENDOR_ASIX
> + bool "Asix devices"
Most vendor entries also have:
default y
so that they will be displayed in the config menu.
> + depends on SPI
> + help
> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
> +
> +if NET_VENDOR_ASIX
> +
> +config SPI_AX88796C
> + tristate "Asix AX88796C-SPI support"
> + depends on SPI
That line is redundant (but not harmful).
> + depends on GPIOLIB
> + help
> + Say Y here if you intend to attach a Asix AX88796C as SPI mode
> +
> +endif # NET_VENDOR_ASIX
--
~Randy
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-25 17:19 ` Randy Dunlap
@ 2020-08-25 17:30 ` Lukasz Stelmach
-1 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-08-25 17:30 UTC (permalink / raw)
To: Randy Dunlap
Cc: David S. Miller, Jakub Kicinski, Krzysztof Kozlowski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree, m.szyprowski, b.zolnierkie
[-- Attachment #1: Type: text/plain, Size: 1174 bytes --]
It was <2020-08-25 wto 10:19>, when Randy Dunlap wrote:
> On 8/25/20 10:03 AM, Łukasz Stelmach wrote:
>> diff --git a/drivers/net/ethernet/asix/Kconfig b/drivers/net/ethernet/asix/Kconfig
>> new file mode 100644
>> index 000000000000..4b127a4a659a
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/Kconfig
>> @@ -0,0 +1,20 @@
>> +#
>> +# Asix network device configuration
>> +#
>> +
>> +config NET_VENDOR_ASIX
>> + bool "Asix devices"
>
> Most vendor entries also have:
> default y
> so that they will be displayed in the config menu.
OK.
>> + depends on SPI
>> + help
>> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
>> +
>> +if NET_VENDOR_ASIX
>> +
>> +config SPI_AX88796C
>> + tristate "Asix AX88796C-SPI support"
>> + depends on SPI
>
> That line is redundant (but not harmful).
Why? Is it because NET_VENDOR_ASIX depends on SPI? Probably it
shouldn't. Thanks for spotting.
>> + depends on GPIOLIB
>> + help
>> + Say Y here if you intend to attach a Asix AX88796C as SPI mode
>> +
>> +endif # NET_VENDOR_ASIX
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-25 17:30 ` Lukasz Stelmach
0 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-08-25 17:30 UTC (permalink / raw)
To: Randy Dunlap
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Krzysztof Kozlowski, linux-kernel, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller, linux-arm-kernel, m.szyprowski
[-- Attachment #1.1: Type: text/plain, Size: 1174 bytes --]
It was <2020-08-25 wto 10:19>, when Randy Dunlap wrote:
> On 8/25/20 10:03 AM, Łukasz Stelmach wrote:
>> diff --git a/drivers/net/ethernet/asix/Kconfig b/drivers/net/ethernet/asix/Kconfig
>> new file mode 100644
>> index 000000000000..4b127a4a659a
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/Kconfig
>> @@ -0,0 +1,20 @@
>> +#
>> +# Asix network device configuration
>> +#
>> +
>> +config NET_VENDOR_ASIX
>> + bool "Asix devices"
>
> Most vendor entries also have:
> default y
> so that they will be displayed in the config menu.
OK.
>> + depends on SPI
>> + help
>> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
>> +
>> +if NET_VENDOR_ASIX
>> +
>> +config SPI_AX88796C
>> + tristate "Asix AX88796C-SPI support"
>> + depends on SPI
>
> That line is redundant (but not harmful).
Why? Is it because NET_VENDOR_ASIX depends on SPI? Probably it
shouldn't. Thanks for spotting.
>> + depends on GPIOLIB
>> + help
>> + Say Y here if you intend to attach a Asix AX88796C as SPI mode
>> +
>> +endif # NET_VENDOR_ASIX
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-25 17:30 ` Lukasz Stelmach
@ 2020-08-25 17:55 ` Randy Dunlap
-1 siblings, 0 replies; 57+ messages in thread
From: Randy Dunlap @ 2020-08-25 17:55 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: David S. Miller, Jakub Kicinski, Krzysztof Kozlowski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree, m.szyprowski, b.zolnierkie
>>> +if NET_VENDOR_ASIX
>>> +
>>> +config SPI_AX88796C
>>> + tristate "Asix AX88796C-SPI support"
>>> + depends on SPI
>>
>> That line is redundant (but not harmful).
>
> Why? Is it because NET_VENDOR_ASIX depends on SPI? Probably it
> shouldn't. Thanks for spotting.
Yes, that.
--
~Randy
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-25 17:55 ` Randy Dunlap
0 siblings, 0 replies; 57+ messages in thread
From: Randy Dunlap @ 2020-08-25 17:55 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Krzysztof Kozlowski, linux-kernel, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller, linux-arm-kernel, m.szyprowski
>>> +if NET_VENDOR_ASIX
>>> +
>>> +config SPI_AX88796C
>>> + tristate "Asix AX88796C-SPI support"
>>> + depends on SPI
>>
>> That line is redundant (but not harmful).
>
> Why? Is it because NET_VENDOR_ASIX depends on SPI? Probably it
> shouldn't. Thanks for spotting.
Yes, that.
--
~Randy
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-25 17:03 ` Łukasz Stelmach
@ 2020-08-25 18:01 ` Andrew Lunn
-1 siblings, 0 replies; 57+ messages in thread
From: Andrew Lunn @ 2020-08-25 18:01 UTC (permalink / raw)
To: Łukasz Stelmach
Cc: David S. Miller, Jakub Kicinski, Krzysztof Kozlowski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree, b.zolnierkie, m.szyprowski
Hi Łukasz
It is pretty clear this is a "vendor crap driver". It needs quite a
bit more work on it.
On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
This is an odd filename. The ioctl code is wrong anyway, but there is
a lot more than ioctl in here. I suggest you give it a new name.
> @@ -0,0 +1,293 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2010 ASIX Electronics Corporation
> + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
> + *
> + * ASIX AX88796C SPI Fast Ethernet Linux driver
> + */
> +
> +#include "ax88796c_main.h"
> +#include "ax88796c_spi.h"
> +#include "ax88796c_ioctl.h"
> +
> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
bool ?
> +{
> + struct spi_status ax_status;
> +
> + /* Check media link status first */
> + if (netif_carrier_ok(ax_local->ndev) ||
> + (ax_local->ps_level == AX_PS_D0) ||
> + (ax_local->ps_level == AX_PS_D1)) {
> + return 0;
> + }
> +
> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> + if (!(ax_status.status & AX_STATUS_READY))
> + return 1;
> +
> + return 0;
> +}
> +
> +u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local)
> +{
> + struct spi_status ax_status;
> + unsigned long start_time;
> +
> + /* Check media link status first */
> + if (netif_carrier_ok(ax_local->ndev) ||
> + (ax_local->ps_level == AX_PS_D0) ||
> + (ax_local->ps_level == AX_PS_D1)) {
> + return 0;
> + }
> +
> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> + if (!(ax_status.status & AX_STATUS_READY)) {
> +
> + /* AX88796C in power saving mode */
> + AX_WAKEUP(&ax_local->ax_spi);
> +
> + /* Check status */
> + start_time = jiffies;
> + do {
> + if (time_after(jiffies, start_time + HZ/2)) {
> + netdev_err(ax_local->ndev,
> + "timeout waiting for wakeup"
> + " from power saving\n");
> + break;
> + }
> +
> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> +
> + } while (!(ax_status.status & AX_STATUS_READY));
include/linux/iopoll.h
Can the device itself put itself to sleep? If not, maybe just track
the power saving state in struct ax88796c_device?
> +int ax88796c_mdio_read(struct net_device *ndev, int phy_id, int loc)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + unsigned long start_time;
> +
> + AX_WRITE(&ax_local->ax_spi, MDIOCR_RADDR(loc)
> + | MDIOCR_FADDR(phy_id) | MDIOCR_READ, P2_MDIOCR);
> +
> + start_time = jiffies;
> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
> + if (time_after(jiffies, start_time + HZ/100))
> + return -EBUSY;
> + }
Another use case of iopoll.h
> + return AX_READ(&ax_local->ax_spi, P2_MDIODR);
> +}
> +
> +void
> +ax88796c_mdio_write(struct net_device *ndev, int phy_id, int loc, int val)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + unsigned long start_time;
> +
> + AX_WRITE(&ax_local->ax_spi, val, P2_MDIODR);
> +
> + AX_WRITE(&ax_local->ax_spi,
> + MDIOCR_RADDR(loc) | MDIOCR_FADDR(phy_id)
> + | MDIOCR_WRITE, P2_MDIOCR);
> +
> + start_time = jiffies;
> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
> + if (time_after(jiffies, start_time + HZ/100))
> + return;
> + }
> +
> + if (loc == MII_ADVERTISE) {
> + AX_WRITE(&ax_local->ax_spi, (BMCR_FULLDPLX | BMCR_ANRESTART |
> + BMCR_ANENABLE | BMCR_SPEED100), P2_MDIODR);
> + AX_WRITE(&ax_local->ax_spi, (MDIOCR_RADDR(MII_BMCR) |
> + MDIOCR_FADDR(phy_id) | MDIOCR_WRITE),
> + P2_MDIOCR);
Odd. An mdio bus driver should not need to do anything like this.
Humm, please make this is a plain MDIO bus driver, using
mdiobus_register().
> +
> + start_time = jiffies;
> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR)
> + & MDIOCR_VALID) == 0) {
> + if (time_after(jiffies, start_time + HZ/100))
> + return;
> + }
> + }
> +}
> +
> +static void ax88796c_get_drvinfo(struct net_device *ndev,
> + struct ethtool_drvinfo *info)
> +{
> + /* Inherit standard device info */
> + strncpy(info->driver, DRV_NAME, sizeof(info->driver));
> + strncpy(info->version, DRV_VERSION, sizeof(info->version));
verion is pretty much not wanted any more.
> +static u32 ax88796c_get_link(struct net_device *ndev)
> +{
> + u32 link;
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 power;
> +
> + down(&ax_local->spi_lock);
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + link = mii_link_ok(&ax_local->mii);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> + up(&ax_local->spi_lock);
> +
> + return link;
> +
> +
> +}
When you convert to phylib, this will go away.
> +static int
> +ax88796c_get_link_ksettings(struct net_device *ndev,
> + struct ethtool_link_ksettings *cmd)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 power;
> +
> + down(&ax_local->spi_lock);
Please use a mutex, not semaphores.
> +module_param(comp, int, 0);
> +MODULE_PARM_DESC(comp, "0=Non-Compression Mode, 1=Compression Mode");
> +
> +module_param(ps_level, int, 0);
> +MODULE_PARM_DESC(ps_level,
> + "Power Saving Level (0:disable 1:level 1 2:level 2)");
> +
> +module_param(msg_enable, int, 0);
> +MODULE_PARM_DESC(msg_enable, "Message mask (see linux/netdevice.h for bitmap)");
> +
> +static char *macaddr;
> +module_param(macaddr, charp, 0);
> +MODULE_PARM_DESC(macaddr, "MAC address");
No Module parameters. You can get the MAC address from DT. msg_enable
can be controlled by ethtool.
> +MODULE_AUTHOR("ASIX");
Do you expect ASIX to support this? You probably want to put your name
here.
> +MODULE_DESCRIPTION("ASIX AX88796C SPI Ethernet driver");
> +MODULE_LICENSE("GPL");
> +
> +static void ax88796c_dump_regs(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + u8 i, j;
> +
> + netdev_info(ndev,
> + " Page0 Page1 Page2 Page3 "
> + "Page4 Page5 Page6 Page7\n");
> + for (i = 0; i < 0x20; i += 2) {
> + netdev_info(ndev, "0x%02x ", i);
> + for (j = 0; j < 8; j++) {
> + netdev_info(ndev, "0x%04x ",
> + AX_READ(&ax_local->ax_spi, j * 0x20 + i));
> + }
> + netdev_info(ndev, "\n");
> + }
> + netdev_info(ndev, "\n");
Please implement ethtool -d, not this.
> +}
> +
> +static void ax88796c_dump_phy_regs(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + int i;
> +
> + netdev_info(ndev, "Dump PHY registers:\n");
> + for (i = 0; i < 6; i++) {
> + netdev_info(ndev, " MR%d = 0x%04x\n", i,
> + ax88796c_mdio_read(ax_local->ndev,
> + ax_local->mii.phy_id, i));
> + }
> +}
> +
Please delete. Let the PHY driver worry about PHY registers.
> +static void ax88796c_watchdog(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + u16 phy_status;
> + unsigned long time_to_chk = AX88796C_WATCHDOG_PERIOD;
> +
> + if (ax88796c_check_power(ax_local)) {
> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
> + return;
> + }
> +
> + ax88796c_set_power_saving(ax_local, AX_PS_D0);
You might want to look at runtime PM for all this power management.
> +
> + phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
> + if (phy_status & PSCR_PHYLINK) {
> +
> + ax_local->w_state = ax_nop;
> + time_to_chk = 0;
> +
> + } else if (!(phy_status & PSCR_PHYCOFF)) {
> + /* The ethernet cable has been plugged */
> + if (ax_local->w_state == chk_cable) {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Cable connected\n");
> +
> + ax_local->w_state = chk_link;
> + ax_local->w_ticks = 0;
> + } else {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Check media status\n");
> +
> + if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Restart autoneg\n");
> + ax88796c_mdio_write(ndev,
> + ax_local->mii.phy_id, MII_BMCR,
> + (BMCR_SPEED100 | BMCR_ANENABLE |
> + BMCR_ANRESTART));
> +
> + if (netif_msg_hw(ax_local))
> + ax88796c_dump_phy_regs(ax_local);
> + ax_local->w_ticks = 0;
> + }
> + }
> + } else {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Check cable status\n");
> +
> + ax_local->w_state = chk_cable;
> + }
> +
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + if (time_to_chk)
> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
> +}
This is not the normal use of a watchdog in network drivers. The
normal case is the network stack as asked the driver to do something,
normally a TX, and the driver has not reported the action has
completed. The state of the cable should not make any
difference. This does not actually appear to do anything useful, like
kick the hardware to bring it back to life.
> +static int ax88796c_soft_reset(struct ax88796c_device *ax_local)
> +{
> + unsigned long start;
> + u16 temp;
> +
> + AX_WRITE(&ax_local->ax_spi, PSR_RESET, P0_PSR);
> + AX_WRITE(&ax_local->ax_spi, PSR_RESET_CLR, P0_PSR);
> +
> + start = jiffies;
> + while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
> + if (time_after(jiffies, start + (160 * HZ / 1000))) {
> + dev_err(&ax_local->spi->dev,
> + "timeout waiting for reset completion\n");
> + return -1;
> + }
> + }
iopoll.h.
> +#if 0
> +static void ax88796c_set_multicast(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> +
> + set_bit(EVENT_SET_MULTI, &ax_local->flags);
> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
> +}
> +#endif
We don't allow #if 0 code in mainline.
> + if (netif_msg_pktdata(ax_local)) {
> + int loop;
> + netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
> + pkt_len, tx_skb->len, seq_num);
> +
> + netdev_info(ndev, " Dump SPI Header:\n ");
> + for (loop = 0; loop < 4; loop++)
> + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
> +
> + netdev_info(ndev, "\n");
This no longer works as far as i remember. Lines are terminate by
default even if they don't have a \n.
Please you should not be using netdev_info(). netdev_dbg() please.
> +static inline void
> +ax88796c_skb_return(struct ax88796c_device *ax_local, struct sk_buff *skb,
> + struct rx_header *rxhdr)
> +{
No inline functions in C code please.
> + struct net_device *ndev = ax_local->ndev;
> + int status;
> +
> + do {
> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
> + break;
> +
> + /* checksum error bit is set */
> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
> + (rxhdr->flags & RX_HDR3_L4_ERR))
> + break;
> +
> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
> + skb->ip_summed = CHECKSUM_UNNECESSARY;
> + }
> + } while (0);
??
> +
> + ax_local->stats.rx_packets++;
> + ax_local->stats.rx_bytes += skb->len;
> + skb->dev = ndev;
> +
> + skb->truesize = skb->len + sizeof(struct sk_buff);
> + skb->protocol = eth_type_trans(skb, ax_local->ndev);
> +
> + if (netif_msg_rx_status(ax_local))
> + netdev_info(ndev, "< rx, len %zu, type 0x%x\n",
> + skb->len + sizeof(struct ethhdr), skb->protocol);
> +
> + status = netif_rx(skb);
> + if (status != NET_RX_SUCCESS && netif_msg_rx_err(ax_local))
> + netdev_info(ndev, "netif_rx status %d\n", status);
Please go through the driver and use netdev_dbg() where appropriate.
> +}
> +
> +static void dump_packet(struct net_device *ndev, const char *msg, int len, const char *data)
> +{
> + netdev_printk(KERN_DEBUG, ndev, DRV_NAME ": %s - packet len:%d\n", msg, len);
> + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
> + data, len, true);
> +}
> +
> +static void
> +ax88796c_rx_fixup(struct ax88796c_device *ax_local, struct sk_buff *rx_skb)
> +{
> + struct rx_header *rxhdr = (struct rx_header *) rx_skb->data;
> + struct net_device *ndev = ax_local->ndev;
> + u16 len;
> +
> + be16_to_cpus(&rxhdr->flags_len);
> + be16_to_cpus(&rxhdr->seq_lenbar);
> + be16_to_cpus(&rxhdr->flags);
> +
> + if ((((short)rxhdr->flags_len) & RX_HDR1_PKT_LEN) !=
> + (~((short)rxhdr->seq_lenbar) & 0x7FF)) {
> + if (netif_msg_rx_err(ax_local)) {
> + int i;
> + netdev_err(ndev, "Header error\n");
> + //netdev_err(ndev, "Dump received frame\n");
> + /* for (i = 0; i < rx_skb->len; i++) { */
> + /* netdev_err(ndev, "%02x ", */
> + /* *(rx_skb->data + i)); */
> + /* if (((i + 1) % 16) == 0) */
> + /* netdev_err(ndev, "\n"); */
> + /* } */
No commented out code.
> + dump_packet(ndev, __func__, rx_skb->len, rx_skb->data);
and this is questionable. I can understand it while writing a driver,
but once it works, this is the sort of thing you remove.
> + }
> + ax_local->stats.rx_frame_errors++;
> + kfree_skb(rx_skb);
> + return;
> + }
> +
> + if ((rxhdr->flags_len & RX_HDR1_MII_ERR) ||
> + (rxhdr->flags_len & RX_HDR1_CRC_ERR)) {
> + if (netif_msg_rx_err(ax_local))
> + netdev_err(ndev, "CRC or MII error\n");
> +
> + ax_local->stats.rx_crc_errors++;
> + kfree_skb(rx_skb);
> + return;
> + }
> +
> + len = rxhdr->flags_len & RX_HDR1_PKT_LEN;
> + if (netif_msg_pktdata(ax_local)) {
> + int loop;
> + netdev_info(ndev, "RX data, total len %d, packet len %d\n",
> + rx_skb->len, len);
> +
> + netdev_info(ndev, " Dump RX packet header:\n ");
> + for (loop = 0; loop < sizeof(*rxhdr); loop++)
> + netdev_info(ndev, "%02x ", *(rx_skb->data + loop));
> +
> + netdev_info(ndev, "\n Dump RX packet:");
> + for (loop = 0; loop < len; loop++) {
> + if ((loop % 16) == 0)
> + netdev_info(ndev, "\n ");
> + netdev_info(ndev, "%02x ",
> + *(rx_skb->data + loop + sizeof(*rxhdr)));
> + }
> + netdev_info(ndev, "\n");
> + }
> +
> + skb_pull(rx_skb, sizeof(*rxhdr));
> + __pskb_trim(rx_skb, len);
> +
> + return ax88796c_skb_return(ax_local, rx_skb, rxhdr);
> +}
> +void ax88796c_phy_init(struct ax88796c_device *ax_local)
> +{
> + u16 advertise = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
> +
> + /* Setup LED mode */
> + AX_WRITE(&ax_local->ax_spi,
> + (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |
> + LCR_LED1_100MODE), P2_LCR0);
> + AX_WRITE(&ax_local->ax_spi,
> + (AX_READ(&ax_local->ax_spi, P2_LCR1) & LCR_LED2_MASK) |
> + LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);
> +
> + /* Enable PHY auto-polling */
> + AX_WRITE(&ax_local->ax_spi,
> + POOLCR_PHYID(ax_local->mii.phy_id) | POOLCR_POLL_EN |
> + POOLCR_POLL_FLOWCTRL | POOLCR_POLL_BMCR, P2_POOLCR);
What exactly does PHY polling do? Generally, you don't want the MAC
touching the PHY, because it can upset the PHY driver.
> +
> + ax88796c_mdio_write(ax_local->ndev,
> + ax_local->mii.phy_id, MII_ADVERTISE, advertise);
> +
> + ax88796c_mdio_write(ax_local->ndev, ax_local->mii.phy_id, MII_BMCR,
> + BMCR_SPEED100 | BMCR_ANENABLE | BMCR_ANRESTART);
> +}
> +
I stopped reviewing here.
Andrew
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-25 18:01 ` Andrew Lunn
0 siblings, 0 replies; 57+ messages in thread
From: Andrew Lunn @ 2020-08-25 18:01 UTC (permalink / raw)
To: Łukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Krzysztof Kozlowski, linux-kernel, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller, linux-arm-kernel, m.szyprowski
Hi Łukasz
It is pretty clear this is a "vendor crap driver". It needs quite a
bit more work on it.
On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
This is an odd filename. The ioctl code is wrong anyway, but there is
a lot more than ioctl in here. I suggest you give it a new name.
> @@ -0,0 +1,293 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2010 ASIX Electronics Corporation
> + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
> + *
> + * ASIX AX88796C SPI Fast Ethernet Linux driver
> + */
> +
> +#include "ax88796c_main.h"
> +#include "ax88796c_spi.h"
> +#include "ax88796c_ioctl.h"
> +
> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
bool ?
> +{
> + struct spi_status ax_status;
> +
> + /* Check media link status first */
> + if (netif_carrier_ok(ax_local->ndev) ||
> + (ax_local->ps_level == AX_PS_D0) ||
> + (ax_local->ps_level == AX_PS_D1)) {
> + return 0;
> + }
> +
> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> + if (!(ax_status.status & AX_STATUS_READY))
> + return 1;
> +
> + return 0;
> +}
> +
> +u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local)
> +{
> + struct spi_status ax_status;
> + unsigned long start_time;
> +
> + /* Check media link status first */
> + if (netif_carrier_ok(ax_local->ndev) ||
> + (ax_local->ps_level == AX_PS_D0) ||
> + (ax_local->ps_level == AX_PS_D1)) {
> + return 0;
> + }
> +
> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> + if (!(ax_status.status & AX_STATUS_READY)) {
> +
> + /* AX88796C in power saving mode */
> + AX_WAKEUP(&ax_local->ax_spi);
> +
> + /* Check status */
> + start_time = jiffies;
> + do {
> + if (time_after(jiffies, start_time + HZ/2)) {
> + netdev_err(ax_local->ndev,
> + "timeout waiting for wakeup"
> + " from power saving\n");
> + break;
> + }
> +
> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> +
> + } while (!(ax_status.status & AX_STATUS_READY));
include/linux/iopoll.h
Can the device itself put itself to sleep? If not, maybe just track
the power saving state in struct ax88796c_device?
> +int ax88796c_mdio_read(struct net_device *ndev, int phy_id, int loc)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + unsigned long start_time;
> +
> + AX_WRITE(&ax_local->ax_spi, MDIOCR_RADDR(loc)
> + | MDIOCR_FADDR(phy_id) | MDIOCR_READ, P2_MDIOCR);
> +
> + start_time = jiffies;
> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
> + if (time_after(jiffies, start_time + HZ/100))
> + return -EBUSY;
> + }
Another use case of iopoll.h
> + return AX_READ(&ax_local->ax_spi, P2_MDIODR);
> +}
> +
> +void
> +ax88796c_mdio_write(struct net_device *ndev, int phy_id, int loc, int val)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + unsigned long start_time;
> +
> + AX_WRITE(&ax_local->ax_spi, val, P2_MDIODR);
> +
> + AX_WRITE(&ax_local->ax_spi,
> + MDIOCR_RADDR(loc) | MDIOCR_FADDR(phy_id)
> + | MDIOCR_WRITE, P2_MDIOCR);
> +
> + start_time = jiffies;
> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
> + if (time_after(jiffies, start_time + HZ/100))
> + return;
> + }
> +
> + if (loc == MII_ADVERTISE) {
> + AX_WRITE(&ax_local->ax_spi, (BMCR_FULLDPLX | BMCR_ANRESTART |
> + BMCR_ANENABLE | BMCR_SPEED100), P2_MDIODR);
> + AX_WRITE(&ax_local->ax_spi, (MDIOCR_RADDR(MII_BMCR) |
> + MDIOCR_FADDR(phy_id) | MDIOCR_WRITE),
> + P2_MDIOCR);
Odd. An mdio bus driver should not need to do anything like this.
Humm, please make this is a plain MDIO bus driver, using
mdiobus_register().
> +
> + start_time = jiffies;
> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR)
> + & MDIOCR_VALID) == 0) {
> + if (time_after(jiffies, start_time + HZ/100))
> + return;
> + }
> + }
> +}
> +
> +static void ax88796c_get_drvinfo(struct net_device *ndev,
> + struct ethtool_drvinfo *info)
> +{
> + /* Inherit standard device info */
> + strncpy(info->driver, DRV_NAME, sizeof(info->driver));
> + strncpy(info->version, DRV_VERSION, sizeof(info->version));
verion is pretty much not wanted any more.
> +static u32 ax88796c_get_link(struct net_device *ndev)
> +{
> + u32 link;
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 power;
> +
> + down(&ax_local->spi_lock);
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + link = mii_link_ok(&ax_local->mii);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> + up(&ax_local->spi_lock);
> +
> + return link;
> +
> +
> +}
When you convert to phylib, this will go away.
> +static int
> +ax88796c_get_link_ksettings(struct net_device *ndev,
> + struct ethtool_link_ksettings *cmd)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 power;
> +
> + down(&ax_local->spi_lock);
Please use a mutex, not semaphores.
> +module_param(comp, int, 0);
> +MODULE_PARM_DESC(comp, "0=Non-Compression Mode, 1=Compression Mode");
> +
> +module_param(ps_level, int, 0);
> +MODULE_PARM_DESC(ps_level,
> + "Power Saving Level (0:disable 1:level 1 2:level 2)");
> +
> +module_param(msg_enable, int, 0);
> +MODULE_PARM_DESC(msg_enable, "Message mask (see linux/netdevice.h for bitmap)");
> +
> +static char *macaddr;
> +module_param(macaddr, charp, 0);
> +MODULE_PARM_DESC(macaddr, "MAC address");
No Module parameters. You can get the MAC address from DT. msg_enable
can be controlled by ethtool.
> +MODULE_AUTHOR("ASIX");
Do you expect ASIX to support this? You probably want to put your name
here.
> +MODULE_DESCRIPTION("ASIX AX88796C SPI Ethernet driver");
> +MODULE_LICENSE("GPL");
> +
> +static void ax88796c_dump_regs(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + u8 i, j;
> +
> + netdev_info(ndev,
> + " Page0 Page1 Page2 Page3 "
> + "Page4 Page5 Page6 Page7\n");
> + for (i = 0; i < 0x20; i += 2) {
> + netdev_info(ndev, "0x%02x ", i);
> + for (j = 0; j < 8; j++) {
> + netdev_info(ndev, "0x%04x ",
> + AX_READ(&ax_local->ax_spi, j * 0x20 + i));
> + }
> + netdev_info(ndev, "\n");
> + }
> + netdev_info(ndev, "\n");
Please implement ethtool -d, not this.
> +}
> +
> +static void ax88796c_dump_phy_regs(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + int i;
> +
> + netdev_info(ndev, "Dump PHY registers:\n");
> + for (i = 0; i < 6; i++) {
> + netdev_info(ndev, " MR%d = 0x%04x\n", i,
> + ax88796c_mdio_read(ax_local->ndev,
> + ax_local->mii.phy_id, i));
> + }
> +}
> +
Please delete. Let the PHY driver worry about PHY registers.
> +static void ax88796c_watchdog(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + u16 phy_status;
> + unsigned long time_to_chk = AX88796C_WATCHDOG_PERIOD;
> +
> + if (ax88796c_check_power(ax_local)) {
> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
> + return;
> + }
> +
> + ax88796c_set_power_saving(ax_local, AX_PS_D0);
You might want to look at runtime PM for all this power management.
> +
> + phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
> + if (phy_status & PSCR_PHYLINK) {
> +
> + ax_local->w_state = ax_nop;
> + time_to_chk = 0;
> +
> + } else if (!(phy_status & PSCR_PHYCOFF)) {
> + /* The ethernet cable has been plugged */
> + if (ax_local->w_state == chk_cable) {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Cable connected\n");
> +
> + ax_local->w_state = chk_link;
> + ax_local->w_ticks = 0;
> + } else {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Check media status\n");
> +
> + if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Restart autoneg\n");
> + ax88796c_mdio_write(ndev,
> + ax_local->mii.phy_id, MII_BMCR,
> + (BMCR_SPEED100 | BMCR_ANENABLE |
> + BMCR_ANRESTART));
> +
> + if (netif_msg_hw(ax_local))
> + ax88796c_dump_phy_regs(ax_local);
> + ax_local->w_ticks = 0;
> + }
> + }
> + } else {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Check cable status\n");
> +
> + ax_local->w_state = chk_cable;
> + }
> +
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + if (time_to_chk)
> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
> +}
This is not the normal use of a watchdog in network drivers. The
normal case is the network stack as asked the driver to do something,
normally a TX, and the driver has not reported the action has
completed. The state of the cable should not make any
difference. This does not actually appear to do anything useful, like
kick the hardware to bring it back to life.
> +static int ax88796c_soft_reset(struct ax88796c_device *ax_local)
> +{
> + unsigned long start;
> + u16 temp;
> +
> + AX_WRITE(&ax_local->ax_spi, PSR_RESET, P0_PSR);
> + AX_WRITE(&ax_local->ax_spi, PSR_RESET_CLR, P0_PSR);
> +
> + start = jiffies;
> + while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
> + if (time_after(jiffies, start + (160 * HZ / 1000))) {
> + dev_err(&ax_local->spi->dev,
> + "timeout waiting for reset completion\n");
> + return -1;
> + }
> + }
iopoll.h.
> +#if 0
> +static void ax88796c_set_multicast(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> +
> + set_bit(EVENT_SET_MULTI, &ax_local->flags);
> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
> +}
> +#endif
We don't allow #if 0 code in mainline.
> + if (netif_msg_pktdata(ax_local)) {
> + int loop;
> + netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
> + pkt_len, tx_skb->len, seq_num);
> +
> + netdev_info(ndev, " Dump SPI Header:\n ");
> + for (loop = 0; loop < 4; loop++)
> + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
> +
> + netdev_info(ndev, "\n");
This no longer works as far as i remember. Lines are terminate by
default even if they don't have a \n.
Please you should not be using netdev_info(). netdev_dbg() please.
> +static inline void
> +ax88796c_skb_return(struct ax88796c_device *ax_local, struct sk_buff *skb,
> + struct rx_header *rxhdr)
> +{
No inline functions in C code please.
> + struct net_device *ndev = ax_local->ndev;
> + int status;
> +
> + do {
> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
> + break;
> +
> + /* checksum error bit is set */
> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
> + (rxhdr->flags & RX_HDR3_L4_ERR))
> + break;
> +
> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
> + skb->ip_summed = CHECKSUM_UNNECESSARY;
> + }
> + } while (0);
??
> +
> + ax_local->stats.rx_packets++;
> + ax_local->stats.rx_bytes += skb->len;
> + skb->dev = ndev;
> +
> + skb->truesize = skb->len + sizeof(struct sk_buff);
> + skb->protocol = eth_type_trans(skb, ax_local->ndev);
> +
> + if (netif_msg_rx_status(ax_local))
> + netdev_info(ndev, "< rx, len %zu, type 0x%x\n",
> + skb->len + sizeof(struct ethhdr), skb->protocol);
> +
> + status = netif_rx(skb);
> + if (status != NET_RX_SUCCESS && netif_msg_rx_err(ax_local))
> + netdev_info(ndev, "netif_rx status %d\n", status);
Please go through the driver and use netdev_dbg() where appropriate.
> +}
> +
> +static void dump_packet(struct net_device *ndev, const char *msg, int len, const char *data)
> +{
> + netdev_printk(KERN_DEBUG, ndev, DRV_NAME ": %s - packet len:%d\n", msg, len);
> + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
> + data, len, true);
> +}
> +
> +static void
> +ax88796c_rx_fixup(struct ax88796c_device *ax_local, struct sk_buff *rx_skb)
> +{
> + struct rx_header *rxhdr = (struct rx_header *) rx_skb->data;
> + struct net_device *ndev = ax_local->ndev;
> + u16 len;
> +
> + be16_to_cpus(&rxhdr->flags_len);
> + be16_to_cpus(&rxhdr->seq_lenbar);
> + be16_to_cpus(&rxhdr->flags);
> +
> + if ((((short)rxhdr->flags_len) & RX_HDR1_PKT_LEN) !=
> + (~((short)rxhdr->seq_lenbar) & 0x7FF)) {
> + if (netif_msg_rx_err(ax_local)) {
> + int i;
> + netdev_err(ndev, "Header error\n");
> + //netdev_err(ndev, "Dump received frame\n");
> + /* for (i = 0; i < rx_skb->len; i++) { */
> + /* netdev_err(ndev, "%02x ", */
> + /* *(rx_skb->data + i)); */
> + /* if (((i + 1) % 16) == 0) */
> + /* netdev_err(ndev, "\n"); */
> + /* } */
No commented out code.
> + dump_packet(ndev, __func__, rx_skb->len, rx_skb->data);
and this is questionable. I can understand it while writing a driver,
but once it works, this is the sort of thing you remove.
> + }
> + ax_local->stats.rx_frame_errors++;
> + kfree_skb(rx_skb);
> + return;
> + }
> +
> + if ((rxhdr->flags_len & RX_HDR1_MII_ERR) ||
> + (rxhdr->flags_len & RX_HDR1_CRC_ERR)) {
> + if (netif_msg_rx_err(ax_local))
> + netdev_err(ndev, "CRC or MII error\n");
> +
> + ax_local->stats.rx_crc_errors++;
> + kfree_skb(rx_skb);
> + return;
> + }
> +
> + len = rxhdr->flags_len & RX_HDR1_PKT_LEN;
> + if (netif_msg_pktdata(ax_local)) {
> + int loop;
> + netdev_info(ndev, "RX data, total len %d, packet len %d\n",
> + rx_skb->len, len);
> +
> + netdev_info(ndev, " Dump RX packet header:\n ");
> + for (loop = 0; loop < sizeof(*rxhdr); loop++)
> + netdev_info(ndev, "%02x ", *(rx_skb->data + loop));
> +
> + netdev_info(ndev, "\n Dump RX packet:");
> + for (loop = 0; loop < len; loop++) {
> + if ((loop % 16) == 0)
> + netdev_info(ndev, "\n ");
> + netdev_info(ndev, "%02x ",
> + *(rx_skb->data + loop + sizeof(*rxhdr)));
> + }
> + netdev_info(ndev, "\n");
> + }
> +
> + skb_pull(rx_skb, sizeof(*rxhdr));
> + __pskb_trim(rx_skb, len);
> +
> + return ax88796c_skb_return(ax_local, rx_skb, rxhdr);
> +}
> +void ax88796c_phy_init(struct ax88796c_device *ax_local)
> +{
> + u16 advertise = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
> +
> + /* Setup LED mode */
> + AX_WRITE(&ax_local->ax_spi,
> + (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |
> + LCR_LED1_100MODE), P2_LCR0);
> + AX_WRITE(&ax_local->ax_spi,
> + (AX_READ(&ax_local->ax_spi, P2_LCR1) & LCR_LED2_MASK) |
> + LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);
> +
> + /* Enable PHY auto-polling */
> + AX_WRITE(&ax_local->ax_spi,
> + POOLCR_PHYID(ax_local->mii.phy_id) | POOLCR_POLL_EN |
> + POOLCR_POLL_FLOWCTRL | POOLCR_POLL_BMCR, P2_POOLCR);
What exactly does PHY polling do? Generally, you don't want the MAC
touching the PHY, because it can upset the PHY driver.
> +
> + ax88796c_mdio_write(ax_local->ndev,
> + ax_local->mii.phy_id, MII_ADVERTISE, advertise);
> +
> + ax88796c_mdio_write(ax_local->ndev, ax_local->mii.phy_id, MII_BMCR,
> + BMCR_SPEED100 | BMCR_ANENABLE | BMCR_ANRESTART);
> +}
> +
I stopped reviewing here.
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-25 18:01 ` Andrew Lunn
@ 2020-08-26 7:13 ` Geert Uytterhoeven
-1 siblings, 0 replies; 57+ messages in thread
From: Geert Uytterhoeven @ 2020-08-26 7:13 UTC (permalink / raw)
To: Andrew Lunn
Cc: Łukasz Stelmach, David S. Miller, Jakub Kicinski,
Krzysztof Kozlowski, Kukjin Kim, Rob Herring, Russell King,
Linux ARM, Linux Kernel Mailing List, linux-samsung-soc, netdev,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Bartlomiej Zolnierkiewicz, Marek Szyprowski
On Tue, Aug 25, 2020 at 8:02 PM Andrew Lunn <andrew@lunn.ch> wrote:
> On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> > + if (netif_msg_pktdata(ax_local)) {
> > + int loop;
> > + netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
> > + pkt_len, tx_skb->len, seq_num);
> > +
> > + netdev_info(ndev, " Dump SPI Header:\n ");
> > + for (loop = 0; loop < 4; loop++)
> > + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
> > +
> > + netdev_info(ndev, "\n");
>
> This no longer works as far as i remember. Lines are terminate by
> default even if they don't have a \n.
>
> Please you should not be using netdev_info(). netdev_dbg() please.
We have a nice helper for this: print_hex_dump_debug().
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-26 7:13 ` Geert Uytterhoeven
0 siblings, 0 replies; 57+ messages in thread
From: Geert Uytterhoeven @ 2020-08-26 7:13 UTC (permalink / raw)
To: Andrew Lunn
Cc: open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-samsung-soc, Bartlomiej Zolnierkiewicz, netdev,
Łukasz Stelmach, Russell King, Krzysztof Kozlowski,
Linux Kernel Mailing List, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller, Linux ARM, Marek Szyprowski
On Tue, Aug 25, 2020 at 8:02 PM Andrew Lunn <andrew@lunn.ch> wrote:
> On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> > + if (netif_msg_pktdata(ax_local)) {
> > + int loop;
> > + netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
> > + pkt_len, tx_skb->len, seq_num);
> > +
> > + netdev_info(ndev, " Dump SPI Header:\n ");
> > + for (loop = 0; loop < 4; loop++)
> > + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
> > +
> > + netdev_info(ndev, "\n");
>
> This no longer works as far as i remember. Lines are terminate by
> default even if they don't have a \n.
>
> Please you should not be using netdev_info(). netdev_dbg() please.
We have a nice helper for this: print_hex_dump_debug().
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-26 7:13 ` Geert Uytterhoeven
@ 2020-09-07 17:47 ` Lukasz Stelmach
-1 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-09-07 17:47 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Andrew Lunn, David S. Miller, Jakub Kicinski, Krzysztof Kozlowski,
Kukjin Kim, Rob Herring, Russell King, Linux ARM,
Linux Kernel Mailing List, linux-samsung-soc, netdev,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Bartlomiej Zolnierkiewicz, Marek Szyprowski
[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]
It was <2020-08-26 śro 09:13>, when Geert Uytterhoeven wrote:
> On Tue, Aug 25, 2020 at 8:02 PM Andrew Lunn <andrew@lunn.ch> wrote:
>> On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
>> > + if (netif_msg_pktdata(ax_local)) {
>> > + int loop;
>> > + netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
>> > + pkt_len, tx_skb->len, seq_num);
>> > +
>> > + netdev_info(ndev, " Dump SPI Header:\n ");
>> > + for (loop = 0; loop < 4; loop++)
>> > + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
>> > +
>> > + netdev_info(ndev, "\n");
>>
>> This no longer works as far as i remember. Lines are terminate by
>> default even if they don't have a \n.
>>
>> Please you should not be using netdev_info(). netdev_dbg() please.
>
> We have a nice helper for this: print_hex_dump_debug().
It is good to know.
Actually I think printe_hex_dump(KERN_INFO) is here more
appropriate. With *_debug() functions and dynamic debug enabled users
need to flip two switches to see messages. I think that if msglvl
(pktdata in this case) is not turned on by default and users need to use
ethtool to switch it, they shouldn't be required to fiddle with dynamic
debug too.
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-09-07 17:47 ` Lukasz Stelmach
0 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-09-07 17:47 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Andrew Lunn, linux-samsung-soc,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
netdev, Bartlomiej Zolnierkiewicz, Russell King,
Krzysztof Kozlowski, Linux Kernel Mailing List, Rob Herring,
Kukjin Kim, Jakub Kicinski, David S. Miller, Linux ARM,
Marek Szyprowski
[-- Attachment #1.1: Type: text/plain, Size: 1403 bytes --]
It was <2020-08-26 śro 09:13>, when Geert Uytterhoeven wrote:
> On Tue, Aug 25, 2020 at 8:02 PM Andrew Lunn <andrew@lunn.ch> wrote:
>> On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
>> > + if (netif_msg_pktdata(ax_local)) {
>> > + int loop;
>> > + netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
>> > + pkt_len, tx_skb->len, seq_num);
>> > +
>> > + netdev_info(ndev, " Dump SPI Header:\n ");
>> > + for (loop = 0; loop < 4; loop++)
>> > + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
>> > +
>> > + netdev_info(ndev, "\n");
>>
>> This no longer works as far as i remember. Lines are terminate by
>> default even if they don't have a \n.
>>
>> Please you should not be using netdev_info(). netdev_dbg() please.
>
> We have a nice helper for this: print_hex_dump_debug().
It is good to know.
Actually I think printe_hex_dump(KERN_INFO) is here more
appropriate. With *_debug() functions and dynamic debug enabled users
need to flip two switches to see messages. I think that if msglvl
(pktdata in this case) is not turned on by default and users need to use
ethtool to switch it, they shouldn't be required to fiddle with dynamic
debug too.
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-25 18:01 ` Andrew Lunn
@ 2020-09-07 17:39 ` Lukasz Stelmach
-1 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-09-07 17:39 UTC (permalink / raw)
To: Andrew Lunn
Cc: David S. Miller, Jakub Kicinski, Krzysztof Kozlowski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree, b.zolnierkie, m.szyprowski
[-- Attachment #1: Type: text/plain, Size: 18362 bytes --]
It was <2020-08-25 wto 20:01>, when Andrew Lunn wrote:
> Hi Łukasz
>
> It is pretty clear this is a "vendor crap driver".
I can't deny.
> It needs quite a bit more work on it.
I'll be more than happy to take your suggestions.
> On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
>> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
>
> This is an odd filename. The ioctl code is wrong anyway, but there is
> a lot more than ioctl in here. I suggest you give it a new name.
>
Sure, any suggestions?
>> @@ -0,0 +1,293 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2010 ASIX Electronics Corporation
>> + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
>> + *
>> + * ASIX AX88796C SPI Fast Ethernet Linux driver
>> + */
>> +
>> +#include "ax88796c_main.h"
>> +#include "ax88796c_spi.h"
>> +#include "ax88796c_ioctl.h"
>> +
>> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
>
> bool ?
OK.
It appears, however, that 0 means OK and 1 !OK. Do you think changing to
TRUE and FALSE (or FALSE and TRUE) is required?
>> +{
>> + struct spi_status ax_status;
>> +
>> + /* Check media link status first */
>> + if (netif_carrier_ok(ax_local->ndev) ||
>> + (ax_local->ps_level == AX_PS_D0) ||
>> + (ax_local->ps_level == AX_PS_D1)) {
>> + return 0;
>> + }
>> +
>> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> + if (!(ax_status.status & AX_STATUS_READY))
>> + return 1;
>> +
>> + return 0;
>> +}
>> +
>> +u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local)
>> +{
>> + struct spi_status ax_status;
>> + unsigned long start_time;
>> +
>> + /* Check media link status first */
>> + if (netif_carrier_ok(ax_local->ndev) ||
>> + (ax_local->ps_level == AX_PS_D0) ||
>> + (ax_local->ps_level == AX_PS_D1)) {
>> + return 0;
>> + }
>> +
>> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> + if (!(ax_status.status & AX_STATUS_READY)) {
>> +
>> + /* AX88796C in power saving mode */
>> + AX_WAKEUP(&ax_local->ax_spi);
>> +
>> + /* Check status */
>> + start_time = jiffies;
>> + do {
>> + if (time_after(jiffies, start_time + HZ/2)) {
>> + netdev_err(ax_local->ndev,
>> + "timeout waiting for wakeup"
>> + " from power saving\n");
>> + break;
>> + }
>> +
>> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> +
>> + } while (!(ax_status.status & AX_STATUS_READY));
>
> include/linux/iopoll.h
>
Done. The result seems only slightly more elegant since the generic
read_poll_timeout() needs to be employed.
>
> Can the device itself put itself to sleep? If not, maybe just track
> the power saving state in struct ax88796c_device?
>
Yes, it can. When the cable is unplugged, parts of of the chip enter
power saving mode and the values in registers change.
>> +int ax88796c_mdio_read(struct net_device *ndev, int phy_id, int loc)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + unsigned long start_time;
>> +
>> + AX_WRITE(&ax_local->ax_spi, MDIOCR_RADDR(loc)
>> + | MDIOCR_FADDR(phy_id) | MDIOCR_READ, P2_MDIOCR);
>> +
>> + start_time = jiffies;
>> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
>> + if (time_after(jiffies, start_time + HZ/100))
>> + return -EBUSY;
>> + }
>
> Another use case of iopoll.h
>
Done.
>> + return AX_READ(&ax_local->ax_spi, P2_MDIODR);
>> +}
>> +
>> +void
>> +ax88796c_mdio_write(struct net_device *ndev, int phy_id, int loc, int val)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + unsigned long start_time;
>> +
>> + AX_WRITE(&ax_local->ax_spi, val, P2_MDIODR);
>> +
>> + AX_WRITE(&ax_local->ax_spi,
>> + MDIOCR_RADDR(loc) | MDIOCR_FADDR(phy_id)
>> + | MDIOCR_WRITE, P2_MDIOCR);
>> +
>> + start_time = jiffies;
>> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
>> + if (time_after(jiffies, start_time + HZ/100))
>> + return;
>> + }
>> +
>> + if (loc == MII_ADVERTISE) {
>> + AX_WRITE(&ax_local->ax_spi, (BMCR_FULLDPLX | BMCR_ANRESTART |
>> + BMCR_ANENABLE | BMCR_SPEED100), P2_MDIODR);
>> + AX_WRITE(&ax_local->ax_spi, (MDIOCR_RADDR(MII_BMCR) |
>> + MDIOCR_FADDR(phy_id) | MDIOCR_WRITE),
>> + P2_MDIOCR);
>
> Odd. An mdio bus driver should not need to do anything like this.
>
> Humm, please make this is a plain MDIO bus driver, using
> mdiobus_register().
>
The manufacturer says
The AX88796C integrates on-chip Fast Ethernet MAC and PHY, […]
There is a single integrated PHY in this chip and no possiblity to
connect external one. Do you think it makes sense in such case to
introduce the additional layer of abstraction?
>> +
>> + start_time = jiffies;
>> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR)
>> + & MDIOCR_VALID) == 0) {
>> + if (time_after(jiffies, start_time + HZ/100))
>> + return;
>> + }
>> + }
>> +}
>> +
>
>> +static void ax88796c_get_drvinfo(struct net_device *ndev,
>> + struct ethtool_drvinfo *info)
>> +{
>> + /* Inherit standard device info */
>> + strncpy(info->driver, DRV_NAME, sizeof(info->driver));
>> + strncpy(info->version, DRV_VERSION, sizeof(info->version));
>
> verion is pretty much not wanted any more.
>
Removed.
>> +static u32 ax88796c_get_link(struct net_device *ndev)
>> +{
>> + u32 link;
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + link = mii_link_ok(&ax_local->mii);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> + up(&ax_local->spi_lock);
>> +
>> + return link;
>> +
>> +
>> +}
>
> When you convert to phylib, this will go away.
>
See above (single integrated phy).
>> +static int
>> +ax88796c_get_link_ksettings(struct net_device *ndev,
>> + struct ethtool_link_ksettings *cmd)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>
> Please use a mutex, not semaphores.
>
Done.
>> +module_param(comp, int, 0);
>> +MODULE_PARM_DESC(comp, "0=Non-Compression Mode, 1=Compression Mode");
>> +
>> +module_param(ps_level, int, 0);
>> +MODULE_PARM_DESC(ps_level,
>> + "Power Saving Level (0:disable 1:level 1 2:level 2)");
>> +
>> +module_param(msg_enable, int, 0);
>> +MODULE_PARM_DESC(msg_enable, "Message mask (see linux/netdevice.h for bitmap)");
>> +
>> +static char *macaddr;
>> +module_param(macaddr, charp, 0);
>> +MODULE_PARM_DESC(macaddr, "MAC address");
>
> No Module parameters. You can get the MAC address from DT.
What about systems without DT? Not every bootloader is sophisicated
enough to edit DT before starting kernel. AX88786C is a chip that can be
used in a variety of systems and I'd like to avoid too strong
assumptions.
Of course reading MAC address from DT is a good idea and I will add it.
> msg_enable can be controlled by ethtool.
But it does not work during boot.
>> +MODULE_AUTHOR("ASIX");
>
> Do you expect ASIX to support this?
No.
> You probably want to put your name here.
I don't want to be considered as the only author and as far as I can
tell being mentioned as an author does not imply being a
maintainer. Do you think two MODULE_AUTHOR()s be OK?
>> +MODULE_DESCRIPTION("ASIX AX88796C SPI Ethernet driver");
>> +MODULE_LICENSE("GPL");
>> +
>> +static void ax88796c_dump_regs(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + u8 i, j;
>> +
>> + netdev_info(ndev,
>> + " Page0 Page1 Page2 Page3 "
>> + "Page4 Page5 Page6 Page7\n");
>> + for (i = 0; i < 0x20; i += 2) {
>> + netdev_info(ndev, "0x%02x ", i);
>> + for (j = 0; j < 8; j++) {
>> + netdev_info(ndev, "0x%04x ",
>> + AX_READ(&ax_local->ax_spi, j * 0x20 + i));
>> + }
>> + netdev_info(ndev, "\n");
>> + }
>> + netdev_info(ndev, "\n");
>
> Please implement ethtool -d, not this.
>
Done.
>> +}
>> +
>> +static void ax88796c_dump_phy_regs(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + int i;
>> +
>> + netdev_info(ndev, "Dump PHY registers:\n");
>> + for (i = 0; i < 6; i++) {
>> + netdev_info(ndev, " MR%d = 0x%04x\n", i,
>> + ax88796c_mdio_read(ax_local->ndev,
>> + ax_local->mii.phy_id, i));
>> + }
>> +}
>> +
>
> Please delete. Let the PHY driver worry about PHY registers.
>
See above (single integrated phy).
>> +static void ax88796c_watchdog(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + u16 phy_status;
>> + unsigned long time_to_chk = AX88796C_WATCHDOG_PERIOD;
>> +
>> + if (ax88796c_check_power(ax_local)) {
>> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
>> + return;
>> + }
>> +
>> + ax88796c_set_power_saving(ax_local, AX_PS_D0);
>
> You might want to look at runtime PM for all this power management.
>
This one and the one below, are to manage device's PM state during this
function.
>> +
>> + phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
>> + if (phy_status & PSCR_PHYLINK) {
>> +
>> + ax_local->w_state = ax_nop;
>> + time_to_chk = 0;
>> +
>> + } else if (!(phy_status & PSCR_PHYCOFF)) {
>> + /* The ethernet cable has been plugged */
>> + if (ax_local->w_state == chk_cable) {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Cable connected\n");
>> +
>> + ax_local->w_state = chk_link;
>> + ax_local->w_ticks = 0;
>> + } else {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Check media status\n");
>> +
>> + if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Restart autoneg\n");
>> + ax88796c_mdio_write(ndev,
>> + ax_local->mii.phy_id, MII_BMCR,
>> + (BMCR_SPEED100 | BMCR_ANENABLE |
>> + BMCR_ANRESTART));
>> +
>> + if (netif_msg_hw(ax_local))
>> + ax88796c_dump_phy_regs(ax_local);
>> + ax_local->w_ticks = 0;
>> + }
>> + }
>> + } else {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Check cable status\n");
>> +
>> + ax_local->w_state = chk_cable;
>> + }
>> +
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + if (time_to_chk)
>> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
>> +}
>
> This is not the normal use of a watchdog in network drivers. The
> normal case is the network stack as asked the driver to do something,
> normally a TX, and the driver has not reported the action has
> completed. The state of the cable should not make any
> difference. This does not actually appear to do anything useful, like
> kick the hardware to bring it back to life.
>
Maybe it's the naming that is a problem. Yes, it is not a watchdog, but
rather a periodic housekeeping and it kicks hw if it can't negotiate
the connection. The question is: should the settings be reset in such case.
>> +static int ax88796c_soft_reset(struct ax88796c_device *ax_local)
>> +{
>> + unsigned long start;
>> + u16 temp;
>> +
>> + AX_WRITE(&ax_local->ax_spi, PSR_RESET, P0_PSR);
>> + AX_WRITE(&ax_local->ax_spi, PSR_RESET_CLR, P0_PSR);
>> +
>> + start = jiffies;
>> + while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
>> + if (time_after(jiffies, start + (160 * HZ / 1000))) {
>> + dev_err(&ax_local->spi->dev,
>> + "timeout waiting for reset completion\n");
>> + return -1;
>> + }
>> + }
>
> iopoll.h.
>
Done
>> +#if 0
>> +static void ax88796c_set_multicast(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> +
>> + set_bit(EVENT_SET_MULTI, &ax_local->flags);
>> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
>> +}
>> +#endif
>
> We don't allow #if 0 code in mainline.
>
Removed.
>> + if (netif_msg_pktdata(ax_local)) {
>> + int loop;
>> + netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
>> + pkt_len, tx_skb->len, seq_num);
>> +
>> + netdev_info(ndev, " Dump SPI Header:\n ");
>> + for (loop = 0; loop < 4; loop++)
>> + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
>> +
>> + netdev_info(ndev, "\n");
>
> This no longer works as far as i remember. Lines are terminate by
> default even if they don't have a \n.
>
> Please you should not be using netdev_info(). netdev_dbg() please.
>
I changed most netif_msg_*()+netdev_*() to netif_*(), including
netif_dbg() in several places. However, after reading other drivers I
decided to leave this at INFO level. I think this is the way to go,
because this is what user asks for and with dynamic debug enabled users
would have to ask for these in two different places.
>> +static inline void
>> +ax88796c_skb_return(struct ax88796c_device *ax_local, struct sk_buff *skb,
>> + struct rx_header *rxhdr)
>> +{
>
> No inline functions in C code please.
>
Done.
>> + struct net_device *ndev = ax_local->ndev;
>> + int status;
>> +
>> + do {
>> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
>> + break;
>> +
>> + /* checksum error bit is set */
>> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
>> + (rxhdr->flags & RX_HDR3_L4_ERR))
>> + break;
>> +
>> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
>> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
>> + skb->ip_summed = CHECKSUM_UNNECESSARY;
>> + }
>> + } while (0);
>
>
> ??
>
if() break; Should I use goto?
>> +
>> + ax_local->stats.rx_packets++;
>> + ax_local->stats.rx_bytes += skb->len;
>> + skb->dev = ndev;
>> +
>> + skb->truesize = skb->len + sizeof(struct sk_buff);
>> + skb->protocol = eth_type_trans(skb, ax_local->ndev);
>> +
>> + if (netif_msg_rx_status(ax_local))
>> + netdev_info(ndev, "< rx, len %zu, type 0x%x\n",
>> + skb->len + sizeof(struct ethhdr), skb->protocol);
>> +
>> + status = netif_rx(skb);
>> + if (status != NET_RX_SUCCESS && netif_msg_rx_err(ax_local))
>> + netdev_info(ndev, "netif_rx status %d\n", status);
>
> Please go through the driver and use netdev_dbg() where appropriate.
>
Done, partially (see above.)
>> +}
>> +
>> +static void dump_packet(struct net_device *ndev, const char *msg, int len, const char *data)
>> +{
>> + netdev_printk(KERN_DEBUG, ndev, DRV_NAME ": %s - packet len:%d\n", msg, len);
>> + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
>> + data, len, true);
>> +}
>> +
>> +static void
>> +ax88796c_rx_fixup(struct ax88796c_device *ax_local, struct sk_buff *rx_skb)
>> +{
>> + struct rx_header *rxhdr = (struct rx_header *) rx_skb->data;
>> + struct net_device *ndev = ax_local->ndev;
>> + u16 len;
>> +
>> + be16_to_cpus(&rxhdr->flags_len);
>> + be16_to_cpus(&rxhdr->seq_lenbar);
>> + be16_to_cpus(&rxhdr->flags);
>> +
>> + if ((((short)rxhdr->flags_len) & RX_HDR1_PKT_LEN) !=
>> + (~((short)rxhdr->seq_lenbar) & 0x7FF)) {
>> + if (netif_msg_rx_err(ax_local)) {
>> + int i;
>> + netdev_err(ndev, "Header error\n");
>> + //netdev_err(ndev, "Dump received frame\n");
>> + /* for (i = 0; i < rx_skb->len; i++) { */
>> + /* netdev_err(ndev, "%02x ", */
>> + /* *(rx_skb->data + i)); */
>> + /* if (((i + 1) % 16) == 0) */
>> + /* netdev_err(ndev, "\n"); */
>> + /* } */
>
> No commented out code.
>
Removed.
>> + dump_packet(ndev, __func__, rx_skb->len, rx_skb->data);
>
> and this is questionable. I can understand it while writing a driver,
> but once it works, this is the sort of thing you remove.
>
Removed.
>> + }
>> + ax_local->stats.rx_frame_errors++;
>> + kfree_skb(rx_skb);
>> + return;
>> + }
>> +
>> + if ((rxhdr->flags_len & RX_HDR1_MII_ERR) ||
>> + (rxhdr->flags_len & RX_HDR1_CRC_ERR)) {
>> + if (netif_msg_rx_err(ax_local))
>> + netdev_err(ndev, "CRC or MII error\n");
>> +
>> + ax_local->stats.rx_crc_errors++;
>> + kfree_skb(rx_skb);
>> + return;
>> + }
>> +
>> + len = rxhdr->flags_len & RX_HDR1_PKT_LEN;
>> + if (netif_msg_pktdata(ax_local)) {
>> + int loop;
>> + netdev_info(ndev, "RX data, total len %d, packet len %d\n",
>> + rx_skb->len, len);
>> +
>> + netdev_info(ndev, " Dump RX packet header:\n ");
>> + for (loop = 0; loop < sizeof(*rxhdr); loop++)
>> + netdev_info(ndev, "%02x ", *(rx_skb->data + loop));
>> +
>> + netdev_info(ndev, "\n Dump RX packet:");
>> + for (loop = 0; loop < len; loop++) {
>> + if ((loop % 16) == 0)
>> + netdev_info(ndev, "\n ");
>> + netdev_info(ndev, "%02x ",
>> + *(rx_skb->data + loop + sizeof(*rxhdr)));
>> + }
>> + netdev_info(ndev, "\n");
>> + }
>> +
>> + skb_pull(rx_skb, sizeof(*rxhdr));
>> + __pskb_trim(rx_skb, len);
>> +
>> + return ax88796c_skb_return(ax_local, rx_skb, rxhdr);
>> +}
>
>> +void ax88796c_phy_init(struct ax88796c_device *ax_local)
>> +{
>> + u16 advertise = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
>> +
>> + /* Setup LED mode */
>> + AX_WRITE(&ax_local->ax_spi,
>> + (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |
>> + LCR_LED1_100MODE), P2_LCR0);
>> + AX_WRITE(&ax_local->ax_spi,
>> + (AX_READ(&ax_local->ax_spi, P2_LCR1) & LCR_LED2_MASK) |
>> + LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);
>> +
>> + /* Enable PHY auto-polling */
>> + AX_WRITE(&ax_local->ax_spi,
>> + POOLCR_PHYID(ax_local->mii.phy_id) | POOLCR_POLL_EN |
>> + POOLCR_POLL_FLOWCTRL | POOLCR_POLL_BMCR, P2_POOLCR);
>
> What exactly does PHY polling do? Generally, you don't want the MAC
> touching the PHY, because it can upset the PHY driver.
>
See above (single integrated phy).
>> +
>> + ax88796c_mdio_write(ax_local->ndev,
>> + ax_local->mii.phy_id, MII_ADVERTISE, advertise);
>> +
>> + ax88796c_mdio_write(ax_local->ndev, ax_local->mii.phy_id, MII_BMCR,
>> + BMCR_SPEED100 | BMCR_ANENABLE | BMCR_ANRESTART);
>> +}
>> +
>
> I stopped reviewing here.
It took a while to work through it all. Thank you very much for your
effort.
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-09-07 17:39 ` Lukasz Stelmach
0 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-09-07 17:39 UTC (permalink / raw)
To: Andrew Lunn
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Krzysztof Kozlowski, linux-kernel, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller, linux-arm-kernel, m.szyprowski
[-- Attachment #1.1: Type: text/plain, Size: 18362 bytes --]
It was <2020-08-25 wto 20:01>, when Andrew Lunn wrote:
> Hi Łukasz
>
> It is pretty clear this is a "vendor crap driver".
I can't deny.
> It needs quite a bit more work on it.
I'll be more than happy to take your suggestions.
> On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
>> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
>
> This is an odd filename. The ioctl code is wrong anyway, but there is
> a lot more than ioctl in here. I suggest you give it a new name.
>
Sure, any suggestions?
>> @@ -0,0 +1,293 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2010 ASIX Electronics Corporation
>> + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
>> + *
>> + * ASIX AX88796C SPI Fast Ethernet Linux driver
>> + */
>> +
>> +#include "ax88796c_main.h"
>> +#include "ax88796c_spi.h"
>> +#include "ax88796c_ioctl.h"
>> +
>> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
>
> bool ?
OK.
It appears, however, that 0 means OK and 1 !OK. Do you think changing to
TRUE and FALSE (or FALSE and TRUE) is required?
>> +{
>> + struct spi_status ax_status;
>> +
>> + /* Check media link status first */
>> + if (netif_carrier_ok(ax_local->ndev) ||
>> + (ax_local->ps_level == AX_PS_D0) ||
>> + (ax_local->ps_level == AX_PS_D1)) {
>> + return 0;
>> + }
>> +
>> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> + if (!(ax_status.status & AX_STATUS_READY))
>> + return 1;
>> +
>> + return 0;
>> +}
>> +
>> +u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local)
>> +{
>> + struct spi_status ax_status;
>> + unsigned long start_time;
>> +
>> + /* Check media link status first */
>> + if (netif_carrier_ok(ax_local->ndev) ||
>> + (ax_local->ps_level == AX_PS_D0) ||
>> + (ax_local->ps_level == AX_PS_D1)) {
>> + return 0;
>> + }
>> +
>> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> + if (!(ax_status.status & AX_STATUS_READY)) {
>> +
>> + /* AX88796C in power saving mode */
>> + AX_WAKEUP(&ax_local->ax_spi);
>> +
>> + /* Check status */
>> + start_time = jiffies;
>> + do {
>> + if (time_after(jiffies, start_time + HZ/2)) {
>> + netdev_err(ax_local->ndev,
>> + "timeout waiting for wakeup"
>> + " from power saving\n");
>> + break;
>> + }
>> +
>> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> +
>> + } while (!(ax_status.status & AX_STATUS_READY));
>
> include/linux/iopoll.h
>
Done. The result seems only slightly more elegant since the generic
read_poll_timeout() needs to be employed.
>
> Can the device itself put itself to sleep? If not, maybe just track
> the power saving state in struct ax88796c_device?
>
Yes, it can. When the cable is unplugged, parts of of the chip enter
power saving mode and the values in registers change.
>> +int ax88796c_mdio_read(struct net_device *ndev, int phy_id, int loc)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + unsigned long start_time;
>> +
>> + AX_WRITE(&ax_local->ax_spi, MDIOCR_RADDR(loc)
>> + | MDIOCR_FADDR(phy_id) | MDIOCR_READ, P2_MDIOCR);
>> +
>> + start_time = jiffies;
>> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
>> + if (time_after(jiffies, start_time + HZ/100))
>> + return -EBUSY;
>> + }
>
> Another use case of iopoll.h
>
Done.
>> + return AX_READ(&ax_local->ax_spi, P2_MDIODR);
>> +}
>> +
>> +void
>> +ax88796c_mdio_write(struct net_device *ndev, int phy_id, int loc, int val)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + unsigned long start_time;
>> +
>> + AX_WRITE(&ax_local->ax_spi, val, P2_MDIODR);
>> +
>> + AX_WRITE(&ax_local->ax_spi,
>> + MDIOCR_RADDR(loc) | MDIOCR_FADDR(phy_id)
>> + | MDIOCR_WRITE, P2_MDIOCR);
>> +
>> + start_time = jiffies;
>> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
>> + if (time_after(jiffies, start_time + HZ/100))
>> + return;
>> + }
>> +
>> + if (loc == MII_ADVERTISE) {
>> + AX_WRITE(&ax_local->ax_spi, (BMCR_FULLDPLX | BMCR_ANRESTART |
>> + BMCR_ANENABLE | BMCR_SPEED100), P2_MDIODR);
>> + AX_WRITE(&ax_local->ax_spi, (MDIOCR_RADDR(MII_BMCR) |
>> + MDIOCR_FADDR(phy_id) | MDIOCR_WRITE),
>> + P2_MDIOCR);
>
> Odd. An mdio bus driver should not need to do anything like this.
>
> Humm, please make this is a plain MDIO bus driver, using
> mdiobus_register().
>
The manufacturer says
The AX88796C integrates on-chip Fast Ethernet MAC and PHY, […]
There is a single integrated PHY in this chip and no possiblity to
connect external one. Do you think it makes sense in such case to
introduce the additional layer of abstraction?
>> +
>> + start_time = jiffies;
>> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR)
>> + & MDIOCR_VALID) == 0) {
>> + if (time_after(jiffies, start_time + HZ/100))
>> + return;
>> + }
>> + }
>> +}
>> +
>
>> +static void ax88796c_get_drvinfo(struct net_device *ndev,
>> + struct ethtool_drvinfo *info)
>> +{
>> + /* Inherit standard device info */
>> + strncpy(info->driver, DRV_NAME, sizeof(info->driver));
>> + strncpy(info->version, DRV_VERSION, sizeof(info->version));
>
> verion is pretty much not wanted any more.
>
Removed.
>> +static u32 ax88796c_get_link(struct net_device *ndev)
>> +{
>> + u32 link;
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + link = mii_link_ok(&ax_local->mii);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> + up(&ax_local->spi_lock);
>> +
>> + return link;
>> +
>> +
>> +}
>
> When you convert to phylib, this will go away.
>
See above (single integrated phy).
>> +static int
>> +ax88796c_get_link_ksettings(struct net_device *ndev,
>> + struct ethtool_link_ksettings *cmd)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>
> Please use a mutex, not semaphores.
>
Done.
>> +module_param(comp, int, 0);
>> +MODULE_PARM_DESC(comp, "0=Non-Compression Mode, 1=Compression Mode");
>> +
>> +module_param(ps_level, int, 0);
>> +MODULE_PARM_DESC(ps_level,
>> + "Power Saving Level (0:disable 1:level 1 2:level 2)");
>> +
>> +module_param(msg_enable, int, 0);
>> +MODULE_PARM_DESC(msg_enable, "Message mask (see linux/netdevice.h for bitmap)");
>> +
>> +static char *macaddr;
>> +module_param(macaddr, charp, 0);
>> +MODULE_PARM_DESC(macaddr, "MAC address");
>
> No Module parameters. You can get the MAC address from DT.
What about systems without DT? Not every bootloader is sophisicated
enough to edit DT before starting kernel. AX88786C is a chip that can be
used in a variety of systems and I'd like to avoid too strong
assumptions.
Of course reading MAC address from DT is a good idea and I will add it.
> msg_enable can be controlled by ethtool.
But it does not work during boot.
>> +MODULE_AUTHOR("ASIX");
>
> Do you expect ASIX to support this?
No.
> You probably want to put your name here.
I don't want to be considered as the only author and as far as I can
tell being mentioned as an author does not imply being a
maintainer. Do you think two MODULE_AUTHOR()s be OK?
>> +MODULE_DESCRIPTION("ASIX AX88796C SPI Ethernet driver");
>> +MODULE_LICENSE("GPL");
>> +
>> +static void ax88796c_dump_regs(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + u8 i, j;
>> +
>> + netdev_info(ndev,
>> + " Page0 Page1 Page2 Page3 "
>> + "Page4 Page5 Page6 Page7\n");
>> + for (i = 0; i < 0x20; i += 2) {
>> + netdev_info(ndev, "0x%02x ", i);
>> + for (j = 0; j < 8; j++) {
>> + netdev_info(ndev, "0x%04x ",
>> + AX_READ(&ax_local->ax_spi, j * 0x20 + i));
>> + }
>> + netdev_info(ndev, "\n");
>> + }
>> + netdev_info(ndev, "\n");
>
> Please implement ethtool -d, not this.
>
Done.
>> +}
>> +
>> +static void ax88796c_dump_phy_regs(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + int i;
>> +
>> + netdev_info(ndev, "Dump PHY registers:\n");
>> + for (i = 0; i < 6; i++) {
>> + netdev_info(ndev, " MR%d = 0x%04x\n", i,
>> + ax88796c_mdio_read(ax_local->ndev,
>> + ax_local->mii.phy_id, i));
>> + }
>> +}
>> +
>
> Please delete. Let the PHY driver worry about PHY registers.
>
See above (single integrated phy).
>> +static void ax88796c_watchdog(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + u16 phy_status;
>> + unsigned long time_to_chk = AX88796C_WATCHDOG_PERIOD;
>> +
>> + if (ax88796c_check_power(ax_local)) {
>> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
>> + return;
>> + }
>> +
>> + ax88796c_set_power_saving(ax_local, AX_PS_D0);
>
> You might want to look at runtime PM for all this power management.
>
This one and the one below, are to manage device's PM state during this
function.
>> +
>> + phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
>> + if (phy_status & PSCR_PHYLINK) {
>> +
>> + ax_local->w_state = ax_nop;
>> + time_to_chk = 0;
>> +
>> + } else if (!(phy_status & PSCR_PHYCOFF)) {
>> + /* The ethernet cable has been plugged */
>> + if (ax_local->w_state == chk_cable) {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Cable connected\n");
>> +
>> + ax_local->w_state = chk_link;
>> + ax_local->w_ticks = 0;
>> + } else {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Check media status\n");
>> +
>> + if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Restart autoneg\n");
>> + ax88796c_mdio_write(ndev,
>> + ax_local->mii.phy_id, MII_BMCR,
>> + (BMCR_SPEED100 | BMCR_ANENABLE |
>> + BMCR_ANRESTART));
>> +
>> + if (netif_msg_hw(ax_local))
>> + ax88796c_dump_phy_regs(ax_local);
>> + ax_local->w_ticks = 0;
>> + }
>> + }
>> + } else {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Check cable status\n");
>> +
>> + ax_local->w_state = chk_cable;
>> + }
>> +
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + if (time_to_chk)
>> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
>> +}
>
> This is not the normal use of a watchdog in network drivers. The
> normal case is the network stack as asked the driver to do something,
> normally a TX, and the driver has not reported the action has
> completed. The state of the cable should not make any
> difference. This does not actually appear to do anything useful, like
> kick the hardware to bring it back to life.
>
Maybe it's the naming that is a problem. Yes, it is not a watchdog, but
rather a periodic housekeeping and it kicks hw if it can't negotiate
the connection. The question is: should the settings be reset in such case.
>> +static int ax88796c_soft_reset(struct ax88796c_device *ax_local)
>> +{
>> + unsigned long start;
>> + u16 temp;
>> +
>> + AX_WRITE(&ax_local->ax_spi, PSR_RESET, P0_PSR);
>> + AX_WRITE(&ax_local->ax_spi, PSR_RESET_CLR, P0_PSR);
>> +
>> + start = jiffies;
>> + while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
>> + if (time_after(jiffies, start + (160 * HZ / 1000))) {
>> + dev_err(&ax_local->spi->dev,
>> + "timeout waiting for reset completion\n");
>> + return -1;
>> + }
>> + }
>
> iopoll.h.
>
Done
>> +#if 0
>> +static void ax88796c_set_multicast(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> +
>> + set_bit(EVENT_SET_MULTI, &ax_local->flags);
>> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
>> +}
>> +#endif
>
> We don't allow #if 0 code in mainline.
>
Removed.
>> + if (netif_msg_pktdata(ax_local)) {
>> + int loop;
>> + netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
>> + pkt_len, tx_skb->len, seq_num);
>> +
>> + netdev_info(ndev, " Dump SPI Header:\n ");
>> + for (loop = 0; loop < 4; loop++)
>> + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
>> +
>> + netdev_info(ndev, "\n");
>
> This no longer works as far as i remember. Lines are terminate by
> default even if they don't have a \n.
>
> Please you should not be using netdev_info(). netdev_dbg() please.
>
I changed most netif_msg_*()+netdev_*() to netif_*(), including
netif_dbg() in several places. However, after reading other drivers I
decided to leave this at INFO level. I think this is the way to go,
because this is what user asks for and with dynamic debug enabled users
would have to ask for these in two different places.
>> +static inline void
>> +ax88796c_skb_return(struct ax88796c_device *ax_local, struct sk_buff *skb,
>> + struct rx_header *rxhdr)
>> +{
>
> No inline functions in C code please.
>
Done.
>> + struct net_device *ndev = ax_local->ndev;
>> + int status;
>> +
>> + do {
>> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
>> + break;
>> +
>> + /* checksum error bit is set */
>> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
>> + (rxhdr->flags & RX_HDR3_L4_ERR))
>> + break;
>> +
>> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
>> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
>> + skb->ip_summed = CHECKSUM_UNNECESSARY;
>> + }
>> + } while (0);
>
>
> ??
>
if() break; Should I use goto?
>> +
>> + ax_local->stats.rx_packets++;
>> + ax_local->stats.rx_bytes += skb->len;
>> + skb->dev = ndev;
>> +
>> + skb->truesize = skb->len + sizeof(struct sk_buff);
>> + skb->protocol = eth_type_trans(skb, ax_local->ndev);
>> +
>> + if (netif_msg_rx_status(ax_local))
>> + netdev_info(ndev, "< rx, len %zu, type 0x%x\n",
>> + skb->len + sizeof(struct ethhdr), skb->protocol);
>> +
>> + status = netif_rx(skb);
>> + if (status != NET_RX_SUCCESS && netif_msg_rx_err(ax_local))
>> + netdev_info(ndev, "netif_rx status %d\n", status);
>
> Please go through the driver and use netdev_dbg() where appropriate.
>
Done, partially (see above.)
>> +}
>> +
>> +static void dump_packet(struct net_device *ndev, const char *msg, int len, const char *data)
>> +{
>> + netdev_printk(KERN_DEBUG, ndev, DRV_NAME ": %s - packet len:%d\n", msg, len);
>> + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
>> + data, len, true);
>> +}
>> +
>> +static void
>> +ax88796c_rx_fixup(struct ax88796c_device *ax_local, struct sk_buff *rx_skb)
>> +{
>> + struct rx_header *rxhdr = (struct rx_header *) rx_skb->data;
>> + struct net_device *ndev = ax_local->ndev;
>> + u16 len;
>> +
>> + be16_to_cpus(&rxhdr->flags_len);
>> + be16_to_cpus(&rxhdr->seq_lenbar);
>> + be16_to_cpus(&rxhdr->flags);
>> +
>> + if ((((short)rxhdr->flags_len) & RX_HDR1_PKT_LEN) !=
>> + (~((short)rxhdr->seq_lenbar) & 0x7FF)) {
>> + if (netif_msg_rx_err(ax_local)) {
>> + int i;
>> + netdev_err(ndev, "Header error\n");
>> + //netdev_err(ndev, "Dump received frame\n");
>> + /* for (i = 0; i < rx_skb->len; i++) { */
>> + /* netdev_err(ndev, "%02x ", */
>> + /* *(rx_skb->data + i)); */
>> + /* if (((i + 1) % 16) == 0) */
>> + /* netdev_err(ndev, "\n"); */
>> + /* } */
>
> No commented out code.
>
Removed.
>> + dump_packet(ndev, __func__, rx_skb->len, rx_skb->data);
>
> and this is questionable. I can understand it while writing a driver,
> but once it works, this is the sort of thing you remove.
>
Removed.
>> + }
>> + ax_local->stats.rx_frame_errors++;
>> + kfree_skb(rx_skb);
>> + return;
>> + }
>> +
>> + if ((rxhdr->flags_len & RX_HDR1_MII_ERR) ||
>> + (rxhdr->flags_len & RX_HDR1_CRC_ERR)) {
>> + if (netif_msg_rx_err(ax_local))
>> + netdev_err(ndev, "CRC or MII error\n");
>> +
>> + ax_local->stats.rx_crc_errors++;
>> + kfree_skb(rx_skb);
>> + return;
>> + }
>> +
>> + len = rxhdr->flags_len & RX_HDR1_PKT_LEN;
>> + if (netif_msg_pktdata(ax_local)) {
>> + int loop;
>> + netdev_info(ndev, "RX data, total len %d, packet len %d\n",
>> + rx_skb->len, len);
>> +
>> + netdev_info(ndev, " Dump RX packet header:\n ");
>> + for (loop = 0; loop < sizeof(*rxhdr); loop++)
>> + netdev_info(ndev, "%02x ", *(rx_skb->data + loop));
>> +
>> + netdev_info(ndev, "\n Dump RX packet:");
>> + for (loop = 0; loop < len; loop++) {
>> + if ((loop % 16) == 0)
>> + netdev_info(ndev, "\n ");
>> + netdev_info(ndev, "%02x ",
>> + *(rx_skb->data + loop + sizeof(*rxhdr)));
>> + }
>> + netdev_info(ndev, "\n");
>> + }
>> +
>> + skb_pull(rx_skb, sizeof(*rxhdr));
>> + __pskb_trim(rx_skb, len);
>> +
>> + return ax88796c_skb_return(ax_local, rx_skb, rxhdr);
>> +}
>
>> +void ax88796c_phy_init(struct ax88796c_device *ax_local)
>> +{
>> + u16 advertise = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
>> +
>> + /* Setup LED mode */
>> + AX_WRITE(&ax_local->ax_spi,
>> + (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |
>> + LCR_LED1_100MODE), P2_LCR0);
>> + AX_WRITE(&ax_local->ax_spi,
>> + (AX_READ(&ax_local->ax_spi, P2_LCR1) & LCR_LED2_MASK) |
>> + LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);
>> +
>> + /* Enable PHY auto-polling */
>> + AX_WRITE(&ax_local->ax_spi,
>> + POOLCR_PHYID(ax_local->mii.phy_id) | POOLCR_POLL_EN |
>> + POOLCR_POLL_FLOWCTRL | POOLCR_POLL_BMCR, P2_POOLCR);
>
> What exactly does PHY polling do? Generally, you don't want the MAC
> touching the PHY, because it can upset the PHY driver.
>
See above (single integrated phy).
>> +
>> + ax88796c_mdio_write(ax_local->ndev,
>> + ax_local->mii.phy_id, MII_ADVERTISE, advertise);
>> +
>> + ax88796c_mdio_write(ax_local->ndev, ax_local->mii.phy_id, MII_BMCR,
>> + BMCR_SPEED100 | BMCR_ANENABLE | BMCR_ANRESTART);
>> +}
>> +
>
> I stopped reviewing here.
It took a while to work through it all. Thank you very much for your
effort.
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-09-07 17:39 ` Lukasz Stelmach
@ 2020-09-07 18:18 ` Andrew Lunn
-1 siblings, 0 replies; 57+ messages in thread
From: Andrew Lunn @ 2020-09-07 18:18 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: David S. Miller, Jakub Kicinski, Krzysztof Kozlowski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree, b.zolnierkie, m.szyprowski
> > On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> >> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
> >
> > This is an odd filename. The ioctl code is wrong anyway, but there is
> > a lot more than ioctl in here. I suggest you give it a new name.
> >
>
> Sure, any suggestions?
Sorry, i have forgotten what is actually contained. Does it even need
to be a separate file?
> >> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
> >
> > bool ?
>
> OK.
>
> It appears, however, that 0 means OK and 1 !OK. Do you think changing to
> TRUE and FALSE (or FALSE and TRUE) is required?
Or change the name, ax88796c_check_power_off()? I don't really care,
so long as it is logical and not surprising.
> >> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> >> + if (!(ax_status.status & AX_STATUS_READY)) {
> >> +
> >> + /* AX88796C in power saving mode */
> >> + AX_WAKEUP(&ax_local->ax_spi);
> >> +
> >> + /* Check status */
> >> + start_time = jiffies;
> >> + do {
> >> + if (time_after(jiffies, start_time + HZ/2)) {
> >> + netdev_err(ax_local->ndev,
> >> + "timeout waiting for wakeup"
> >> + " from power saving\n");
> >> + break;
> >> + }
> >> +
> >> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> >> +
> >> + } while (!(ax_status.status & AX_STATUS_READY));
> >
> > include/linux/iopoll.h
> >
>
> Done. The result seems only slightly more elegant since the generic
> read_poll_timeout() needs to be employed.
Often code like this has bugs in it, not correctly handling the
scheduler sleeping longer than expected. That is why i point people at
iopoll, no bugs, not elegance.
> The manufacturer says
>
> The AX88796C integrates on-chip Fast Ethernet MAC and PHY, […]
>
> There is a single integrated PHY in this chip and no possiblity to
> connect external one. Do you think it makes sense in such case to
> introduce the additional layer of abstraction?
Yes it does, because it then uses all the standard phylib code to
drive the PHY which many people understand, is well tested, etc. It
will make the MAC driver smaller and probably less buggy.
> >> +static char *macaddr;
> >> +module_param(macaddr, charp, 0);
> >> +MODULE_PARM_DESC(macaddr, "MAC address");
> >
> > No Module parameters. You can get the MAC address from DT.
>
> What about systems without DT? Not every bootloader is sophisicated
> enough to edit DT before starting kernel. AX88786C is a chip that can be
> used in a variety of systems and I'd like to avoid too strong
> assumptions.
There is also a standardised way to read it from ACPI. And you can set
it using ip link set. DaveM will likely NACK a module parameter.
> >> +MODULE_AUTHOR("ASIX");
> >
> > Do you expect ASIX to support this?
>
> No.
>
> > You probably want to put your name here.
>
> I don't want to be considered as the only author and as far as I can
> tell being mentioned as an author does not imply being a
> maintainer. Do you think two MODULE_AUTHOR()s be OK?
Can you have two? One with two names listed is O.K.
> >> +
> >> + phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
> >> + if (phy_status & PSCR_PHYLINK) {
> >> +
> >> + ax_local->w_state = ax_nop;
> >> + time_to_chk = 0;
> >> +
> >> + } else if (!(phy_status & PSCR_PHYCOFF)) {
> >> + /* The ethernet cable has been plugged */
> >> + if (ax_local->w_state == chk_cable) {
> >> + if (netif_msg_timer(ax_local))
> >> + netdev_info(ndev, "Cable connected\n");
> >> +
> >> + ax_local->w_state = chk_link;
> >> + ax_local->w_ticks = 0;
> >> + } else {
> >> + if (netif_msg_timer(ax_local))
> >> + netdev_info(ndev, "Check media status\n");
> >> +
> >> + if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
> >> + if (netif_msg_timer(ax_local))
> >> + netdev_info(ndev, "Restart autoneg\n");
> >> + ax88796c_mdio_write(ndev,
> >> + ax_local->mii.phy_id, MII_BMCR,
> >> + (BMCR_SPEED100 | BMCR_ANENABLE |
> >> + BMCR_ANRESTART));
> >> +
> >> + if (netif_msg_hw(ax_local))
> >> + ax88796c_dump_phy_regs(ax_local);
> >> + ax_local->w_ticks = 0;
> >> + }
> >> + }
> >> + } else {
> >> + if (netif_msg_timer(ax_local))
> >> + netdev_info(ndev, "Check cable status\n");
> >> +
> >> + ax_local->w_state = chk_cable;
> >> + }
> >> +
> >> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> >> +
> >> + if (time_to_chk)
> >> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
> >> +}
> >
> > This is not the normal use of a watchdog in network drivers. The
> > normal case is the network stack as asked the driver to do something,
> > normally a TX, and the driver has not reported the action has
> > completed. The state of the cable should not make any
> > difference. This does not actually appear to do anything useful, like
> > kick the hardware to bring it back to life.
> >
>
> Maybe it's the naming that is a problem. Yes, it is not a watchdog, but
> rather a periodic housekeeping and it kicks hw if it can't negotiate
> the connection. The question is: should the settings be reset in such case.
Let see what is left once you convert to phylib.
> >> + struct net_device *ndev = ax_local->ndev;
> >> + int status;
> >> +
> >> + do {
> >> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
> >> + break;
> >> +
> >> + /* checksum error bit is set */
> >> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
> >> + (rxhdr->flags & RX_HDR3_L4_ERR))
> >> + break;
> >> +
> >> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
> >> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
> >> + skb->ip_summed = CHECKSUM_UNNECESSARY;
> >> + }
> >> + } while (0);
> >
> >
> > ??
> >
>
> if() break; Should I use goto?
Sorry, i was too ambiguous. Why:
do {
} while (0);
It is an odd construct.
Andrew
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-09-07 18:18 ` Andrew Lunn
0 siblings, 0 replies; 57+ messages in thread
From: Andrew Lunn @ 2020-09-07 18:18 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Krzysztof Kozlowski, linux-kernel, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller, linux-arm-kernel, m.szyprowski
> > On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> >> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
> >
> > This is an odd filename. The ioctl code is wrong anyway, but there is
> > a lot more than ioctl in here. I suggest you give it a new name.
> >
>
> Sure, any suggestions?
Sorry, i have forgotten what is actually contained. Does it even need
to be a separate file?
> >> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
> >
> > bool ?
>
> OK.
>
> It appears, however, that 0 means OK and 1 !OK. Do you think changing to
> TRUE and FALSE (or FALSE and TRUE) is required?
Or change the name, ax88796c_check_power_off()? I don't really care,
so long as it is logical and not surprising.
> >> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> >> + if (!(ax_status.status & AX_STATUS_READY)) {
> >> +
> >> + /* AX88796C in power saving mode */
> >> + AX_WAKEUP(&ax_local->ax_spi);
> >> +
> >> + /* Check status */
> >> + start_time = jiffies;
> >> + do {
> >> + if (time_after(jiffies, start_time + HZ/2)) {
> >> + netdev_err(ax_local->ndev,
> >> + "timeout waiting for wakeup"
> >> + " from power saving\n");
> >> + break;
> >> + }
> >> +
> >> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> >> +
> >> + } while (!(ax_status.status & AX_STATUS_READY));
> >
> > include/linux/iopoll.h
> >
>
> Done. The result seems only slightly more elegant since the generic
> read_poll_timeout() needs to be employed.
Often code like this has bugs in it, not correctly handling the
scheduler sleeping longer than expected. That is why i point people at
iopoll, no bugs, not elegance.
> The manufacturer says
>
> The AX88796C integrates on-chip Fast Ethernet MAC and PHY, […]
>
> There is a single integrated PHY in this chip and no possiblity to
> connect external one. Do you think it makes sense in such case to
> introduce the additional layer of abstraction?
Yes it does, because it then uses all the standard phylib code to
drive the PHY which many people understand, is well tested, etc. It
will make the MAC driver smaller and probably less buggy.
> >> +static char *macaddr;
> >> +module_param(macaddr, charp, 0);
> >> +MODULE_PARM_DESC(macaddr, "MAC address");
> >
> > No Module parameters. You can get the MAC address from DT.
>
> What about systems without DT? Not every bootloader is sophisicated
> enough to edit DT before starting kernel. AX88786C is a chip that can be
> used in a variety of systems and I'd like to avoid too strong
> assumptions.
There is also a standardised way to read it from ACPI. And you can set
it using ip link set. DaveM will likely NACK a module parameter.
> >> +MODULE_AUTHOR("ASIX");
> >
> > Do you expect ASIX to support this?
>
> No.
>
> > You probably want to put your name here.
>
> I don't want to be considered as the only author and as far as I can
> tell being mentioned as an author does not imply being a
> maintainer. Do you think two MODULE_AUTHOR()s be OK?
Can you have two? One with two names listed is O.K.
> >> +
> >> + phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
> >> + if (phy_status & PSCR_PHYLINK) {
> >> +
> >> + ax_local->w_state = ax_nop;
> >> + time_to_chk = 0;
> >> +
> >> + } else if (!(phy_status & PSCR_PHYCOFF)) {
> >> + /* The ethernet cable has been plugged */
> >> + if (ax_local->w_state == chk_cable) {
> >> + if (netif_msg_timer(ax_local))
> >> + netdev_info(ndev, "Cable connected\n");
> >> +
> >> + ax_local->w_state = chk_link;
> >> + ax_local->w_ticks = 0;
> >> + } else {
> >> + if (netif_msg_timer(ax_local))
> >> + netdev_info(ndev, "Check media status\n");
> >> +
> >> + if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
> >> + if (netif_msg_timer(ax_local))
> >> + netdev_info(ndev, "Restart autoneg\n");
> >> + ax88796c_mdio_write(ndev,
> >> + ax_local->mii.phy_id, MII_BMCR,
> >> + (BMCR_SPEED100 | BMCR_ANENABLE |
> >> + BMCR_ANRESTART));
> >> +
> >> + if (netif_msg_hw(ax_local))
> >> + ax88796c_dump_phy_regs(ax_local);
> >> + ax_local->w_ticks = 0;
> >> + }
> >> + }
> >> + } else {
> >> + if (netif_msg_timer(ax_local))
> >> + netdev_info(ndev, "Check cable status\n");
> >> +
> >> + ax_local->w_state = chk_cable;
> >> + }
> >> +
> >> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> >> +
> >> + if (time_to_chk)
> >> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
> >> +}
> >
> > This is not the normal use of a watchdog in network drivers. The
> > normal case is the network stack as asked the driver to do something,
> > normally a TX, and the driver has not reported the action has
> > completed. The state of the cable should not make any
> > difference. This does not actually appear to do anything useful, like
> > kick the hardware to bring it back to life.
> >
>
> Maybe it's the naming that is a problem. Yes, it is not a watchdog, but
> rather a periodic housekeeping and it kicks hw if it can't negotiate
> the connection. The question is: should the settings be reset in such case.
Let see what is left once you convert to phylib.
> >> + struct net_device *ndev = ax_local->ndev;
> >> + int status;
> >> +
> >> + do {
> >> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
> >> + break;
> >> +
> >> + /* checksum error bit is set */
> >> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
> >> + (rxhdr->flags & RX_HDR3_L4_ERR))
> >> + break;
> >> +
> >> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
> >> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
> >> + skb->ip_summed = CHECKSUM_UNNECESSARY;
> >> + }
> >> + } while (0);
> >
> >
> > ??
> >
>
> if() break; Should I use goto?
Sorry, i was too ambiguous. Why:
do {
} while (0);
It is an odd construct.
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-09-07 18:18 ` Andrew Lunn
@ 2020-09-08 17:49 ` Lukasz Stelmach
-1 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-09-08 17:49 UTC (permalink / raw)
To: Andrew Lunn
Cc: David S. Miller, Jakub Kicinski, Krzysztof Kozlowski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree, b.zolnierkie, m.szyprowski
[-- Attachment #1: Type: text/plain, Size: 7680 bytes --]
It was <2020-09-07 pon 20:18>, when Andrew Lunn wrote:
>> > On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
>> >> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
>> >
>> > This is an odd filename. The ioctl code is wrong anyway, but there is
>> > a lot more than ioctl in here. I suggest you give it a new name.
>> >
>>
>> Sure, any suggestions?
>
> Sorry, i have forgotten what is actually contained.
IOCTL handler (.ndo_do_ioctl), ethtool ops, and a bunch of hw control
functions.
> Does it even need to be a separate file?
It doesn't need, but I think it makes sense to keep ioctl and ethtool
stuff in a separate file. Some of the hw control function look like they
might change after using phylib.
>> >> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
>> >
>> > bool ?
>>
>> OK.
>>
>> It appears, however, that 0 means OK and 1 !OK. Do you think changing to
>> TRUE and FALSE (or FALSE and TRUE) is required?
>
> Or change the name, ax88796c_check_power_off()? I don't really care,
> so long as it is logical and not surprising.
>
Good idea, thanks.
>> >> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> >> + if (!(ax_status.status & AX_STATUS_READY)) {
>> >> +
>> >> + /* AX88796C in power saving mode */
>> >> + AX_WAKEUP(&ax_local->ax_spi);
>> >> +
>> >> + /* Check status */
>> >> + start_time = jiffies;
>> >> + do {
>> >> + if (time_after(jiffies, start_time + HZ/2)) {
>> >> + netdev_err(ax_local->ndev,
>> >> + "timeout waiting for wakeup"
>> >> + " from power saving\n");
>> >> + break;
>> >> + }
>> >> +
>> >> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> >> +
>> >> + } while (!(ax_status.status & AX_STATUS_READY));
>> >
>> > include/linux/iopoll.h
>> >
>>
>> Done. The result seems only slightly more elegant since the generic
>> read_poll_timeout() needs to be employed.
>
> Often code like this has bugs in it, not correctly handling the
> scheduler sleeping longer than expected. That is why i point people at
> iopoll, no bugs, not elegance.
>
>> The manufacturer says
>>
>> The AX88796C integrates on-chip Fast Ethernet MAC and PHY, […]
>>
>> There is a single integrated PHY in this chip and no possiblity to
>> connect external one. Do you think it makes sense in such case to
>> introduce the additional layer of abstraction?
>
> Yes it does, because it then uses all the standard phylib code to
> drive the PHY which many people understand, is well tested, etc. It
> will make the MAC driver smaller and probably less buggy.
>
Good point. I need to figure out how to do it. Can you point (from the
top fou your head) a driver which does it for a simmilarly integrated
device?
>> >> +static char *macaddr;
>> >> +module_param(macaddr, charp, 0);
>> >> +MODULE_PARM_DESC(macaddr, "MAC address");
>> >
>> > No Module parameters. You can get the MAC address from DT.
>>
>> What about systems without DT? Not every bootloader is sophisicated
>> enough to edit DT before starting kernel. AX88786C is a chip that can be
>> used in a variety of systems and I'd like to avoid too strong
>> assumptions.
>
> There is also a standardised way to read it from ACPI. And you can set
> it using ip link set. DaveM will likely NACK a module parameter.
>
I am not arguing to keep the parameter at any cost, but I would really
like to know if there is a viable alternative for DT and ACPI. This chip
is for smaller systems which not necessarily implement advanced
bootloaders (and DT).
>> >> +MODULE_AUTHOR("ASIX");
>> >
>> > Do you expect ASIX to support this?
>>
>> No.
>>
>> > You probably want to put your name here.
>>
>> I don't want to be considered as the only author and as far as I can
>> tell being mentioned as an author does not imply being a
>> maintainer. Do you think two MODULE_AUTHOR()s be OK?
>
> Can you have two? One with two names listed is O.K.
>
According to module.h
/*
* Author(s), use "Name <email>" or just "Name", for multiple
* authors use multiple MODULE_AUTHOR() statements/lines.
*/
>> >> +
>> >> + phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
>> >> + if (phy_status & PSCR_PHYLINK) {
>> >> +
>> >> + ax_local->w_state = ax_nop;
>> >> + time_to_chk = 0;
>> >> +
>> >> + } else if (!(phy_status & PSCR_PHYCOFF)) {
>> >> + /* The ethernet cable has been plugged */
>> >> + if (ax_local->w_state == chk_cable) {
>> >> + if (netif_msg_timer(ax_local))
>> >> + netdev_info(ndev, "Cable connected\n");
>> >> +
>> >> + ax_local->w_state = chk_link;
>> >> + ax_local->w_ticks = 0;
>> >> + } else {
>> >> + if (netif_msg_timer(ax_local))
>> >> + netdev_info(ndev, "Check media status\n");
>> >> +
>> >> + if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
>> >> + if (netif_msg_timer(ax_local))
>> >> + netdev_info(ndev, "Restart autoneg\n");
>> >> + ax88796c_mdio_write(ndev,
>> >> + ax_local->mii.phy_id, MII_BMCR,
>> >> + (BMCR_SPEED100 | BMCR_ANENABLE |
>> >> + BMCR_ANRESTART));
>> >> +
>> >> + if (netif_msg_hw(ax_local))
>> >> + ax88796c_dump_phy_regs(ax_local);
>> >> + ax_local->w_ticks = 0;
>> >> + }
>> >> + }
>> >> + } else {
>> >> + if (netif_msg_timer(ax_local))
>> >> + netdev_info(ndev, "Check cable status\n");
>> >> +
>> >> + ax_local->w_state = chk_cable;
>> >> + }
>> >> +
>> >> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> >> +
>> >> + if (time_to_chk)
>> >> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
>> >> +}
>> >
>> > This is not the normal use of a watchdog in network drivers. The
>> > normal case is the network stack as asked the driver to do something,
>> > normally a TX, and the driver has not reported the action has
>> > completed. The state of the cable should not make any
>> > difference. This does not actually appear to do anything useful, like
>> > kick the hardware to bring it back to life.
>> >
>>
>> Maybe it's the naming that is a problem. Yes, it is not a watchdog, but
>> rather a periodic housekeeping and it kicks hw if it can't negotiate
>> the connection. The question is: should the settings be reset in such case.
>
> Let see what is left once you convert to phylib.
>
OK.
>> >> + struct net_device *ndev = ax_local->ndev;
>> >> + int status;
>> >> +
>> >> + do {
>> >> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
>> >> + break;
>> >> +
>> >> + /* checksum error bit is set */
>> >> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
>> >> + (rxhdr->flags & RX_HDR3_L4_ERR))
>> >> + break;
>> >> +
>> >> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
>> >> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
>> >> + skb->ip_summed = CHECKSUM_UNNECESSARY;
>> >> + }
>> >> + } while (0);
>> >
>> >
>> > ??
>> >
>>
>> if() break; Should I use goto?
>
> Sorry, i was too ambiguous. Why:
>
> do {
> } while (0);
>
> It is an odd construct.
As to "why" — you have correctly spotted, this is a vendor driver I am
porting. Although it's not like I am trying to avoid any changes, but
because this driver worked for us on older kernels (v3.10.9) I am trying
not to touch pieces which IMHO are good enough. Of course I don't mind
suggestions from more experienced developers.
To avoid using do{}while(0) it requires either goto (instead of breaks),
nesting those if()s in one another or a humongous single if(). Neither
looks pretty and the last one is even less readable than
do()while.
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-09-08 17:49 ` Lukasz Stelmach
0 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-09-08 17:49 UTC (permalink / raw)
To: Andrew Lunn
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Krzysztof Kozlowski, linux-kernel, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller, linux-arm-kernel, m.szyprowski
[-- Attachment #1.1: Type: text/plain, Size: 7680 bytes --]
It was <2020-09-07 pon 20:18>, when Andrew Lunn wrote:
>> > On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
>> >> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
>> >
>> > This is an odd filename. The ioctl code is wrong anyway, but there is
>> > a lot more than ioctl in here. I suggest you give it a new name.
>> >
>>
>> Sure, any suggestions?
>
> Sorry, i have forgotten what is actually contained.
IOCTL handler (.ndo_do_ioctl), ethtool ops, and a bunch of hw control
functions.
> Does it even need to be a separate file?
It doesn't need, but I think it makes sense to keep ioctl and ethtool
stuff in a separate file. Some of the hw control function look like they
might change after using phylib.
>> >> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
>> >
>> > bool ?
>>
>> OK.
>>
>> It appears, however, that 0 means OK and 1 !OK. Do you think changing to
>> TRUE and FALSE (or FALSE and TRUE) is required?
>
> Or change the name, ax88796c_check_power_off()? I don't really care,
> so long as it is logical and not surprising.
>
Good idea, thanks.
>> >> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> >> + if (!(ax_status.status & AX_STATUS_READY)) {
>> >> +
>> >> + /* AX88796C in power saving mode */
>> >> + AX_WAKEUP(&ax_local->ax_spi);
>> >> +
>> >> + /* Check status */
>> >> + start_time = jiffies;
>> >> + do {
>> >> + if (time_after(jiffies, start_time + HZ/2)) {
>> >> + netdev_err(ax_local->ndev,
>> >> + "timeout waiting for wakeup"
>> >> + " from power saving\n");
>> >> + break;
>> >> + }
>> >> +
>> >> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> >> +
>> >> + } while (!(ax_status.status & AX_STATUS_READY));
>> >
>> > include/linux/iopoll.h
>> >
>>
>> Done. The result seems only slightly more elegant since the generic
>> read_poll_timeout() needs to be employed.
>
> Often code like this has bugs in it, not correctly handling the
> scheduler sleeping longer than expected. That is why i point people at
> iopoll, no bugs, not elegance.
>
>> The manufacturer says
>>
>> The AX88796C integrates on-chip Fast Ethernet MAC and PHY, […]
>>
>> There is a single integrated PHY in this chip and no possiblity to
>> connect external one. Do you think it makes sense in such case to
>> introduce the additional layer of abstraction?
>
> Yes it does, because it then uses all the standard phylib code to
> drive the PHY which many people understand, is well tested, etc. It
> will make the MAC driver smaller and probably less buggy.
>
Good point. I need to figure out how to do it. Can you point (from the
top fou your head) a driver which does it for a simmilarly integrated
device?
>> >> +static char *macaddr;
>> >> +module_param(macaddr, charp, 0);
>> >> +MODULE_PARM_DESC(macaddr, "MAC address");
>> >
>> > No Module parameters. You can get the MAC address from DT.
>>
>> What about systems without DT? Not every bootloader is sophisicated
>> enough to edit DT before starting kernel. AX88786C is a chip that can be
>> used in a variety of systems and I'd like to avoid too strong
>> assumptions.
>
> There is also a standardised way to read it from ACPI. And you can set
> it using ip link set. DaveM will likely NACK a module parameter.
>
I am not arguing to keep the parameter at any cost, but I would really
like to know if there is a viable alternative for DT and ACPI. This chip
is for smaller systems which not necessarily implement advanced
bootloaders (and DT).
>> >> +MODULE_AUTHOR("ASIX");
>> >
>> > Do you expect ASIX to support this?
>>
>> No.
>>
>> > You probably want to put your name here.
>>
>> I don't want to be considered as the only author and as far as I can
>> tell being mentioned as an author does not imply being a
>> maintainer. Do you think two MODULE_AUTHOR()s be OK?
>
> Can you have two? One with two names listed is O.K.
>
According to module.h
/*
* Author(s), use "Name <email>" or just "Name", for multiple
* authors use multiple MODULE_AUTHOR() statements/lines.
*/
>> >> +
>> >> + phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
>> >> + if (phy_status & PSCR_PHYLINK) {
>> >> +
>> >> + ax_local->w_state = ax_nop;
>> >> + time_to_chk = 0;
>> >> +
>> >> + } else if (!(phy_status & PSCR_PHYCOFF)) {
>> >> + /* The ethernet cable has been plugged */
>> >> + if (ax_local->w_state == chk_cable) {
>> >> + if (netif_msg_timer(ax_local))
>> >> + netdev_info(ndev, "Cable connected\n");
>> >> +
>> >> + ax_local->w_state = chk_link;
>> >> + ax_local->w_ticks = 0;
>> >> + } else {
>> >> + if (netif_msg_timer(ax_local))
>> >> + netdev_info(ndev, "Check media status\n");
>> >> +
>> >> + if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
>> >> + if (netif_msg_timer(ax_local))
>> >> + netdev_info(ndev, "Restart autoneg\n");
>> >> + ax88796c_mdio_write(ndev,
>> >> + ax_local->mii.phy_id, MII_BMCR,
>> >> + (BMCR_SPEED100 | BMCR_ANENABLE |
>> >> + BMCR_ANRESTART));
>> >> +
>> >> + if (netif_msg_hw(ax_local))
>> >> + ax88796c_dump_phy_regs(ax_local);
>> >> + ax_local->w_ticks = 0;
>> >> + }
>> >> + }
>> >> + } else {
>> >> + if (netif_msg_timer(ax_local))
>> >> + netdev_info(ndev, "Check cable status\n");
>> >> +
>> >> + ax_local->w_state = chk_cable;
>> >> + }
>> >> +
>> >> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> >> +
>> >> + if (time_to_chk)
>> >> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
>> >> +}
>> >
>> > This is not the normal use of a watchdog in network drivers. The
>> > normal case is the network stack as asked the driver to do something,
>> > normally a TX, and the driver has not reported the action has
>> > completed. The state of the cable should not make any
>> > difference. This does not actually appear to do anything useful, like
>> > kick the hardware to bring it back to life.
>> >
>>
>> Maybe it's the naming that is a problem. Yes, it is not a watchdog, but
>> rather a periodic housekeeping and it kicks hw if it can't negotiate
>> the connection. The question is: should the settings be reset in such case.
>
> Let see what is left once you convert to phylib.
>
OK.
>> >> + struct net_device *ndev = ax_local->ndev;
>> >> + int status;
>> >> +
>> >> + do {
>> >> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
>> >> + break;
>> >> +
>> >> + /* checksum error bit is set */
>> >> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
>> >> + (rxhdr->flags & RX_HDR3_L4_ERR))
>> >> + break;
>> >> +
>> >> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
>> >> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
>> >> + skb->ip_summed = CHECKSUM_UNNECESSARY;
>> >> + }
>> >> + } while (0);
>> >
>> >
>> > ??
>> >
>>
>> if() break; Should I use goto?
>
> Sorry, i was too ambiguous. Why:
>
> do {
> } while (0);
>
> It is an odd construct.
As to "why" — you have correctly spotted, this is a vendor driver I am
porting. Although it's not like I am trying to avoid any changes, but
because this driver worked for us on older kernels (v3.10.9) I am trying
not to touch pieces which IMHO are good enough. Of course I don't mind
suggestions from more experienced developers.
To avoid using do{}while(0) it requires either goto (instead of breaks),
nesting those if()s in one another or a humongous single if(). Neither
looks pretty and the last one is even less readable than
do()while.
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-09-08 17:49 ` Lukasz Stelmach
@ 2020-09-08 18:22 ` Andrew Lunn
-1 siblings, 0 replies; 57+ messages in thread
From: Andrew Lunn @ 2020-09-08 18:22 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Krzysztof Kozlowski, linux-kernel, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller, linux-arm-kernel, m.szyprowski
On Tue, Sep 08, 2020 at 07:49:20PM +0200, Lukasz Stelmach wrote:
> It was <2020-09-07 pon 20:18>, when Andrew Lunn wrote:
> >> > On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> >> >> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
> >> >
> >> > This is an odd filename. The ioctl code is wrong anyway, but there is
> >> > a lot more than ioctl in here. I suggest you give it a new name.
> >> >
> >>
> >> Sure, any suggestions?
> >
> > Sorry, i have forgotten what is actually contained.
>
> IOCTL handler (.ndo_do_ioctl), ethtool ops, and a bunch of hw control
> functions.
>
> > Does it even need to be a separate file?
>
> It doesn't need, but I think it makes sense to keep ioctl and ethtool
> stuff in a separate file. Some of the hw control function look like they
> might change after using phylib.
<driver>_ethtool.c is a common file name.
> Good point. I need to figure out how to do it. Can you point (from the
> top fou your head) a driver which does it for a simmilarly integrated
> device?
Being integrated or not makes no difference. The API usage is the
same. drivers/net/usb/smsc95xx.c has an integrated PHY i think.
> I am not arguing to keep the parameter at any cost, but I would really
> like to know if there is a viable alternative for DT and ACPI. This chip
> is for smaller systems which not necessarily implement advanced
> bootloaders (and DT).
What bootload is being used, if not uboot or bearbox?
> According to module.h
>
> /*
> * Author(s), use "Name <email>" or just "Name", for multiple
> * authors use multiple MODULE_AUTHOR() statements/lines.
> */
Thanks, did not know that.
> >> >> + struct net_device *ndev = ax_local->ndev;
> >> >> + int status;
> >> >> +
> >> >> + do {
> >> >> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
> >> >> + break;
> >> >> +
> >> >> + /* checksum error bit is set */
> >> >> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
> >> >> + (rxhdr->flags & RX_HDR3_L4_ERR))
> >> >> + break;
> >> >> +
> >> >> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
> >> >> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
> >> >> + skb->ip_summed = CHECKSUM_UNNECESSARY;
> >> >> + }
> >> >> + } while (0);
> >> >
> >> >
> >> > ??
> >> >
> >>
> >> if() break; Should I use goto?
> >
> > Sorry, i was too ambiguous. Why:
> >
> > do {
> > } while (0);
> >
> > It is an odd construct.
>
> As to "why" — you have correctly spotted, this is a vendor driver I am
> porting. Although it's not like I am trying to avoid any changes, but
> because this driver worked for us on older kernels (v3.10.9) I am trying
> not to touch pieces which IMHO are good enough.
My experience with vendor drivers is you nearly end up rewriting it to
bring it up to mainline standards. I would suggest first setting up
some automated tests, and then make lots of small changes, committed
to git. You can then go backwards and find where regressions have been
introduced and found by the automated tests. And then every so often
squash it all together, ready for submission.
> To avoid using do{}while(0) it requires either goto (instead of breaks),
> nesting those if()s in one another or a humongous single if(). Neither
> looks pretty and the last one is even less readable than
> do()while.
I removed too much context. Does anything useful happen afterwards?
Maybe you can just use return? Or put that code into a helper which
can use return rather than break?
Andrew
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-09-08 18:22 ` Andrew Lunn
0 siblings, 0 replies; 57+ messages in thread
From: Andrew Lunn @ 2020-09-08 18:22 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Krzysztof Kozlowski, linux-kernel, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller, linux-arm-kernel, m.szyprowski
On Tue, Sep 08, 2020 at 07:49:20PM +0200, Lukasz Stelmach wrote:
> It was <2020-09-07 pon 20:18>, when Andrew Lunn wrote:
> >> > On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> >> >> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
> >> >
> >> > This is an odd filename. The ioctl code is wrong anyway, but there is
> >> > a lot more than ioctl in here. I suggest you give it a new name.
> >> >
> >>
> >> Sure, any suggestions?
> >
> > Sorry, i have forgotten what is actually contained.
>
> IOCTL handler (.ndo_do_ioctl), ethtool ops, and a bunch of hw control
> functions.
>
> > Does it even need to be a separate file?
>
> It doesn't need, but I think it makes sense to keep ioctl and ethtool
> stuff in a separate file. Some of the hw control function look like they
> might change after using phylib.
<driver>_ethtool.c is a common file name.
> Good point. I need to figure out how to do it. Can you point (from the
> top fou your head) a driver which does it for a simmilarly integrated
> device?
Being integrated or not makes no difference. The API usage is the
same. drivers/net/usb/smsc95xx.c has an integrated PHY i think.
> I am not arguing to keep the parameter at any cost, but I would really
> like to know if there is a viable alternative for DT and ACPI. This chip
> is for smaller systems which not necessarily implement advanced
> bootloaders (and DT).
What bootload is being used, if not uboot or bearbox?
> According to module.h
>
> /*
> * Author(s), use "Name <email>" or just "Name", for multiple
> * authors use multiple MODULE_AUTHOR() statements/lines.
> */
Thanks, did not know that.
> >> >> + struct net_device *ndev = ax_local->ndev;
> >> >> + int status;
> >> >> +
> >> >> + do {
> >> >> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
> >> >> + break;
> >> >> +
> >> >> + /* checksum error bit is set */
> >> >> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
> >> >> + (rxhdr->flags & RX_HDR3_L4_ERR))
> >> >> + break;
> >> >> +
> >> >> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
> >> >> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
> >> >> + skb->ip_summed = CHECKSUM_UNNECESSARY;
> >> >> + }
> >> >> + } while (0);
> >> >
> >> >
> >> > ??
> >> >
> >>
> >> if() break; Should I use goto?
> >
> > Sorry, i was too ambiguous. Why:
> >
> > do {
> > } while (0);
> >
> > It is an odd construct.
>
> As to "why" — you have correctly spotted, this is a vendor driver I am
> porting. Although it's not like I am trying to avoid any changes, but
> because this driver worked for us on older kernels (v3.10.9) I am trying
> not to touch pieces which IMHO are good enough.
My experience with vendor drivers is you nearly end up rewriting it to
bring it up to mainline standards. I would suggest first setting up
some automated tests, and then make lots of small changes, committed
to git. You can then go backwards and find where regressions have been
introduced and found by the automated tests. And then every so often
squash it all together, ready for submission.
> To avoid using do{}while(0) it requires either goto (instead of breaks),
> nesting those if()s in one another or a humongous single if(). Neither
> looks pretty and the last one is even less readable than
> do()while.
I removed too much context. Does anything useful happen afterwards?
Maybe you can just use return? Or put that code into a helper which
can use return rather than break?
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-09-07 17:39 ` Lukasz Stelmach
@ 2020-09-14 22:29 ` jim.cromie
-1 siblings, 0 replies; 57+ messages in thread
From: jim.cromie @ 2020-09-14 22:29 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: Andrew Lunn, David S. Miller, Jakub Kicinski, Krzysztof Kozlowski,
Kukjin Kim, Rob Herring, Russell King, linux-arm-kernel, LKML,
linux-samsung-soc, netdev, devicetree, b.zolnierkie, m.szyprowski
> >
> > Please you should not be using netdev_info(). netdev_dbg() please.
> >
>
> I changed most netif_msg_*()+netdev_*() to netif_*(), including
> netif_dbg() in several places. However, after reading other drivers I
> decided to leave this at INFO level. I think this is the way to go,
> because this is what user asks for and with dynamic debug enabled users
> would have to ask for these in two different places.
dynamic_debug_exec_queries is now exported,
allowing module authors full >control of their debug
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-09-14 22:29 ` jim.cromie
0 siblings, 0 replies; 57+ messages in thread
From: jim.cromie @ 2020-09-14 22:29 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: Andrew Lunn, linux-samsung-soc, devicetree, netdev, b.zolnierkie,
Russell King, Krzysztof Kozlowski, LKML, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller, linux-arm-kernel, m.szyprowski
> >
> > Please you should not be using netdev_info(). netdev_dbg() please.
> >
>
> I changed most netif_msg_*()+netdev_*() to netif_*(), including
> netif_dbg() in several places. However, after reading other drivers I
> decided to leave this at INFO level. I think this is the way to go,
> because this is what user asks for and with dynamic debug enabled users
> would have to ask for these in two different places.
dynamic_debug_exec_queries is now exported,
allowing module authors full >control of their debug
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-25 17:03 ` Łukasz Stelmach
@ 2020-08-25 18:44 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 57+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-25 18:44 UTC (permalink / raw)
To: Łukasz Stelmach
Cc: David S. Miller, Jakub Kicinski, Kukjin Kim, Rob Herring,
Russell King, linux-arm-kernel, linux-kernel, linux-samsung-soc,
netdev, devicetree, m.szyprowski, b.zolnierkie
On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> ASIX AX88796[1] is a versatile ethernet adapter chip, that can be
> connected to a CPU with a 8/16-bit bus or with an SPI. This driver
> supports SPI connection.
>
> The driver has been ported from the vendor kernel for ARTIK5[2]
> boards. Several changes were made to adapt it to the current kernel
> which include:
>
> + updated DT configuration,
> + clock configuration moved to DT,
> + new timer, ethtool and gpio APIs
> + dev_* instead of pr_* and custom printk() wrappers.
>
> [1] https://www.asix.com.tw/products.php?op=pItemdetail&PItemID=104;65;86&PLine=65
> [2] https://git.tizen.org/cgit/profile/common/platform/kernel/linux-3.10-artik/
>
> The other ax88796 driver is for NE2000 compatible AX88796L chip. These
> chips are not compatible. Hence, two separate drivers are required.
Hi,
Thanks for the driver, nice work. Few comments below.
>
> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> ---
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/asix/Kconfig | 20 +
> drivers/net/ethernet/asix/Makefile | 6 +
> drivers/net/ethernet/asix/ax88796c_ioctl.c | 293 +++++
> drivers/net/ethernet/asix/ax88796c_ioctl.h | 21 +
> drivers/net/ethernet/asix/ax88796c_main.c | 1373 ++++++++++++++++++++
> drivers/net/ethernet/asix/ax88796c_main.h | 596 +++++++++
> drivers/net/ethernet/asix/ax88796c_spi.c | 103 ++
> drivers/net/ethernet/asix/ax88796c_spi.h | 67 +
> 10 files changed, 2481 insertions(+)
> create mode 100644 drivers/net/ethernet/asix/Kconfig
> create mode 100644 drivers/net/ethernet/asix/Makefile
> create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.c
> create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.h
> create mode 100644 drivers/net/ethernet/asix/ax88796c_main.c
> create mode 100644 drivers/net/ethernet/asix/ax88796c_main.h
> create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.c
> create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.h
>
> diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
> index de50e8b9e656..f3b218e45ea5 100644
> --- a/drivers/net/ethernet/Kconfig
> +++ b/drivers/net/ethernet/Kconfig
> @@ -32,6 +32,7 @@ source "drivers/net/ethernet/apm/Kconfig"
> source "drivers/net/ethernet/apple/Kconfig"
> source "drivers/net/ethernet/aquantia/Kconfig"
> source "drivers/net/ethernet/arc/Kconfig"
> +source "drivers/net/ethernet/asix/Kconfig"
> source "drivers/net/ethernet/atheros/Kconfig"
> source "drivers/net/ethernet/aurora/Kconfig"
> source "drivers/net/ethernet/broadcom/Kconfig"
> diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
> index f8f38dcb5f8a..9eb368d93607 100644
> --- a/drivers/net/ethernet/Makefile
> +++ b/drivers/net/ethernet/Makefile
> @@ -18,6 +18,7 @@ obj-$(CONFIG_NET_XGENE) += apm/
> obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
> obj-$(CONFIG_NET_VENDOR_AQUANTIA) += aquantia/
> obj-$(CONFIG_NET_VENDOR_ARC) += arc/
> +obj-$(CONFIG_NET_VENDOR_ASIX) += asix/
> obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
> obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/
> obj-$(CONFIG_NET_VENDOR_CADENCE) += cadence/
> diff --git a/drivers/net/ethernet/asix/Kconfig b/drivers/net/ethernet/asix/Kconfig
> new file mode 100644
> index 000000000000..4b127a4a659a
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/Kconfig
> @@ -0,0 +1,20 @@
> +#
> +# Asix network device configuration
> +#
> +
> +config NET_VENDOR_ASIX
> + bool "Asix devices"
> + depends on SPI
> + help
> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
Looks like too long, did it pass checkpatch?
> +
> +if NET_VENDOR_ASIX
> +
> +config SPI_AX88796C
> + tristate "Asix AX88796C-SPI support"
> + depends on SPI
> + depends on GPIOLIB
> + help
> + Say Y here if you intend to attach a Asix AX88796C as SPI mode
> +
> +endif # NET_VENDOR_ASIX
> diff --git a/drivers/net/ethernet/asix/Makefile b/drivers/net/ethernet/asix/Makefile
> new file mode 100644
> index 000000000000..0bfbbb042634
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/Makefile
> @@ -0,0 +1,6 @@
> +#
> +# Makefile for the Asix network device drivers.
> +#
> +
> +obj-$(CONFIG_SPI_AX88796C) += ax88796c.o
> +ax88796c-y := ax88796c_main.o ax88796c_ioctl.o ax88796c_spi.o
> diff --git a/drivers/net/ethernet/asix/ax88796c_ioctl.c b/drivers/net/ethernet/asix/ax88796c_ioctl.c
> new file mode 100644
> index 000000000000..eba361e2a8b7
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
> @@ -0,0 +1,293 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2010 ASIX Electronics Corporation
> + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
> + *
> + * ASIX AX88796C SPI Fast Ethernet Linux driver
> + */
> +
> +#include "ax88796c_main.h"
> +#include "ax88796c_spi.h"
> +#include "ax88796c_ioctl.h"
> +
> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
Looks here like pointer to const. Unless it is because of
AX_READ_STATUS() which cannot take const?
> +{
Please put file-scope definitions first, so this should go to the end.
> + struct spi_status ax_status;
> +
> + /* Check media link status first */
> + if (netif_carrier_ok(ax_local->ndev) ||
> + (ax_local->ps_level == AX_PS_D0) ||
> + (ax_local->ps_level == AX_PS_D1)) {
> + return 0;
> + }
> +
> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> + if (!(ax_status.status & AX_STATUS_READY))
This looks buggy... AX_READ_STATUS can fail, without reporting an error.
There is no error handling. What will be the value of ax_status? Sure,
some stack-protector-GCC-plugins might initialize it to 0, but that's
not a good design.
There is no error handling of all SPI functions so entire driver works
because of luck... if there is any error in the middle of some work, it
won't spot it.
> + return 1;
> +
> + return 0;
> +}
> +
> +u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local)
> +{
> + struct spi_status ax_status;
> + unsigned long start_time;
> +
> + /* Check media link status first */
> + if (netif_carrier_ok(ax_local->ndev) ||
> + (ax_local->ps_level == AX_PS_D0) ||
> + (ax_local->ps_level == AX_PS_D1)) {
> + return 0;
> + }
> +
> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> + if (!(ax_status.status & AX_STATUS_READY)) {
> +
> + /* AX88796C in power saving mode */
> + AX_WAKEUP(&ax_local->ax_spi);
> +
> + /* Check status */
> + start_time = jiffies;
> + do {
> + if (time_after(jiffies, start_time + HZ/2)) {
> + netdev_err(ax_local->ndev,
> + "timeout waiting for wakeup"
> + " from power saving\n");
> + break;
> + }
> +
> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> +
> + } while (!(ax_status.status & AX_STATUS_READY));
> +
> + ax88796c_set_power_saving(ax_local, AX_PS_D0);
> +
> + return 1;
> + }
> +
> + return 0;
> +}
> +
> +void ax88796c_set_power_saving(struct ax88796c_device *ax_local, u8 ps_level)
> +{
> + u16 pmm;
> +
> + if (ps_level == AX_PS_D1)
> + pmm = PSCR_PS_D1;
> + else if (ps_level == AX_PS_D2)
> + pmm = PSCR_PS_D2;
> + else
> + pmm = PSCR_PS_D0;
> +
> + AX_WRITE(&ax_local->ax_spi, (AX_READ(&ax_local->ax_spi, P0_PSCR)
> + & PSCR_PS_MASK) | pmm, P0_PSCR);
> +}
> +
> +int ax88796c_mdio_read(struct net_device *ndev, int phy_id, int loc)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + unsigned long start_time;
> +
> + AX_WRITE(&ax_local->ax_spi, MDIOCR_RADDR(loc)
> + | MDIOCR_FADDR(phy_id) | MDIOCR_READ, P2_MDIOCR);
> +
> + start_time = jiffies;
> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
> + if (time_after(jiffies, start_time + HZ/100))
> + return -EBUSY;
> + }
> +
> + return AX_READ(&ax_local->ax_spi, P2_MDIODR);
> +}
> +
> +void
> +ax88796c_mdio_write(struct net_device *ndev, int phy_id, int loc, int val)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + unsigned long start_time;
> +
> + AX_WRITE(&ax_local->ax_spi, val, P2_MDIODR);
> +
> + AX_WRITE(&ax_local->ax_spi,
> + MDIOCR_RADDR(loc) | MDIOCR_FADDR(phy_id)
> + | MDIOCR_WRITE, P2_MDIOCR);
> +
> + start_time = jiffies;
> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
> + if (time_after(jiffies, start_time + HZ/100))
> + return;
> + }
> +
> + if (loc == MII_ADVERTISE) {
> + AX_WRITE(&ax_local->ax_spi, (BMCR_FULLDPLX | BMCR_ANRESTART |
> + BMCR_ANENABLE | BMCR_SPEED100), P2_MDIODR);
> + AX_WRITE(&ax_local->ax_spi, (MDIOCR_RADDR(MII_BMCR) |
> + MDIOCR_FADDR(phy_id) | MDIOCR_WRITE),
> + P2_MDIOCR);
> +
> + start_time = jiffies;
> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR)
> + & MDIOCR_VALID) == 0) {
> + if (time_after(jiffies, start_time + HZ/100))
> + return;
> + }
> + }
> +}
> +
> +void ax88796c_set_csums(struct ax88796c_device *ax_local)
> +{
> + if (ax_local->checksum & AX_RX_CHECKSUM) {
> + AX_WRITE(&ax_local->ax_spi, COERCR0_DEFAULT, P4_COERCR0);
> + AX_WRITE(&ax_local->ax_spi, COERCR1_DEFAULT, P4_COERCR1);
> + } else {
> + AX_WRITE(&ax_local->ax_spi, 0, P4_COERCR0);
> + AX_WRITE(&ax_local->ax_spi, 0, P4_COERCR1);
> + }
> +
> + if (ax_local->checksum & AX_TX_CHECKSUM) {
> + AX_WRITE(&ax_local->ax_spi, COETCR0_DEFAULT, P4_COETCR0);
> + AX_WRITE(&ax_local->ax_spi, COETCR1_TXPPPE, P4_COETCR1);
> + } else {
> + AX_WRITE(&ax_local->ax_spi, 0, P4_COETCR0);
> + AX_WRITE(&ax_local->ax_spi, 0, P4_COETCR1);
> + }
> +}
> +
> +static void ax88796c_get_drvinfo(struct net_device *ndev,
> + struct ethtool_drvinfo *info)
> +{
> + /* Inherit standard device info */
> + strncpy(info->driver, DRV_NAME, sizeof(info->driver));
> + strncpy(info->version, DRV_VERSION, sizeof(info->version));
> +}
> +
> +static u32 ax88796c_get_link(struct net_device *ndev)
> +{
> + u32 link;
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 power;
> +
> + down(&ax_local->spi_lock);
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + link = mii_link_ok(&ax_local->mii);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> + up(&ax_local->spi_lock);
> +
> + return link;
> +
> +
Empty lines.
> +}
> +
> +static u32 ax88796c_get_msglevel(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + return ax_local->msg_enable;
> +}
> +
> +static void ax88796c_set_msglevel(struct net_device *ndev, u32 level)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + ax_local->msg_enable = level;
> +}
> +
> +
One line break.
> +static int
> +ax88796c_get_link_ksettings(struct net_device *ndev,
> + struct ethtool_link_ksettings *cmd)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 power;
> +
> + down(&ax_local->spi_lock);
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + mii_ethtool_get_link_ksettings(&ax_local->mii, cmd);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> + up(&ax_local->spi_lock);
> +
> + return 0;
> +}
> +
> +static int
> +ax88796c_set_link_ksettings(struct net_device *ndev,
> + const struct ethtool_link_ksettings *cmd)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 power;
> +
> + down(&ax_local->spi_lock);
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + mii_ethtool_set_link_ksettings(&ax_local->mii, cmd);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> + up(&ax_local->spi_lock);
> + return 0;
> +
Line before return, not after.
> +}
> +
> +static int ax88796c_nway_reset(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + int ret;
> + u8 power;
> +
> + down(&ax_local->spi_lock);
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + ret = mii_nway_restart(&ax_local->mii);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> + up(&ax_local->spi_lock);
> + return ret;
> +}
> +
> +static u32 ax88796c_ethtool_getmsglevel(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + return ax_local->msg_enable;
> +}
> +
> +static void ax88796c_ethtool_setmsglevel(struct net_device *ndev, u32 level)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + ax_local->msg_enable = level;
> +}
> +
> +struct ethtool_ops ax88796c_ethtool_ops = {
> + .get_drvinfo = ax88796c_get_drvinfo,
> + .get_link = ax88796c_get_link,
> + .get_msglevel = ax88796c_get_msglevel,
> + .set_msglevel = ax88796c_set_msglevel,
> + .get_link_ksettings = ax88796c_get_link_ksettings,
> + .set_link_ksettings = ax88796c_set_link_ksettings,
> + .nway_reset = ax88796c_nway_reset,
> + .get_msglevel = ax88796c_ethtool_getmsglevel,
> + .set_msglevel = ax88796c_ethtool_setmsglevel,
> +};
> +
> +int ax88796c_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + int ret;
> + u8 power;
> +
> + down(&ax_local->spi_lock);
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + ret = generic_mii_ioctl(&ax_local->mii, if_mii(ifr), cmd, NULL);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> + up(&ax_local->spi_lock);
> +
> + return ret;
> +}
> +
> diff --git a/drivers/net/ethernet/asix/ax88796c_ioctl.h b/drivers/net/ethernet/asix/ax88796c_ioctl.h
> new file mode 100644
> index 000000000000..bafd573bd813
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.h
> @@ -0,0 +1,21 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2010 ASIX Electronics Corporation
> + *
> + * ASIX AX88796C SPI Fast Ethernet Linux driver
> + */
> +
> +#ifndef _AX88796C_IOCTL_H
> +#define _AX88796C_IOCTL_H
> +
> +extern struct ethtool_ops ax88796c_ethtool_ops;
> +
> +u8 ax88796c_check_power(struct ax88796c_device *ax_local);
> +u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local);
> +void ax88796c_set_power_saving(struct ax88796c_device *ax_local, u8 ps_level);
> +int ax88796c_mdio_read(struct net_device *dev, int phy_id, int loc);
> +void ax88796c_mdio_write(struct net_device *dev, int phy_id, int loc, int val);
> +void ax88796c_set_csums(struct ax88796c_device *ax_local);
> +int ax88796c_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
> +
> +#endif
> diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c
> new file mode 100644
> index 000000000000..c28cfb931319
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/ax88796c_main.c
> @@ -0,0 +1,1373 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2010 ASIX Electronics Corporation
> + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
> + *
> + * ASIX AX88796C SPI Fast Ethernet Linux driver
> + */
> +
> +#include "ax88796c_main.h"
> +#include "ax88796c_ioctl.h"
> +
> +static int comp;
> +static int ps_level = AX_PS_D0;
> +static int msg_enable = NETIF_MSG_PROBE |
> + NETIF_MSG_LINK |
> + /* NETIF_MSG_TIMER | */
> + NETIF_MSG_RX_ERR |
> + NETIF_MSG_TX_ERR |
> + /* NETIF_MSG_TX_QUEUED | */
> + /* NETIF_MSG_INTR | */
> + /* NETIF_MSG_TX_DONE | */
> + /* NETIF_MSG_RX_STATUS | */
> + /* NETIF_MSG_PKTDATA | */
> + /* NETIF_MSG_HW | */
> + NETIF_MSG_WOL;
> +
> +module_param(comp, int, 0);
> +MODULE_PARM_DESC(comp, "0=Non-Compression Mode, 1=Compression Mode");
> +
> +module_param(ps_level, int, 0);
> +MODULE_PARM_DESC(ps_level,
> + "Power Saving Level (0:disable 1:level 1 2:level 2)");
> +
> +module_param(msg_enable, int, 0);
> +MODULE_PARM_DESC(msg_enable, "Message mask (see linux/netdevice.h for bitmap)");
> +
> +static char *macaddr;
> +module_param(macaddr, charp, 0);
> +MODULE_PARM_DESC(macaddr, "MAC address");
I think MAC address as param is not accepted in mainline...
> +
> +MODULE_AUTHOR("ASIX");
> +MODULE_DESCRIPTION("ASIX AX88796C SPI Ethernet driver");
> +MODULE_LICENSE("GPL");
These three usually go to the end of file.
> +
> +static void ax88796c_dump_regs(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + u8 i, j;
> +
> + netdev_info(ndev,
> + " Page0 Page1 Page2 Page3 "
> + "Page4 Page5 Page6 Page7\n");
> + for (i = 0; i < 0x20; i += 2) {
> + netdev_info(ndev, "0x%02x ", i);
> + for (j = 0; j < 8; j++) {
> + netdev_info(ndev, "0x%04x ",
> + AX_READ(&ax_local->ax_spi, j * 0x20 + i));
> + }
> + netdev_info(ndev, "\n");
> + }
> + netdev_info(ndev, "\n");
> +}
> +
> +static void ax88796c_dump_phy_regs(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + int i;
> +
> + netdev_info(ndev, "Dump PHY registers:\n");
> + for (i = 0; i < 6; i++) {
> + netdev_info(ndev, " MR%d = 0x%04x\n", i,
> + ax88796c_mdio_read(ax_local->ndev,
> + ax_local->mii.phy_id, i));
> + }
> +}
> +
> +static void ax88796c_watchdog(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + u16 phy_status;
> + unsigned long time_to_chk = AX88796C_WATCHDOG_PERIOD;
> +
> + if (ax88796c_check_power(ax_local)) {
> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
> + return;
> + }
> +
> + ax88796c_set_power_saving(ax_local, AX_PS_D0);
> +
> + phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
> + if (phy_status & PSCR_PHYLINK) {
> +
> + ax_local->w_state = ax_nop;
> + time_to_chk = 0;
> +
> + } else if (!(phy_status & PSCR_PHYCOFF)) {
> + /* The ethernet cable has been plugged */
> + if (ax_local->w_state == chk_cable) {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Cable connected\n");
> +
> + ax_local->w_state = chk_link;
> + ax_local->w_ticks = 0;
> + } else {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Check media status\n");
> +
> + if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Restart autoneg\n");
> + ax88796c_mdio_write(ndev,
> + ax_local->mii.phy_id, MII_BMCR,
> + (BMCR_SPEED100 | BMCR_ANENABLE |
> + BMCR_ANRESTART));
> +
> + if (netif_msg_hw(ax_local))
> + ax88796c_dump_phy_regs(ax_local);
> + ax_local->w_ticks = 0;
> + }
> + }
> + } else {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Check cable status\n");
> +
> + ax_local->w_state = chk_cable;
> + }
> +
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + if (time_to_chk)
> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
> +}
> +
> +static void ax88796c_watchdog_timer(struct timer_list *t)
> +{
> + struct ax88796c_device *ax_local = from_timer(ax_local, t, watchdog);
> + //struct net_device *ndev = ax_local->ndev;
Clean up.
> +
> + set_bit(EVENT_WATCHDOG, &ax_local->flags);
> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
> +}
> +
> +static int ax88796c_soft_reset(struct ax88796c_device *ax_local)
> +{
> + unsigned long start;
> + u16 temp;
> +
> + AX_WRITE(&ax_local->ax_spi, PSR_RESET, P0_PSR);
> + AX_WRITE(&ax_local->ax_spi, PSR_RESET_CLR, P0_PSR);
> +
> + start = jiffies;
> + while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
> + if (time_after(jiffies, start + (160 * HZ / 1000))) {
> + dev_err(&ax_local->spi->dev,
> + "timeout waiting for reset completion\n");
> + return -1;
> + }
> + }
> +
> + temp = AX_READ(&ax_local->ax_spi, P4_SPICR);
> + if (ax_local->capabilities & AX_CAP_COMP) {
> + AX_WRITE(&ax_local->ax_spi,
> + (temp | SPICR_RCEN | SPICR_QCEN), P4_SPICR);
> + ax_local->ax_spi.comp = 1;
> + } else {
> + AX_WRITE(&ax_local->ax_spi,
> + (temp & ~(SPICR_RCEN | SPICR_QCEN)), P4_SPICR);
> + ax_local->ax_spi.comp = 0;
> + }
> +
> + return 0;
> +}
> +
> +static int ax88796c_reload_eeprom(struct ax88796c_device *ax_local)
> +{
> + unsigned long start;
> +
> + AX_WRITE(&ax_local->ax_spi, EECR_RELOAD, P3_EECR);
> +
> + start = jiffies;
> + while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
> + if (time_after(jiffies, start + (2 * HZ / 100))) {
> + dev_err(&ax_local->spi->dev,
> + "timeout waiting for reload eeprom\n");
> + return -1;
> + }
> + }
> +
> + return 0;
> +}
> +
> +static void ax88796c_set_hw_multicast(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u16 rx_ctl = RXCR_AB;
> + int mc_count = netdev_mc_count(ndev);
> +
> + memset(ax_local->multi_filter, 0, AX_MCAST_FILTER_SIZE);
> +
> + if (ndev->flags & IFF_PROMISC) {
> + rx_ctl |= RXCR_PRO;
> +
> + } else if (ndev->flags & IFF_ALLMULTI
> + || mc_count > AX_MAX_MCAST) {
> + rx_ctl |= RXCR_AMALL;
> +
> + } else if (mc_count == 0) {
> + /* just broadcast and directed */
> + } else {
> + u32 crc_bits;
> + int i;
> + struct netdev_hw_addr *ha;
> + netdev_for_each_mc_addr(ha, ndev) {
> + crc_bits = ether_crc(ETH_ALEN, ha->addr);
> + ax_local->multi_filter[crc_bits >> 29] |=
> + (1 << ((crc_bits >> 26) & 7));
> + }
> +
> + for (i = 0; i < 4; i++) {
> + AX_WRITE(&ax_local->ax_spi,
> + ((ax_local->multi_filter[i*2+1] << 8) |
> + ax_local->multi_filter[i*2]), P3_MFAR(i));
> +
> + }
> + }
> +
> + AX_WRITE(&ax_local->ax_spi, rx_ctl, P2_RXCR);
> +
No need for empty line.
> +}
> +
> +#if 0
Please comment why it is commented out.
> +static void ax88796c_set_multicast(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> +
> + set_bit(EVENT_SET_MULTI, &ax_local->flags);
> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
> +}
> +#endif
> +
> +static void ax88796c_set_mac_addr(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> +
> + AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[4] << 8) |
> + (u16)ndev->dev_addr[5]), P3_MACASR0);
> + AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[2] << 8) |
> + (u16)ndev->dev_addr[3]), P3_MACASR1);
> + AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[0] << 8) |
> + (u16)ndev->dev_addr[1]), P3_MACASR2);
> +}
> +
> +static int ax88796c_set_mac_address(struct net_device *ndev, void *p)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + struct sockaddr *addr = p;
> +
> + if (!is_valid_ether_addr(addr->sa_data))
> + return -EADDRNOTAVAIL;
> +
> + memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len);
> +
> + down(&ax_local->spi_lock);
> +
> + ax88796c_set_mac_addr(ndev);
> +
> + up(&ax_local->spi_lock);
> +
> + return 0;
> +}
> +
> +static int ax88796c_load_mac_addr(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u16 temp;
> +
> + /* Read the MAC address from AX88796C */
> + temp = AX_READ(&ax_local->ax_spi, P3_MACASR0);
> + ndev->dev_addr[5] = (u8)temp;
> + ndev->dev_addr[4] = (u8)(temp >> 8);
> +
> + temp = AX_READ(&ax_local->ax_spi, P3_MACASR1);
> + ndev->dev_addr[3] = (u8)temp;
> + ndev->dev_addr[2] = (u8)(temp >> 8);
> +
> + temp = AX_READ(&ax_local->ax_spi, P3_MACASR2);
> + ndev->dev_addr[1] = (u8)temp;
> + ndev->dev_addr[0] = (u8)(temp >> 8);
> +
> + /* Supported for no EEPROM */
> + if (!is_valid_ether_addr(ndev->dev_addr)) {
> + if (macaddr && mac_pton(macaddr, ndev->dev_addr))
> + return 0;
> +
> + if (netif_msg_probe(ax_local))
> + dev_info(&ax_local->spi->dev, "Use random MAC address\n");
> +
> + random_ether_addr(ndev->dev_addr);
> + }
> +
> + return 0;
> +}
> +
> +static void ax88796c_proc_tx_hdr(struct tx_pkt_info *info, u8 ip_summed)
> +{
> + u16 pkt_len_bar = (~info->pkt_len & TX_HDR_SOP_PKTLENBAR);
> +
> + /* Prepare SOP header */
> + info->sop.flags_len = info->pkt_len |
> + (ip_summed == CHECKSUM_NONE ? TX_HDR_SOP_DICF : 0);
> +
> + info->sop.seq_lenbar = ((info->seq_num << 11) & TX_HDR_SOP_SEQNUM)
> + | pkt_len_bar;
> + cpu_to_be16s(&info->sop.flags_len);
> + cpu_to_be16s(&info->sop.seq_lenbar);
> +
> + /* Prepare Segment header */
> + info->seg.flags_seqnum_seglen = TX_HDR_SEG_FS | TX_HDR_SEG_LS
> + | info->pkt_len;
> +
> + info->seg.eo_so_seglenbar = pkt_len_bar;
> +
> + cpu_to_be16s(&info->seg.flags_seqnum_seglen);
> + cpu_to_be16s(&info->seg.eo_so_seglenbar);
> +
> + /* Prepare EOP header */
> + info->eop.seq_len = ((info->seq_num << 11) &
> + TX_HDR_EOP_SEQNUM) | info->pkt_len;
> + info->eop.seqbar_lenbar = ((~info->seq_num << 11) &
> + TX_HDR_EOP_SEQNUMBAR) | pkt_len_bar;
> +
> + cpu_to_be16s(&info->eop.seq_len);
> + cpu_to_be16s(&info->eop.seqbar_lenbar);
> +}
> +
> +static int
> +ax88796c_check_free_pages(struct ax88796c_device *ax_local, u8 need_pages)
> +{
> + u8 free_pages;
> + u16 tmp;
> +
> + free_pages = AX_READ(&ax_local->ax_spi, P0_TFBFCR) & TX_FREEBUF_MASK;
> + if (free_pages < need_pages) {
> + /* schedule free page interrupt */
> + tmp = AX_READ(&ax_local->ax_spi, P0_TFBFCR)
> + & TFBFCR_SCHE_FREE_PAGE;
> + AX_WRITE(&ax_local->ax_spi, tmp | TFBFCR_TX_PAGE_SET |
> + TFBFCR_SET_FREE_PAGE(need_pages),
> + P0_TFBFCR);
> + return -ENOMEM;
> + }
> +
> + return 0;
> +}
> +
> +static struct sk_buff *
> +ax88796c_tx_fixup(struct net_device *ndev, struct sk_buff_head *q)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + struct sk_buff *skb, *tx_skb;
> + struct tx_pkt_info *info;
> + struct skb_data *entry;
> + int headroom;
> + int tailroom;
> + u8 need_pages;
> + u16 tol_len, pkt_len;
> + u8 padlen, seq_num;
> + u8 spi_len = ax_local->ax_spi.comp ? 1 : 4;
> +
> + if (skb_queue_empty(q))
> + return NULL;
> +
> + skb = skb_peek(q);
> + pkt_len = skb->len;
> + need_pages = (pkt_len + TX_OVERHEAD + 127) >> 7;
> + if (ax88796c_check_free_pages(ax_local, need_pages) != 0)
> + return NULL;
> +
> + headroom = skb_headroom(skb);
> + tailroom = skb_tailroom(skb);
> + padlen = ((pkt_len + 3) & 0x7FC) - pkt_len;
> + tol_len = ((pkt_len + 3) & 0x7FC) +
> + TX_OVERHEAD + TX_EOP_SIZE + spi_len;
> + seq_num = ++ax_local->seq_num & 0x1F;
> +
> + info = (struct tx_pkt_info *) skb->cb;
> + info->pkt_len = pkt_len;
> +
> + if ((!skb_cloned(skb)) &&
> + (headroom >= (TX_OVERHEAD + spi_len)) &&
> + (tailroom >= (padlen + TX_EOP_SIZE))) {
> +
> + info->seq_num = seq_num;
> + ax88796c_proc_tx_hdr(info, skb->ip_summed);
> +
> + /* SOP and SEG header */
> + memcpy(skb_push(skb, TX_OVERHEAD), &info->sop, TX_OVERHEAD);
> +
> + /* Write SPI TXQ header */
> + memcpy(skb_push(skb, spi_len), tx_cmd_buf, spi_len);
> +
> + /* Make 32-bit aligment */
> + skb_put(skb, padlen);
> +
> + /* EOP header */
> + memcpy(skb_put(skb, TX_EOP_SIZE), &info->eop, TX_EOP_SIZE);
> +
> + tx_skb = skb;
> + skb_unlink(skb, q);
> +
> + } else {
> +
> + tx_skb = alloc_skb(tol_len, GFP_KERNEL);
> + if (!tx_skb)
> + return NULL;
> +
> + /* Write SPI TXQ header */
> + memcpy(skb_put(tx_skb, spi_len), tx_cmd_buf, spi_len);
> +
> + info->seq_num = seq_num;
> + ax88796c_proc_tx_hdr(info, skb->ip_summed);
> +
> + /* SOP and SEG header */
> + memcpy(skb_put(tx_skb, TX_OVERHEAD),
> + &info->sop, TX_OVERHEAD);
> +
> + /* Packet */
> + memcpy(skb_put(tx_skb, ((pkt_len + 3) & 0xFFFC)),
> + skb->data, pkt_len);
> +
> + /* EOP header */
> + memcpy(skb_put(tx_skb, TX_EOP_SIZE),
> + &info->eop, TX_EOP_SIZE);
> +
> + skb_unlink(skb, q);
> + dev_kfree_skb(skb);
> + }
> +
> + entry = (struct skb_data *) tx_skb->cb;
> + memset(entry, 0, sizeof(*entry));
> + entry->len = pkt_len;
> +
> + if (netif_msg_pktdata(ax_local)) {
> + int loop;
> + netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
> + pkt_len, tx_skb->len, seq_num);
> +
> + netdev_info(ndev, " Dump SPI Header:\n ");
> + for (loop = 0; loop < 4; loop++)
> + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
> +
> + netdev_info(ndev, "\n");
> +
> + netdev_info(ndev, " Dump TX SOP:\n ");
> + for (loop = 0; loop < TX_OVERHEAD; loop++)
> + netdev_info(ndev, "%02x ", *(tx_skb->data + 4 + loop));
> +
> + netdev_info(ndev, "\n");
> +
> + netdev_info(ndev, " Dump TX packet:");
> + for (loop = TX_OVERHEAD + 4;
> + loop < (tx_skb->len - TX_EOP_SIZE); loop++) {
> + if (((loop + 8) % 16) == 0)
> + netdev_info(ndev, "\n ");
> + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
> + }
> + netdev_info(ndev, "\n");
> +
> + netdev_info(ndev, " Dump TX EOP:\n %02x %02x %02x %02x\n",
> + *(tx_skb->data + tx_skb->len - 4),
> + *(tx_skb->data + tx_skb->len - 3),
> + *(tx_skb->data + tx_skb->len - 2),
> + *(tx_skb->data + tx_skb->len - 1));
> + }
> +
> + return tx_skb;
> +}
> +
> +static int ax88796c_hard_xmit(struct ax88796c_device *ax_local)
> +{
> + struct sk_buff *tx_skb;
> + struct skb_data *entry;
> +
> + tx_skb = ax88796c_tx_fixup(ax_local->ndev, &ax_local->tx_wait_q);
> +
> + if (!tx_skb)
> + return 0;
> +
> + entry = (struct skb_data *)tx_skb->cb;
> +
> + AX_WRITE(&ax_local->ax_spi,
> + (TSNR_TXB_START | TSNR_PKT_CNT(1)), P0_TSNR);
> +
> + axspi_write_txq(&ax_local->ax_spi, tx_skb->data, tx_skb->len);
> +
> + if (((AX_READ(&ax_local->ax_spi, P0_TSNR) & TXNR_TXB_IDLE) == 0) ||
> + ((ISR_TXERR & AX_READ(&ax_local->ax_spi, P0_ISR)) != 0)) {
> +
> + /* Ack tx error int */
> + AX_WRITE(&ax_local->ax_spi, ISR_TXERR, P0_ISR);
> +
> + ax_local->stats.tx_dropped++;
> +
> + if (netif_msg_tx_err(ax_local))
> + netdev_err(ax_local->ndev,
> + "TX FIFO error, re-initialize the TX bridge\n");
> +
> + /* Reinitial tx bridge */
> + AX_WRITE(&ax_local->ax_spi, TXNR_TXB_REINIT |
> + AX_READ(&ax_local->ax_spi, P0_TSNR), P0_TSNR);
> + ax_local->seq_num = 0;
> + } else {
> + ax_local->stats.tx_packets++;
> + ax_local->stats.tx_bytes += entry->len;
> + }
> +
> + entry->state = tx_done;
> + dev_kfree_skb(tx_skb);
> +
> + return 1;
> +}
> +
> +static int
> +ax88796c_start_xmit(struct sk_buff *skb, struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> +
> + skb_queue_tail(&ax_local->tx_wait_q, skb);
> + if (skb_queue_len(&ax_local->tx_wait_q) > TX_QUEUE_HIGH_WATER) {
> + if (netif_msg_tx_queued(ax_local))
> + netdev_err(ndev, "Too much TX packets in queue %d\n",
> + skb_queue_len(&ax_local->tx_wait_q));
> +
> + netif_stop_queue(ndev);
> + }
> +
> + set_bit(EVENT_TX, &ax_local->flags);
> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
> +
> + return NETDEV_TX_OK;
> +
> +}
> +
> +
> +static inline void
> +ax88796c_skb_return(struct ax88796c_device *ax_local, struct sk_buff *skb,
> + struct rx_header *rxhdr)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + int status;
> +
> + do {
> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
> + break;
> +
> + /* checksum error bit is set */
> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
> + (rxhdr->flags & RX_HDR3_L4_ERR))
> + break;
> +
> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
> + skb->ip_summed = CHECKSUM_UNNECESSARY;
> + }
> + } while (0);
> +
> + ax_local->stats.rx_packets++;
> + ax_local->stats.rx_bytes += skb->len;
> + skb->dev = ndev;
> +
> + skb->truesize = skb->len + sizeof(struct sk_buff);
> + skb->protocol = eth_type_trans(skb, ax_local->ndev);
> +
> + if (netif_msg_rx_status(ax_local))
> + netdev_info(ndev, "< rx, len %zu, type 0x%x\n",
> + skb->len + sizeof(struct ethhdr), skb->protocol);
> +
> + status = netif_rx(skb);
> + if (status != NET_RX_SUCCESS && netif_msg_rx_err(ax_local))
> + netdev_info(ndev, "netif_rx status %d\n", status);
> +}
> +
> +static void dump_packet(struct net_device *ndev, const char *msg, int len, const char *data)
> +{
Too long lines.
> + netdev_printk(KERN_DEBUG, ndev, DRV_NAME ": %s - packet len:%d\n", msg, len);
> + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
> + data, len, true);
> +}
> +
> +static void
> +ax88796c_rx_fixup(struct ax88796c_device *ax_local, struct sk_buff *rx_skb)
> +{
> + struct rx_header *rxhdr = (struct rx_header *) rx_skb->data;
> + struct net_device *ndev = ax_local->ndev;
> + u16 len;
> +
> + be16_to_cpus(&rxhdr->flags_len);
> + be16_to_cpus(&rxhdr->seq_lenbar);
> + be16_to_cpus(&rxhdr->flags);
> +
> + if ((((short)rxhdr->flags_len) & RX_HDR1_PKT_LEN) !=
> + (~((short)rxhdr->seq_lenbar) & 0x7FF)) {
> + if (netif_msg_rx_err(ax_local)) {
> + int i;
> + netdev_err(ndev, "Header error\n");
> + //netdev_err(ndev, "Dump received frame\n");
> + /* for (i = 0; i < rx_skb->len; i++) { */
> + /* netdev_err(ndev, "%02x ", */
> + /* *(rx_skb->data + i)); */
> + /* if (((i + 1) % 16) == 0) */
> + /* netdev_err(ndev, "\n"); */
> + /* } */
> + dump_packet(ndev, __func__, rx_skb->len, rx_skb->data);
> + }
> + ax_local->stats.rx_frame_errors++;
> + kfree_skb(rx_skb);
> + return;
> + }
> +
> + if ((rxhdr->flags_len & RX_HDR1_MII_ERR) ||
> + (rxhdr->flags_len & RX_HDR1_CRC_ERR)) {
> + if (netif_msg_rx_err(ax_local))
> + netdev_err(ndev, "CRC or MII error\n");
> +
> + ax_local->stats.rx_crc_errors++;
> + kfree_skb(rx_skb);
> + return;
> + }
> +
> + len = rxhdr->flags_len & RX_HDR1_PKT_LEN;
> + if (netif_msg_pktdata(ax_local)) {
> + int loop;
> + netdev_info(ndev, "RX data, total len %d, packet len %d\n",
> + rx_skb->len, len);
> +
> + netdev_info(ndev, " Dump RX packet header:\n ");
> + for (loop = 0; loop < sizeof(*rxhdr); loop++)
> + netdev_info(ndev, "%02x ", *(rx_skb->data + loop));
> +
> + netdev_info(ndev, "\n Dump RX packet:");
> + for (loop = 0; loop < len; loop++) {
> + if ((loop % 16) == 0)
> + netdev_info(ndev, "\n ");
> + netdev_info(ndev, "%02x ",
> + *(rx_skb->data + loop + sizeof(*rxhdr)));
> + }
> + netdev_info(ndev, "\n");
> + }
> +
> + skb_pull(rx_skb, sizeof(*rxhdr));
> + __pskb_trim(rx_skb, len);
> +
> + return ax88796c_skb_return(ax_local, rx_skb, rxhdr);
> +}
> +
> +static int ax88796c_receive(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + struct sk_buff *skb;
> + struct skb_data *entry;
> + u16 w_count, pkt_len;
> + u8 pkt_cnt;
> +
> + /* check rx packet and total word count */
> + AX_WRITE(&ax_local->ax_spi, AX_READ(&ax_local->ax_spi, P0_RTWCR)
> + | RTWCR_RX_LATCH, P0_RTWCR);
> +
> + pkt_cnt = AX_READ(&ax_local->ax_spi, P0_RXBCR2) & RXBCR2_PKT_MASK;
> + if (!pkt_cnt)
> + return 0;
> +
> + pkt_len = AX_READ(&ax_local->ax_spi, P0_RCPHR) & 0x7FF;
> +
> + w_count = ((pkt_len + 6 + 3) & 0xFFFC) >> 1;
> +
> + skb = alloc_skb((w_count * 2), GFP_KERNEL);
> + if (!skb) {
> + if (netif_msg_rx_err(ax_local))
> + netdev_err(ndev,
> + "Couldn't allocate a sk_buff of size %d\n",
> + w_count * 2);
> +
> + AX_WRITE(&ax_local->ax_spi, RXBCR1_RXB_DISCARD, P0_RXBCR1);
> + return 0;
> + }
> + entry = (struct skb_data *) skb->cb;
> +
> + AX_WRITE(&ax_local->ax_spi, RXBCR1_RXB_START | w_count, P0_RXBCR1);
> +
> + axspi_read_rxq(&ax_local->ax_spi,
> + skb_put(skb, w_count * 2), skb->len);
> +
> + /* Check if rx bridge is idle */
> + if ((AX_READ(&ax_local->ax_spi, P0_RXBCR2) & RXBCR2_RXB_IDLE) == 0) {
> +
> + if (netif_msg_rx_err(ax_local))
> + netdev_err(ndev, "Rx Bridge is not idle\n");
> + AX_WRITE(&ax_local->ax_spi, RXBCR2_RXB_REINIT, P0_RXBCR2);
> +
> + entry->state = rx_err;
> +
> + } else {
> +
> + entry->state = rx_done;
> + }
> +
> + AX_WRITE(&ax_local->ax_spi, ISR_RXPKT, P0_ISR);
> +
> + ax88796c_rx_fixup(ax_local, skb);
> +
> + return 1;
> +}
> +
> +static void ax88796c_check_media(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + u16 bmsr, bmcr;
> +
> + if (netif_msg_hw(ax_local))
> + ax88796c_dump_phy_regs(ax_local);
> +
> + bmsr = ax88796c_mdio_read(ndev,
> + ax_local->mii.phy_id, MII_BMSR);
> +
> + if (!(bmsr & BMSR_LSTATUS) && netif_carrier_ok(ndev)) {
> +
> + netif_carrier_off(ndev);
> + if (netif_msg_link(ax_local))
> + netdev_info(ndev, "link down\n");
> +
> + ax_local->w_state = chk_cable;
> + mod_timer(&ax_local->watchdog,
> + jiffies + AX88796C_WATCHDOG_PERIOD);
> +
> + } else if ((bmsr & BMSR_LSTATUS) &&
> + !netif_carrier_ok(ndev)) {
> + bmcr = ax88796c_mdio_read(ndev,
> + ax_local->mii.phy_id, MII_BMCR);
> + if (netif_msg_link(ax_local))
> + netdev_info(ndev, "link up, %sMbps, %s-duplex\n",
> + (bmcr & BMCR_SPEED100) ? "100" : "10",
> + (bmcr & BMCR_FULLDPLX) ? "full" : "half");
> +
> + netif_carrier_on(ndev);
> + }
> +
> + return;
> +}
> +
> +static int ax88796c_process_isr(struct ax88796c_device *ax_local)
> +{
> + u16 isr;
> + u8 done = 0;
> + struct net_device *ndev = ax_local->ndev;
> +
> + isr = AX_READ(&ax_local->ax_spi, P0_ISR);
> + AX_WRITE(&ax_local->ax_spi, isr, P0_ISR);
> +
> + if (netif_msg_intr(ax_local))
> + netdev_info(ndev, " ISR 0x%04x\n", isr);
> +
> + if (isr & ISR_TXERR) {
> + if (netif_msg_intr(ax_local))
> + netdev_info(ndev, " TXERR interrupt\n");
> + AX_WRITE(&ax_local->ax_spi, TXNR_TXB_REINIT, P0_TSNR);
> + ax_local->seq_num = 0x1f;
> + }
> +
> + if (isr & ISR_TXPAGES) {
> +
> + if (netif_msg_intr(ax_local))
> + netdev_info(ndev, " TXPAGES interrupt\n");
> +
> + set_bit(EVENT_TX, &ax_local->flags);
> + }
> +
> + if (isr & ISR_LINK) {
> +
> + if (netif_msg_intr(ax_local))
> + netdev_info(ndev, " Link change interrupt\n");
> +
> + ax88796c_check_media(ax_local);
> + }
> +
> + if (isr & ISR_RXPKT) {
> +
> + if (netif_msg_intr(ax_local))
> + netdev_info(ndev, " RX interrupt\n");
> +
> + done = ax88796c_receive(ax_local->ndev);
> + }
> +
> + return done;
> +}
> +
> +static irqreturn_t ax88796c_interrupt(int irq, void *dev_instance)
> +{
> + struct net_device *ndev = dev_instance;
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> +
> + if (ndev == NULL) {
> + pr_err("irq %d for unknown device.\n", irq);
> + return IRQ_RETVAL(0);
> + }
> +
> + disable_irq_nosync(irq);
> +
> + if (netif_msg_intr(ax_local))
> + netdev_info(ndev, "Interrupt occurred\n");
> +
> + set_bit(EVENT_INTR, &ax_local->flags);
> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
> +
> + return IRQ_HANDLED;
> +}
> +
> +
Only one line
> +static void ax88796c_work(struct work_struct *work)
> +{
> + struct ax88796c_device *ax_local =
> + container_of(work, struct ax88796c_device, ax_work);
> + u8 power = 0;
> +
> + down(&ax_local->spi_lock);
> +
> + if (test_bit(EVENT_WATCHDOG, &ax_local->flags)) {
> +
> + ax88796c_watchdog(ax_local);
> +
> + clear_bit(EVENT_WATCHDOG, &ax_local->flags);
> + }
> +
> + if (test_bit(EVENT_SET_MULTI, &ax_local->flags)) {
> +
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + ax88796c_set_hw_multicast(ax_local->ndev);
> + clear_bit(EVENT_SET_MULTI, &ax_local->flags);
> + }
> +
> + if (test_bit(EVENT_INTR, &ax_local->flags)) {
> +
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
> +
> + while (1) {
> + if (!ax88796c_process_isr(ax_local))
> + break;
> + }
> +
> + clear_bit(EVENT_INTR, &ax_local->flags);
> +
> + AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
> +
> + enable_irq(ax_local->ndev->irq);
> + }
> +
> + if (test_bit(EVENT_TX, &ax_local->flags)) {
> +
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + while (skb_queue_len(&ax_local->tx_wait_q)) {
> + if (!ax88796c_hard_xmit(ax_local))
> + break;
> + }
> +
> + clear_bit(EVENT_TX, &ax_local->flags);
> +
> + if (netif_queue_stopped(ax_local->ndev) &&
> + (skb_queue_len(&ax_local->tx_wait_q) < TX_QUEUE_LOW_WATER))
> + netif_wake_queue(ax_local->ndev);
> + }
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + up(&ax_local->spi_lock);
> +}
> +
> +static struct net_device_stats *ax88796c_get_stats(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + return &ax_local->stats;
> +}
> +
> +void ax88796c_phy_init(struct ax88796c_device *ax_local)
> +{
> + u16 advertise = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
> +
> + /* Setup LED mode */
> + AX_WRITE(&ax_local->ax_spi,
> + (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |
> + LCR_LED1_100MODE), P2_LCR0);
> + AX_WRITE(&ax_local->ax_spi,
> + (AX_READ(&ax_local->ax_spi, P2_LCR1) & LCR_LED2_MASK) |
> + LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);
> +
> + /* Enable PHY auto-polling */
> + AX_WRITE(&ax_local->ax_spi,
> + POOLCR_PHYID(ax_local->mii.phy_id) | POOLCR_POLL_EN |
> + POOLCR_POLL_FLOWCTRL | POOLCR_POLL_BMCR, P2_POOLCR);
> +
> + ax88796c_mdio_write(ax_local->ndev,
> + ax_local->mii.phy_id, MII_ADVERTISE, advertise);
> +
> + ax88796c_mdio_write(ax_local->ndev, ax_local->mii.phy_id, MII_BMCR,
> + BMCR_SPEED100 | BMCR_ANENABLE | BMCR_ANRESTART);
> +}
> +
> +static int
> +ax88796c_open(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + int ret;
> + u8 power;
> + unsigned long irq_flag = IRQF_SHARED;
> +
> + netif_carrier_off(ax_local->ndev);
> +
> + down(&ax_local->spi_lock);
> +
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + ret = ax88796c_soft_reset(ax_local);
> + if (ret < 0) {
> + return -ENODEV;
> + }
> +
> + ret = request_irq(ndev->irq, ax88796c_interrupt,
> + irq_flag, ndev->name, ndev);
> + if (ret) {
> + netdev_err(ndev, "unable to get IRQ %d (errno=%d).\n",
> + ndev->irq, ret);
> + return -ENXIO;
> + }
> +
> + ax_local->seq_num = 0x1f;
> +
> + ax88796c_set_mac_addr(ndev);
> + ax88796c_set_csums(ax_local);
> +
> + /* Disable stuffing packet */
> + AX_WRITE(&ax_local->ax_spi,
> + AX_READ(&ax_local->ax_spi, P1_RXBSPCR)
> + & ~RXBSPCR_STUF_ENABLE, P1_RXBSPCR);
> +
> + /* Enable RX packet process */
> + AX_WRITE(&ax_local->ax_spi, RPPER_RXEN, P1_RPPER);
> +
> + AX_WRITE(&ax_local->ax_spi, AX_READ(&ax_local->ax_spi, P0_FER)
> + | FER_RXEN | FER_TXEN | FER_BSWAP | FER_IRQ_PULL, P0_FER);
> +
> + ax88796c_phy_init(ax_local);
> +
> + netif_start_queue(ndev);
> +
> + AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
> +
> + if (netif_msg_hw(ax_local)) {
> + netdev_info(ndev,
> + "Dump all MAC registers after initialization:\n");
> + ax88796c_dump_regs(ax_local);
> + ax88796c_dump_phy_regs(ax_local);
> + }
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + spi_message_init(&ax_local->ax_spi.rx_msg);
> +
> + up(&ax_local->spi_lock);
> +
> + timer_setup(&ax_local->watchdog, ax88796c_watchdog_timer, 0);
> + /* init_timer(&ax_local->watchdog); */
> + /* ax_local->watchdog.function = &ax88796c_watchdog_timer; */
> + /* ax_local->watchdog.data = (unsigned long) ndev; */
I guess it's a development code.
> + ax_local->watchdog.expires = jiffies + AX88796C_WATCHDOG_PERIOD;
> + ax_local->w_state = chk_cable;
> + ax_local->w_ticks = 0;
> +
> + add_timer(&ax_local->watchdog);
> +
> + return 0;
> +}
> +
> +static void ax88796c_free_skb_queue(struct sk_buff_head *q)
> +{
> + struct sk_buff *skb;
> +
> + while (q->qlen) {
> + skb = skb_dequeue(q);
> + kfree_skb(skb);
> + }
> +}
> +
> +static int
> +ax88796c_close(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 power;
> +
> + netif_stop_queue(ndev);
> +
> + del_timer_sync(&ax_local->watchdog);
> +
> + free_irq(ndev->irq, ndev);
> +
> + down(&ax_local->spi_lock);
> +
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
> + ax88796c_free_skb_queue(&ax_local->tx_wait_q);
> +
> + ax88796c_soft_reset(ax_local);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + up(&ax_local->spi_lock);
> +
> + return 0;
> +}
> +
> +static const struct net_device_ops ax88796c_netdev_ops = {
> + .ndo_open = ax88796c_open,
> + .ndo_stop = ax88796c_close,
> + .ndo_start_xmit = ax88796c_start_xmit,
> + .ndo_get_stats = ax88796c_get_stats,
> + /* .ndo_set_multicast_list = ax88796c_set_multicast, */
Still need a comment.
> + .ndo_do_ioctl = ax88796c_ioctl,
> + .ndo_set_mac_address = ax88796c_set_mac_address,
> +};
> +
> +
> +static int ax88796c_hard_reset(struct ax88796c_device *ax_local)
> +{
> + struct device *dev = (struct device*)&ax_local->spi->dev;
> + struct gpio_desc *reset_gpio;
> +
> + /* reset info */
> + reset_gpio = gpiod_get(dev, "reset", 0);
> + if (IS_ERR(reset_gpio)) {
> + dev_err(dev, "Could not get 'reset' GPIO: %ld", PTR_ERR(reset_gpio));
> + return PTR_ERR(reset_gpio);
> + }
> +
> + /* set reset */
> + gpiod_direction_output(reset_gpio, 1);
> + msleep(100);
> + gpiod_direction_output(reset_gpio, 0);
> + gpiod_put(reset_gpio);
> + msleep(10);
> +
> + return 0;
> +}
> +
> +static int ax88796c_probe(struct spi_device *spi)
> +{
> + struct net_device *ndev;
> + struct ax88796c_device *ax_local;
> + int ret;
> + u16 temp;
> +
> + ndev = devm_alloc_etherdev(&spi->dev, sizeof(*ax_local));
> + if (!ndev) {
> + dev_err(&spi->dev, "AX88796C SPI: Could not allocate ethernet device\n");
> + return -ENOMEM;
> + }
> +
> + ax_local = to_ax88796c_device(ndev);
> + memset(ax_local, 0, sizeof(*ax_local));
> +
> + dev_set_drvdata(&spi->dev, ax_local);
> + ax_local->spi = spi;
> + ax_local->ax_spi.spi = spi;
> +
> + ndev->irq = spi->irq;
> +
> + ax_local->msg_enable = msg_enable;
One space after '='.
> + if (ps_level > AX_PS_D2 || ps_level < 0)
> + ax_local->ps_level = 0;
> + else
> + ax_local->ps_level = ps_level;
> +
> + ax_local->capabilities |= comp ? AX_CAP_COMP : 0;
> +
> + if (netif_msg_probe(ax_local)) {
> + dev_info(&spi->dev, "AX88796C-SPI Configuration:\n");
> + dev_info(&spi->dev, " Compression : %s\n",
> + ax_local->capabilities & AX_CAP_COMP ? "ON" : "OFF");
> + dev_info(&spi->dev, " Power Saving Level: %d\n",
> + ax_local->ps_level);
> + }
> +
> + ndev->netdev_ops = &ax88796c_netdev_ops;
> + ndev->ethtool_ops = &ax88796c_ethtool_ops;
No spaces before '='.
> +
> + ax_local->ndev = ndev;
Set all priv-storing-pointers in one place, so next to dev_set_drvdata()
unless it is chosen by probe() flow on purpose.
> +
> + /* Initialize MII structure */
> + ax_local->mii.dev = ndev;
> + ax_local->mii.mdio_read = ax88796c_mdio_read;
> + ax_local->mii.mdio_write = ax88796c_mdio_write;
> + ax_local->mii.phy_id_mask = 0x3f;
> + ax_local->mii.reg_num_mask = 0x1f;
> + ax_local->mii.phy_id = 0x10;
> +
> + /* ax88796c gpio reset */
> + ax88796c_hard_reset(ax_local);
> +
> + /* Reset AX88796C */
> + ret = ax88796c_soft_reset(ax_local);
> + if (ret < 0) {
> + return -ENODEV;
> + }
No need for {}.
> +
> + /* Check board revision */
> + temp = AX_READ(&ax_local->ax_spi, P2_CRIR);
> + if ((temp & 0xF) != 0x0) {
> + dev_err(&spi->dev, "spi read failed: %d\n", temp);
> + return -ENODEV;
> + }
> +
> + temp = AX_READ(&ax_local->ax_spi, P0_BOR);
> + if (temp == 0x1234) {
> + ax_local->plat_endian = PLAT_LITTLE_ENDIAN;
> + } else {
> + AX_WRITE(&ax_local->ax_spi, 0xFFFF, P0_BOR);
> + ax_local->plat_endian = PLAT_BIG_ENDIAN;
> + }
> +
> + if (netif_msg_hw(ax_local)) {
> + dev_info(&spi->dev,
> + "Dump all MAC registers before initialization:\n");
> + ax88796c_dump_regs(ax_local);
> + ax88796c_dump_phy_regs(ax_local);
> + }
> +
> + /*Reload EEPROM*/
> + ax88796c_reload_eeprom(ax_local);
> +
> + ax88796c_load_mac_addr(ndev);
> +
> + if (netif_msg_probe(ax_local))
> + dev_info(&spi->dev,
> + "irq %d, MAC addr "
> + "%02X:%02X:%02X:%02X:%02X:%02X\n",
> + ndev->irq,
> + ndev->dev_addr[0], ndev->dev_addr[1],
> + ndev->dev_addr[2], ndev->dev_addr[3],
> + ndev->dev_addr[4], ndev->dev_addr[5]);
> +
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + INIT_WORK(&ax_local->ax_work, ax88796c_work);
> +
> + ax_local->ax_work_queue =
> + create_singlethread_workqueue("ax88796c_work");
> +
> + sema_init(&ax_local->spi_lock, 1);
> +
> + skb_queue_head_init(&ax_local->tx_wait_q);
> +
> + ndev->features |= NETIF_F_HW_CSUM;
> + ax_local->checksum = AX_RX_CHECKSUM | AX_TX_CHECKSUM;
> + ndev->hard_header_len += (TX_OVERHEAD + 4);
> +
> + ret = register_netdev(ndev);
> + if (!ret) {
> + if (netif_msg_probe(ax_local))
> + netdev_info(ndev, "%s %s registered\n",
> + dev_driver_string(&spi->dev),
> + dev_name(&spi->dev));
> + return ret;
> + }
That's unusual flow - exit on success early. Follow the kernel pattern
of "return 0" on success and jumps to common error handling like:
ret = register_netdev(ndev)
if (ret)
// handle error: maybe dev_err and goto
if (netif_msg_probe())
netdev_info();
return 0;
> +
> + dev_err(&spi->dev, "failed to register a network device\n");
> + destroy_workqueue(ax_local->ax_work_queue);
> +
> + return ret;
> +}
> +
> +static int
> +ax88796c_suspend(struct spi_device *spi, pm_message_t mesg)
> +{
> + struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
> + struct net_device *ndev = ax_local->ndev;
> + u8 power;
> +
> + if (!ndev || !netif_running(ndev))
> + return 0;
!ndev cannot happen (device should not be suspended before end of
probe). If it can, there is a bug which you should not silently ignore.
> +
> + netif_device_detach(ndev);
> +
> + netif_stop_queue(ndev);
> +
> + down(&ax_local->spi_lock);
> +
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
> + ax88796c_free_skb_queue(&ax_local->tx_wait_q);
> +
> + if (ax_local->wol) {
> +
> + AX_WRITE(&ax_local->ax_spi, 0, P5_WFTR);
> +
> + if (ax_local->wol & WFCR_LINKCH) { /* Link change */
> +
> + /* Disable wol power saving in link change mode */
> + AX_WRITE(&ax_local->ax_spi,
> + (AX_READ(&ax_local->ax_spi, P0_PSCR)
> + & ~PSCR_WOLPS), P0_PSCR);
> +
> + if (netif_msg_wol(ax_local))
> + netdev_info(ndev,
> + "Enable link change wakeup\n");
> +
> + AX_WRITE(&ax_local->ax_spi, WFTR_8192MS, P5_WFTR);
> + }
> + if (ax_local->wol & WFCR_MAGICP) { /* Magic packet */
> + if (netif_msg_wol(ax_local))
> + netdev_info(ndev,
> + "Enable magic packet wakeup\n");
> + }
> +
> + AX_WRITE(&ax_local->ax_spi,
> + ax_local->wol | WFCR_WAKEUP | WFCR_PMEEN, P0_WFCR);
> + }
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + up(&ax_local->spi_lock);
> +
> + return 0;
> +}
> +
> +static int
> +ax88796c_resume(struct spi_device *spi)
> +{
> + struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
> + struct net_device *ndev = ax_local->ndev;
> + u16 pme;
> +
> + down(&ax_local->spi_lock);
> +
> + /* Wakeup AX88796C first */
> + ax88796c_check_power_and_wake(ax_local);
> + msleep(200);
> +
> + pme = AX_READ(&ax_local->ax_spi, P0_WFCR);
> + if (ax_local->wol && ~(pme & WFCR_WAITEVENT)) {
> +
> + if (pme & WFCR_LINKCHS) {
> + if (netif_msg_wol(ax_local))
> + netdev_info(ndev,
> + "Wakeuped from link change.\n");
> + } else if (pme & WFCR_MAGICPS) {
> + if (netif_msg_wol(ax_local))
> + netdev_info(ndev,
> + "Wakeuped from magic packet.\n");
> + }
> +
> + AX_WRITE(&ax_local->ax_spi, WFCR_CLRWAKE, P0_WFCR);
> + }
> +
> + netif_device_attach(ndev);
> +
> + /* Initialize all the local variables*/
> + ax88796c_soft_reset(ax_local);
> +
> + ax_local->seq_num = 0x1f;
> +
> + ax88796c_set_mac_addr(ndev);
> + ax88796c_set_csums(ax_local);
> +
> + /* Disable stuffing packet */
> + AX_WRITE(&ax_local->ax_spi,
> + AX_READ(&ax_local->ax_spi, P1_RXBSPCR)
> + & ~RXBSPCR_STUF_ENABLE, P1_RXBSPCR);
> +
> + /* Enable RX packet process */
> + AX_WRITE(&ax_local->ax_spi, RPPER_RXEN, P1_RPPER);
> +
> + AX_WRITE(&ax_local->ax_spi,
> + AX_READ(&ax_local->ax_spi, P0_FER)
> + | FER_RXEN | FER_TXEN | FER_BSWAP, P0_FER);
> +
> + ax88796c_phy_init(ax_local);
> +
> + AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
> +
> + if (netif_msg_hw(ax_local)) {
> + netdev_info(ndev,
> + "Dump all MAC registers after initialization:\n");
> + ax88796c_dump_regs(ax_local);
> + ax88796c_dump_phy_regs(ax_local);
> + }
> +
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + netif_start_queue(ndev);
> +
> + up(&ax_local->spi_lock);
> +
> + return 0;
> +}
> +
> +static int ax88796c_remove(struct spi_device *spi)
> +{
> + struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
> + struct net_device *ndev = ax_local->ndev;
> +
> + if (netif_msg_probe(ax_local))
> + netdev_info(ndev, "removing network device %s %s\n",
> + dev_driver_string(&spi->dev),
> + dev_name(&spi->dev));
> +
> + destroy_workqueue(ax_local->ax_work_queue);
> +
> + unregister_netdev(ndev);
> +
> + if (netif_msg_probe(ax_local))
> + dev_info(&spi->dev, "device removed\n");
> +
> + return 0;
> +}
> +
> +#ifdef CONFIG_USE_OF
#ifdef should not be needed.
> +static const struct of_device_id ax88796c_dt_ids[] = {
> + { .compatible = "asix,ax88796c" },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, ax88796c_dt_ids);
> +#endif
> +
> +static const struct spi_device_id asix_id[] = {
> + { "ax88796c", 0 },
> + { }
> +};
> +MODULE_DEVICE_TABLE(spi, asix_id);
> +
> +static struct spi_driver ax88796c_spi_driver = {
> + .driver = {
> + .name = DRV_NAME,
> + .owner = THIS_MODULE,
No need for owner.
> +#ifdef CONFIG_USE_OF
> + .of_match_table = of_match_ptr(ax88796c_dt_ids),
> +#endif
No need for ifdef.
> + },
> + .probe = ax88796c_probe,
> + .remove = ax88796c_remove,
> +// .suspend = ax88796c_suspend,
> +// .resume = ax88796c_resume,
?
> + .id_table = asix_id,
> +};
> +
> +static __init int ax88796c_spi_init(void)
> +{
> + pr_info("Register AX88796C SPI Ethernet Driver.\n");
No, no printing of driver inits. It will bother everyone in the world.
This all should be just module driver, no init/exit.
> + return spi_register_driver(&ax88796c_spi_driver);
> +}
> +
> +static __exit void ax88796c_spi_exit(void)
> +{
> + spi_unregister_driver(&ax88796c_spi_driver);
> +}
> +
> +module_init(ax88796c_spi_init);
> +module_exit(ax88796c_spi_exit);
> diff --git a/drivers/net/ethernet/asix/ax88796c_main.h b/drivers/net/ethernet/asix/ax88796c_main.h
> new file mode 100644
> index 000000000000..6c61766b1788
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/ax88796c_main.h
> @@ -0,0 +1,596 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2010 ASIX Electronics Corporation
> + * Copyright (c) 2020 Samsung Electronics
> + *
> + * ASIX AX88796C SPI Fast Ethernet Linux driver
> + */
> +
> +#ifndef _AX88796C_MAIN_H
> +#define _AX88796C_MAIN_H
> +
> +#define pr_fmt(fmt) "ax88796c: " fmt
> +
> +/* INCLUDE FILE DECLARATIONS */
> +#ifdef CONFIG_USE_OF
No ifdef.
> +#include <linux/of.h>
> +#endif
> +#include <linux/crc32.h>
> +#include <linux/etherdevice.h>
> +#include <linux/ethtool.h>
> +#include <linux/gpio/consumer.h>
> +#include <linux/init.h>
> +#include <linux/io.h>
> +#include <linux/kmod.h>
> +#include <linux/mii.h>
> +#include <linux/module.h>
> +#include <linux/netdevice.h>
> +#include <linux/platform_device.h>
> +#include <linux/sched.h>
> +#include <linux/spi/spi.h>
> +#include <linux/timer.h>
> +#include <linux/uaccess.h>
> +#include <linux/usb.h>
> +#include <linux/version.h>
> +#include <linux/workqueue.h>
All of these should be removed except the headers used directly in this
header.
> +
> +#include <asm/dma.h>
> +
> +#include "ax88796c_spi.h"
> +
> +/* NAMING CONSTANT AND TYPE DECLARATIONS */
> +/* These identify the driver base version and may not be removed. */
> +#define DRV_NAME "ax88796c"
> +#define ADP_NAME "ASIX AX88796C SPI Ethernet Adapter"
> +#define DRV_VERSION "1.2.0"
> +
> +#define TX_QUEUE_HIGH_WATER 45 /* Tx queue high water mark */
> +#define TX_QUEUE_LOW_WATER 20 /* Tx queue low water mark */
> +
> +#define AX88796C_WATCHDOG_PERIOD (1 * HZ)
> +#define AX88796C_WATCHDOG_RESTART 7
> +
> +#define TX_OVERHEAD 8
> +#define TX_EOP_SIZE 4
> +
> +#define AX_MCAST_FILTER_SIZE 8
> +#define AX_MAX_MCAST 64
> +#define AX_MAX_CLK 80000000
> +#define TX_HDR_SOP_DICF 0x8000
> +#define TX_HDR_SOP_CPHI 0x4000
> +#define TX_HDR_SOP_INT 0x2000
> +#define TX_HDR_SOP_MDEQ 0x1000
> +#define TX_HDR_SOP_PKTLEN 0x07FF
> +#define TX_HDR_SOP_SEQNUM 0xF800
> +#define TX_HDR_SOP_PKTLENBAR 0x07FF
> +
> +#define TX_HDR_SEG_FS 0x8000
> +#define TX_HDR_SEG_LS 0x4000
> +#define TX_HDR_SEG_SEGNUM 0x3800
> +#define TX_HDR_SEG_SEGLEN 0x0700
> +#define TX_HDR_SEG_EOFST 0xC000
> +#define TX_HDR_SEG_SOFST 0x3800
> +#define TX_HDR_SEG_SEGLENBAR 0x07FF
> +
> +#define TX_HDR_EOP_SEQNUM 0xF800
> +#define TX_HDR_EOP_PKTLEN 0x07FF
> +#define TX_HDR_EOP_SEQNUMBAR 0xF800
> +#define TX_HDR_EOP_PKTLENBAR 0x07FF
> +
> +/* Rx header fields mask */
> +#define RX_HDR1_MCBC 0x8000
> +#define RX_HDR1_STUFF_PKT 0x4000
> +#define RX_HDR1_MII_ERR 0x2000
> +#define RX_HDR1_CRC_ERR 0x1000
> +#define RX_HDR1_PKT_LEN 0x07FF
> +
> +#define RX_HDR2_SEQ_NUM 0xF800
> +#define RX_HDR2_PKT_LEN_BAR 0x7FFF
> +
> +#define RX_HDR3_PE 0x8000
> +#define RX_HDR3_L4_TYPE_TCP 0x1000
> +#define RX_HDR3_L4_TYPE_UDP 0x0400
> +#define RX_HDR3_L3_ERR 0x0200
> +#define RX_HDR3_L4_ERR 0x0100
> +#define RX_HDR3_PRIORITY(x) ((x) << 4)
> +#define RX_HDR3_STRIP 0x0008
> +#define RX_HDR3_VLAN_ID 0x0007
> +
> +#define AX_RX_CHECKSUM 1
> +#define AX_TX_CHECKSUM 2
> +
> +enum watchdog_state {
> + chk_link = 0,
> + chk_cable,
> + ax_nop,
> +};
> +
> +struct ax88796c_device {
> +
> + struct resource *addr_res; /* resources found */
> + struct resource *addr_req; /* resources requested */
> + struct resource *irq_res;
> +
> + struct spi_device *spi;
> + struct net_device *ndev;
> + struct mii_if_info mii;
> + struct net_device_stats stats;
> +
> + struct timer_list watchdog;
> + enum watchdog_state w_state;
> + size_t w_ticks;
> +
> + struct work_struct ax_work;
> + struct workqueue_struct *ax_work_queue;
> + struct tasklet_struct bh;
> +
> + struct semaphore spi_lock;
> +
> + struct sk_buff_head tx_wait_q;
> +
> + struct axspi_data ax_spi;
> +
> + int msg_enable;
> +
> + u16 seq_num;
> +
> + u16 wol;
> +
> + u8 checksum;
> +
> + u8 multi_filter[AX_MCAST_FILTER_SIZE];
> +
> + unsigned long capabilities;
> + #define AX_CAP_DMA 1
> + #define AX_CAP_COMP 2
> + #define AX_CAP_BIDIR 4
> +
> + u8 plat_endian;
> + #define PLAT_LITTLE_ENDIAN 0
> + #define PLAT_BIG_ENDIAN 1
> +
> + unsigned long flags;
> + #define EVENT_INTR 1
> + #define EVENT_TX 2
> + #define EVENT_SET_MULTI 4
> + #define EVENT_WATCHDOG 8
> +
> + u8 ps_level;
> + #define AX_PS_D0 0
> + #define AX_PS_D1 1
> + #define AX_PS_D2 2
> +
> +
> +};
> +
> +#define to_ax88796c_device(ndev) ((struct ax88796c_device *)netdev_priv(ndev))
> +
> +enum skb_state {
> + illegal = 0,
> + tx_done,
> + rx_done,
> + rx_err,
> +};
> +
> +struct skb_data;
> +
> +struct skb_data {
> + enum skb_state state;
> + struct net_device *ndev;
> + struct sk_buff *skb;
> + size_t len;
> + dma_addr_t phy_addr;
> +};
> +
> +/* A88796C register definition */
> + /* Definition of PAGE0 */
> +#define P0_PSR (0x00)
> + #define PSR_DEV_READY (1 << 7)
> + #define PSR_RESET (0 << 15)
> + #define PSR_RESET_CLR (1 << 15)
> +#define P0_BOR (0x02)
> +#define P0_FER (0x04)
> + #define FER_IPALM (1 << 0)
> + #define FER_DCRC (1 << 1)
> + #define FER_RH3M (1 << 2)
> + #define FER_HEADERSWAP (1 << 7)
> + #define FER_WSWAP (1 << 8)
> + #define FER_BSWAP (1 << 9)
> + #define FER_INTHI (1 << 10)
> + #define FER_INTLO (0 << 10)
> + #define FER_IRQ_PULL (1 << 11)
> + #define FER_RXEN (1 << 14)
> + #define FER_TXEN (1 << 15)
> +#define P0_ISR (0x06)
> + #define ISR_RXPKT (1 << 0)
> + #define ISR_MDQ (1 << 4)
> + #define ISR_TXT (1 << 5)
> + #define ISR_TXPAGES (1 << 6)
> + #define ISR_TXERR (1 << 8)
> + #define ISR_LINK (1 << 9)
> +#define P0_IMR (0x08)
> + #define IMR_RXPKT (1 << 0)
> + #define IMR_MDQ (1 << 4)
> + #define IMR_TXT (1 << 5)
> + #define IMR_TXPAGES (1 << 6)
> + #define IMR_TXERR (1 << 8)
> + #define IMR_LINK (1 << 9)
> + #define IMR_MASKALL (0xFFFF)
> + #define IMR_DEFAULT (IMR_TXERR)
> +#define P0_WFCR (0x0A)
> + #define WFCR_PMEIND (1 << 0) /* PME indication */
> + #define WFCR_PMETYPE (1 << 1) /* PME I/O type */
> + #define WFCR_PMEPOL (1 << 2) /* PME polarity */
> + #define WFCR_PMERST (1 << 3) /* Reset PME */
> + #define WFCR_SLEEP (1 << 4) /* Enable sleep mode */
> + #define WFCR_WAKEUP (1 << 5) /* Enable wakeup mode */
> + #define WFCR_WAITEVENT (1 << 6) /* Reserved */
> + #define WFCR_CLRWAKE (1 << 7) /* Clear wakeup */
> + #define WFCR_LINKCH (1 << 8) /* Enable link change */
> + #define WFCR_MAGICP (1 << 9) /* Enable magic packet */
> + #define WFCR_WAKEF (1 << 10) /* Enable wakeup frame */
> + #define WFCR_PMEEN (1 << 11) /* Enable PME pin */
> + #define WFCR_LINKCHS (1 << 12) /* Link change status */
> + #define WFCR_MAGICPS (1 << 13) /* Magic packet status */
> + #define WFCR_WAKEFS (1 << 14) /* Wakeup frame status */
> + #define WFCR_PMES (1 << 15) /* PME pin status */
> +#define P0_PSCR (0x0C)
> + #define PSCR_PS_MASK (0xFFF0)
> + #define PSCR_PS_D0 (0)
> + #define PSCR_PS_D1 (1 << 0)
> + #define PSCR_PS_D2 (1 << 1)
> + #define PSCR_FPS (1 << 3) /* Enable fiber mode PS */
> + #define PSCR_SWPS (1 << 4) /* Enable software */
> + /* PS control */
> + #define PSCR_WOLPS (1 << 5) /* Enable WOL PS */
> + #define PSCR_SWWOL (1 << 6) /* Enable software select */
> + /* WOL PS */
> + #define PSCR_PHYOSC (1 << 7) /* Internal PHY OSC control */
> + #define PSCR_FOFEF (1 << 8) /* Force PHY generate FEF */
> + #define PSCR_FOF (1 << 9) /* Force PHY in fiber mode */
> + #define PSCR_PHYPD (1 << 10) /* PHY power down. */
> + /* Active high */
> + #define PSCR_PHYRST (1 << 11) /* PHY reset signal. */
> + /* Active low */
> + #define PSCR_PHYCSIL (1 << 12) /* PHY cable energy detect */
> + #define PSCR_PHYCOFF (1 << 13) /* PHY cable off */
> + #define PSCR_PHYLINK (1 << 14) /* PHY link status */
> + #define PSCR_EEPOK (1 << 15) /* EEPROM load complete */
> +#define P0_MACCR (0x0E)
> + #define MACCR_RXFC_ENABLE (1 << 3)
> + #define MACCR_RXFC_MASK 0xFFF7
> + #define MACCR_TXFC_ENABLE (1 << 4)
> + #define MACCR_TXFC_MASK 0xFFEF
> + #define MACCR_PF (1 << 7)
> + #define MACCR_PMM_BITS 8
> + #define MACCR_PMM_MASK (0x1F00)
> + #define MACCR_PMM_RESET (1 << 8)
> + #define MACCR_PMM_WAIT (2 << 8)
> + #define MACCR_PMM_READY (3 << 8)
> + #define MACCR_PMM_D1 (4 << 8)
> + #define MACCR_PMM_D2 (5 << 8)
> + #define MACCR_PMM_WAKE (7 << 8)
> + #define MACCR_PMM_D1_WAKE (8 << 8)
> + #define MACCR_PMM_D2_WAKE (9 << 8)
> + #define MACCR_PMM_SLEEP (10 << 8)
> + #define MACCR_PMM_PHY_RESET (11 << 8)
> + #define MACCR_PMM_SOFT_D1 (16 << 8)
> + #define MACCR_PMM_SOFT_D2 (17 << 8)
> +#define P0_TFBFCR (0x10)
> + #define TFBFCR_SCHE_FREE_PAGE 0xE07F
> + #define TFBFCR_FREE_PAGE_BITS 0x07
> + #define TFBFCR_FREE_PAGE_LATCH (1 << 6)
> + #define TFBFCR_SET_FREE_PAGE(x) ((x & 0x3F) << TFBFCR_FREE_PAGE_BITS)
> + #define TFBFCR_TX_PAGE_SET (1 << 13)
> + #define TFBFCR_MANU_ENTX (1 << 15)
> + #define TX_FREEBUF_MASK 0x003F
> + #define TX_DPTSTART 0x4000
> +
> +#define P0_TSNR (0x12)
> + #define TXNR_TXB_ERR (1 << 5)
> + #define TXNR_TXB_IDLE (1 << 6)
> + #define TSNR_PKT_CNT(x) (((x) & 0x3F) << 8)
> + #define TXNR_TXB_REINIT (1 << 14)
> + #define TSNR_TXB_START (1 << 15)
> +#define P0_RTDPR (0x14)
> +#define P0_RXBCR1 (0x16)
> + #define RXBCR1_RXB_DISCARD (1 << 14)
> + #define RXBCR1_RXB_START (1 << 15)
> +#define P0_RXBCR2 (0x18)
> + #define RXBCR2_PKT_MASK (0xFF)
> + #define RXBCR2_RXPC_MASK (0x7F)
> + #define RXBCR2_RXB_READY (1 << 13)
> + #define RXBCR2_RXB_IDLE (1 << 14)
> + #define RXBCR2_RXB_REINIT (1 << 15)
> +#define P0_RTWCR (0x1A)
> + #define RTWCR_RXWC_MASK (0x3FFF)
> + #define RTWCR_RX_LATCH (1 << 15)
> +#define P0_RCPHR (0x1C)
> +
> + /* Definition of PAGE1 */
> +#define P1_RPPER (0x22)
> + #define RPPER_RXEN (1 << 0)
> +#define P1_MRCR (0x28)
> +#define P1_MDR (0x2A)
> +#define P1_RMPR (0x2C)
> +#define P1_TMPR (0x2E)
> +#define P1_RXBSPCR (0x30)
> + #define RXBSPCR_STUF_WORD_CNT(x) (((x) & 0x7000) >> 12)
> + #define RXBSPCR_STUF_ENABLE (1 << 15)
> +#define P1_MCR (0x32)
> + #define MCR_SBP (1 << 8)
> + #define MCR_SM (1 << 9)
> + #define MCR_CRCENLAN (1 << 11)
> + #define MCR_STP (1 << 12)
> + /* Definition of PAGE2 */
> +#define P2_CIR (0x42)
> +#define P2_POOLCR (0x44)
> + #define POOLCR_POLL_EN (1 << 0)
> + #define POOLCR_POLL_FLOWCTRL (1 << 1)
> + #define POOLCR_POLL_BMCR (1 << 2)
> + #define POOLCR_PHYID(x) ((x) << 8)
> +#define P2_PHYSR (0x46)
> +#define P2_MDIODR (0x48)
> +#define P2_MDIOCR (0x4A)
> + #define MDIOCR_RADDR(x) ((x) & 0x1F)
> + #define MDIOCR_FADDR(x) (((x) & 0x1F) << 8)
> + #define MDIOCR_VALID (1 << 13)
> + #define MDIOCR_READ (1 << 14)
> + #define MDIOCR_WRITE (1 << 15)
> +#define P2_LCR0 (0x4C)
> + #define LCR_LED0_EN (1 << 0)
> + #define LCR_LED0_100MODE (1 << 1)
> + #define LCR_LED0_DUPLEX (1 << 2)
> + #define LCR_LED0_LINK (1 << 3)
> + #define LCR_LED0_ACT (1 << 4)
> + #define LCR_LED0_COL (1 << 5)
> + #define LCR_LED0_10MODE (1 << 6)
> + #define LCR_LED0_DUPCOL (1 << 7)
> + #define LCR_LED1_EN (1 << 8)
> + #define LCR_LED1_100MODE (1 << 9)
> + #define LCR_LED1_DUPLEX (1 << 10)
> + #define LCR_LED1_LINK (1 << 11)
> + #define LCR_LED1_ACT (1 << 12)
> + #define LCR_LED1_COL (1 << 13)
> + #define LCR_LED1_10MODE (1 << 14)
> + #define LCR_LED1_DUPCOL (1 << 15)
> +#define P2_LCR1 (0x4E)
> + #define LCR_LED2_MASK (0xFF00)
> + #define LCR_LED2_EN (1 << 0)
> + #define LCR_LED2_100MODE (1 << 1)
> + #define LCR_LED2_DUPLEX (1 << 2)
> + #define LCR_LED2_LINK (1 << 3)
> + #define LCR_LED2_ACT (1 << 4)
> + #define LCR_LED2_COL (1 << 5)
> + #define LCR_LED2_10MODE (1 << 6)
> + #define LCR_LED2_DUPCOL (1 << 7)
> +#define P2_IPGCR (0x50)
> +#define P2_CRIR (0x52)
> +#define P2_FLHWCR (0x54)
> +#define P2_RXCR (0x56)
> + #define RXCR_PRO (1 << 0)
> + #define RXCR_AMALL (1 << 1)
> + #define RXCR_SEP (1 << 2)
> + #define RXCR_AB (1 << 3)
> + #define RXCR_AM (1 << 4)
> + #define RXCR_AP (1 << 5)
> + #define RXCR_ARP (1 << 6)
> +#define P2_JLCR (0x58)
> +#define P2_MPLR (0x5C)
> +
> + /* Definition of PAGE3 */
> +#define P3_MACASR0 (0x62)
> + #define P3_MACASR(x) (P3_MACASR0 + 2*x)
> + #define MACASR_LOWBYTE_MASK 0x00FF
> + #define MACASR_HIGH_BITS 0x08
> +#define P3_MACASR1 (0x64)
> +#define P3_MACASR2 (0x66)
> +#define P3_MFAR01 (0x68)
> +#define P3_MFAR_BASE (0x68)
> + #define P3_MFAR(x) (P3_MFAR_BASE + 2*x)
> +
> +#define P3_MFAR23 (0x6A)
> +#define P3_MFAR45 (0x6C)
> +#define P3_MFAR67 (0x6E)
> +#define P3_VID0FR (0x70)
> +#define P3_VID1FR (0x72)
> +#define P3_EECSR (0x74)
> +#define P3_EEDR (0x76)
> +#define P3_EECR (0x78)
> + #define EECR_ADDR_MASK (0x00FF)
> + #define EECR_READ_ACT (1 << 8)
> + #define EECR_WRITE_ACT (1 << 9)
> + #define EECR_WRITE_DISABLE (1 << 10)
> + #define EECR_WRITE_ENABLE (1 << 11)
> + #define EECR_EE_READY (1 << 13)
> + #define EECR_RELOAD (1 << 14)
> + #define EECR_RESET (1 << 15)
> +#define P3_TPCR (0x7A)
> + #define TPCR_PATT_MASK (0xFF)
> + #define TPCR_RAND_PKT_EN (1 << 14)
> + #define TPCR_FIXED_PKT_EN (1 << 15)
> +#define P3_TPLR (0x7C)
> + /* Definition of PAGE4 */
> +#define P4_SPICR (0x8A)
> + #define SPICR_RCEN (1 << 0)
> + #define SPICR_QCEN (1 << 1)
> + #define SPICR_RBRE (1 << 3)
> + #define SPICR_PMM (1 << 4)
> + #define SPICR_LOOPBACK (1 << 8)
> + #define SPICR_CORE_RES_CLR (1 << 10)
> + #define SPICR_SPI_RES_CLR (1 << 11)
> +#define P4_SPIISMR (0x8C)
> +
> +#define P4_COERCR0 (0x92)
> + #define COERCR0_RXIPCE (1 << 0)
> + #define COERCR0_RXIPVE (1 << 1)
> + #define COERCR0_RXV6PE (1 << 2)
> + #define COERCR0_RXTCPE (1 << 3)
> + #define COERCR0_RXUDPE (1 << 4)
> + #define COERCR0_RXICMP (1 << 5)
> + #define COERCR0_RXIGMP (1 << 6)
> + #define COERCR0_RXICV6 (1 << 7)
> +
> + #define COERCR0_RXTCPV6 (1 << 8)
> + #define COERCR0_RXUDPV6 (1 << 9)
> + #define COERCR0_RXICMV6 (1 << 10)
> + #define COERCR0_RXIGMV6 (1 << 11)
> + #define COERCR0_RXICV6V6 (1 << 12)
> +
> + #define COERCR0_DEFAULT (COERCR0_RXIPCE | COERCR0_RXV6PE | \
> + COERCR0_RXTCPE | COERCR0_RXUDPE | \
> + COERCR0_RXTCPV6 | COERCR0_RXUDPV6)
> +#define P4_COERCR1 (0x94)
> + #define COERCR1_IPCEDP (1 << 0)
> + #define COERCR1_IPVEDP (1 << 1)
> + #define COERCR1_V6VEDP (1 << 2)
> + #define COERCR1_TCPEDP (1 << 3)
> + #define COERCR1_UDPEDP (1 << 4)
> + #define COERCR1_ICMPDP (1 << 5)
> + #define COERCR1_IGMPDP (1 << 6)
> + #define COERCR1_ICV6DP (1 << 7)
> + #define COERCR1_RX64TE (1 << 8)
> + #define COERCR1_RXPPPE (1 << 9)
> + #define COERCR1_TCP6DP (1 << 10)
> + #define COERCR1_UDP6DP (1 << 11)
> + #define COERCR1_IC6DP (1 << 12)
> + #define COERCR1_IG6DP (1 << 13)
> + #define COERCR1_ICV66DP (1 << 14)
> + #define COERCR1_RPCE (1 << 15)
> +
> + #define COERCR1_DEFAULT (COERCR1_RXPPPE)
> +#define P4_COETCR0 (0x96)
> + #define COETCR0_TXIP (1 << 0)
> + #define COETCR0_TXTCP (1 << 1)
> + #define COETCR0_TXUDP (1 << 2)
> + #define COETCR0_TXICMP (1 << 3)
> + #define COETCR0_TXIGMP (1 << 4)
> + #define COETCR0_TXICV6 (1 << 5)
> + #define COETCR0_TXTCPV6 (1 << 8)
> + #define COETCR0_TXUDPV6 (1 << 9)
> + #define COETCR0_TXICMV6 (1 << 10)
> + #define COETCR0_TXIGMV6 (1 << 11)
> + #define COETCR0_TXICV6V6 (1 << 12)
> +
> + #define COETCR0_DEFAULT (COETCR0_TXIP | COETCR0_TXTCP | \
> + COETCR0_TXUDP | COETCR0_TXTCPV6 | \
> + COETCR0_TXUDPV6)
> +#define P4_COETCR1 (0x98)
> + #define COETCR1_TX64TE (1 << 0)
> + #define COETCR1_TXPPPE (1 << 1)
> +
> +#define P4_COECEDR (0x9A)
> +#define P4_L2CECR (0x9C)
> +
> + /* Definition of PAGE5 */
> +#define P5_WFTR (0xA2)
> + #define WFTR_2MS (0x01)
> + #define WFTR_4MS (0x02)
> + #define WFTR_8MS (0x03)
> + #define WFTR_16MS (0x04)
> + #define WFTR_32MS (0x05)
> + #define WFTR_64MS (0x06)
> + #define WFTR_128MS (0x07)
> + #define WFTR_256MS (0x08)
> + #define WFTR_512MS (0x09)
> + #define WFTR_1024MS (0x0A)
> + #define WFTR_2048MS (0x0B)
> + #define WFTR_4096MS (0x0C)
> + #define WFTR_8192MS (0x0D)
> + #define WFTR_16384MS (0x0E)
> + #define WFTR_32768MS (0x0F)
> +#define P5_WFCCR (0xA4)
> +#define P5_WFCR03 (0xA6)
> + #define WFCR03_F0_EN (1 << 0)
> + #define WFCR03_F1_EN (1 << 4)
> + #define WFCR03_F2_EN (1 << 8)
> + #define WFCR03_F3_EN (1 << 12)
> +#define P5_WFCR47 (0xA8)
> + #define WFCR47_F4_EN (1 << 0)
> + #define WFCR47_F5_EN (1 << 4)
> + #define WFCR47_F6_EN (1 << 8)
> + #define WFCR47_F7_EN (1 << 12)
> +#define P5_WF0BMR0 (0xAA)
> +#define P5_WF0BMR1 (0xAC)
> +#define P5_WF0CR (0xAE)
> +#define P5_WF0OBR (0xB0)
> +#define P5_WF1BMR0 (0xB2)
> +#define P5_WF1BMR1 (0xB4)
> +#define P5_WF1CR (0xB6)
> +#define P5_WF1OBR (0xB8)
> +#define P5_WF2BMR0 (0xBA)
> +#define P5_WF2BMR1 (0xBC)
> +
> + /* Definition of PAGE6 */
> +#define P6_WF2CR (0xC2)
> +#define P6_WF2OBR (0xC4)
> +#define P6_WF3BMR0 (0xC6)
> +#define P6_WF3BMR1 (0xC8)
> +#define P6_WF3CR (0xCA)
> +#define P6_WF3OBR (0xCC)
> +#define P6_WF4BMR0 (0xCE)
> +#define P6_WF4BMR1 (0xD0)
> +#define P6_WF4CR (0xD2)
> +#define P6_WF4OBR (0xD4)
> +#define P6_WF5BMR0 (0xD6)
> +#define P6_WF5BMR1 (0xD8)
> +#define P6_WF5CR (0xDA)
> +#define P6_WF5OBR (0xDC)
> +
> +/* Definition of PAGE7 */
> +#define P7_WF6BMR0 (0xE2)
> +#define P7_WF6BMR1 (0xE4)
> +#define P7_WF6CR (0xE6)
> +#define P7_WF6OBR (0xE8)
> +#define P7_WF7BMR0 (0xEA)
> +#define P7_WF7BMR1 (0xEC)
> +#define P7_WF7CR (0xEE)
> +#define P7_WF7OBR (0xF0)
> +#define P7_WFR01 (0xF2)
> +#define P7_WFR23 (0xF4)
> +#define P7_WFR45 (0xF6)
> +#define P7_WFR67 (0xF8)
> +#define P7_WFPC0 (0xFA)
> +#define P7_WFPC1 (0xFC)
> +
> +
> +/* Tx headers structure */
> +struct tx_sop_header {
> + /* bit 15-11: flags, bit 10-0: packet length */
> + u16 flags_len;
> + /* bit 15-11: sequence number, bit 11-0: packet length bar */
> + u16 seq_lenbar;
> +} __packed;
> +
> +struct tx_segment_header {
> + /* bit 15-14: flags, bit 13-11: segment number */
> + /* bit 10-0: segment length */
> + u16 flags_seqnum_seglen;
> + /* bit 15-14: end offset, bit 13-11: start offset */
> + /* bit 10-0: segment length bar */
> + u16 eo_so_seglenbar;
> +} __packed;
> +
> +struct tx_eop_header {
> + /* bit 15-11: sequence number, bit 10-0: packet length */
> + u16 seq_len;
> + /* bit 15-11: sequence number bar, bit 10-0: packet length bar */
> + u16 seqbar_lenbar;
> +} __packed;
> +
> +struct tx_pkt_info {
> + struct tx_sop_header sop;
> + struct tx_segment_header seg;
> + struct tx_eop_header eop;
> + u16 pkt_len;
> + u16 seq_num;
> +} __packed;
> +
> +/* Rx headers structure */
> +struct rx_header {
> + u16 flags_len;
> + u16 seq_lenbar;
> + u16 flags;
> +} __packed;
> +
> +#endif /* #ifndef _AX88796C_MAIN_H */
> diff --git a/drivers/net/ethernet/asix/ax88796c_spi.c b/drivers/net/ethernet/asix/ax88796c_spi.c
> new file mode 100644
> index 000000000000..5304eb33aad2
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/ax88796c_spi.c
> @@ -0,0 +1,103 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2010 ASIX Electronics Corporation
> + *
> + * ASIX AX88796C SPI Fast Ethernet Linux driver
> + */
> +
> +#include "ax88796c_main.h"
> +#include "ax88796c_spi.h"
> +
> +/* driver bus management functions */
> +void axspi_wakeup(struct axspi_data *ax_spi)
> +{
> + u8 tx_buf;
> + int ret;
> +
> + tx_buf = AX_SPICMD_EXIT_PWD; /* OP */
> + ret = spi_write(ax_spi->spi, &tx_buf, 1);
> + if (ret)
> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
> +}
> +
> +void axspi_read_status(struct axspi_data *ax_spi, struct spi_status *status)
> +{
> + u8 tx_buf;
> + int ret;
> +
> + /* OP */
> + tx_buf = AX_SPICMD_READ_STATUS;
> + ret = spi_write_then_read(ax_spi->spi, &tx_buf, 1, (u8 *)&status, 3);
> + if (ret)
> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
> + else
> + le16_to_cpus(&status->isr);
> +}
> +
> +int axspi_read_rxq(struct axspi_data *ax_spi, void *data, int len)
> +{
> + struct spi_transfer *xfer = ax_spi->spi_rx_xfer;
> + int ret;
> +
> + memcpy(ax_spi->cmd_buf, rx_cmd_buf, 5);
> +
> + xfer->tx_buf = ax_spi->cmd_buf;
> + xfer->rx_buf = NULL;
> + xfer->len = ax_spi->comp ? 2 : 5;
> + xfer->bits_per_word = 8;
> + spi_message_add_tail(xfer, &ax_spi->rx_msg);
> +
> + xfer++;
> + xfer->rx_buf = data;
> + xfer->tx_buf = NULL;
> + xfer->len = len;
> + xfer->bits_per_word = 8;
> + spi_message_add_tail(xfer, &ax_spi->rx_msg);
> + ret = spi_sync(ax_spi->spi, &ax_spi->rx_msg);
> + if (ret)
> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
> +
> + return ret;
> +}
> +
> +int axspi_write_txq(struct axspi_data *ax_spi, void *data, int len)
> +{
> + return spi_write(ax_spi->spi, data, len);
> +}
> +
> +u16 axspi_read_reg(struct axspi_data *ax_spi, u8 reg)
> +{
> + u8 tx_buf[4];
> + u16 rx_buf = 0;
> + int ret;
> + int len = ax_spi->comp ? 3 : 4;
> +
> + tx_buf[0] = 0x03; /* OP code read register */
> + tx_buf[1] = reg; /* register address */
> + tx_buf[2] = 0xFF; /* dumy cycle */
> + tx_buf[3] = 0xFF; /* dumy cycle */
> + ret = spi_write_then_read(ax_spi->spi, tx_buf, len, (u8 *)&rx_buf, 2);
> + if (ret)
> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
> + else
> + le16_to_cpus(&rx_buf);
> +
> + return rx_buf;
> +}
> +
> +void axspi_write_reg(struct axspi_data *ax_spi, u8 reg, u16 value)
> +{
> + u8 tx_buf[4];
> + int ret;
> +
> + tx_buf[0] = AX_SPICMD_WRITE_REG; /* OP code read register */
> + tx_buf[1] = reg; /* register address */
> + tx_buf[2] = value;
> + tx_buf[3] = value >> 8;
> +
> + ret = spi_write(ax_spi->spi, tx_buf, 4);
> + if (ret)
> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
> +
Run the checkpatch string and fix almost all issues (except ones you
disagree).
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-25 18:44 ` Krzysztof Kozlowski
0 siblings, 0 replies; 57+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-25 18:44 UTC (permalink / raw)
To: Łukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Rob Herring, linux-kernel, Kukjin Kim, Jakub Kicinski,
David S. Miller, linux-arm-kernel, m.szyprowski
On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> ASIX AX88796[1] is a versatile ethernet adapter chip, that can be
> connected to a CPU with a 8/16-bit bus or with an SPI. This driver
> supports SPI connection.
>
> The driver has been ported from the vendor kernel for ARTIK5[2]
> boards. Several changes were made to adapt it to the current kernel
> which include:
>
> + updated DT configuration,
> + clock configuration moved to DT,
> + new timer, ethtool and gpio APIs
> + dev_* instead of pr_* and custom printk() wrappers.
>
> [1] https://www.asix.com.tw/products.php?op=pItemdetail&PItemID=104;65;86&PLine=65
> [2] https://git.tizen.org/cgit/profile/common/platform/kernel/linux-3.10-artik/
>
> The other ax88796 driver is for NE2000 compatible AX88796L chip. These
> chips are not compatible. Hence, two separate drivers are required.
Hi,
Thanks for the driver, nice work. Few comments below.
>
> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> ---
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/asix/Kconfig | 20 +
> drivers/net/ethernet/asix/Makefile | 6 +
> drivers/net/ethernet/asix/ax88796c_ioctl.c | 293 +++++
> drivers/net/ethernet/asix/ax88796c_ioctl.h | 21 +
> drivers/net/ethernet/asix/ax88796c_main.c | 1373 ++++++++++++++++++++
> drivers/net/ethernet/asix/ax88796c_main.h | 596 +++++++++
> drivers/net/ethernet/asix/ax88796c_spi.c | 103 ++
> drivers/net/ethernet/asix/ax88796c_spi.h | 67 +
> 10 files changed, 2481 insertions(+)
> create mode 100644 drivers/net/ethernet/asix/Kconfig
> create mode 100644 drivers/net/ethernet/asix/Makefile
> create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.c
> create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.h
> create mode 100644 drivers/net/ethernet/asix/ax88796c_main.c
> create mode 100644 drivers/net/ethernet/asix/ax88796c_main.h
> create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.c
> create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.h
>
> diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
> index de50e8b9e656..f3b218e45ea5 100644
> --- a/drivers/net/ethernet/Kconfig
> +++ b/drivers/net/ethernet/Kconfig
> @@ -32,6 +32,7 @@ source "drivers/net/ethernet/apm/Kconfig"
> source "drivers/net/ethernet/apple/Kconfig"
> source "drivers/net/ethernet/aquantia/Kconfig"
> source "drivers/net/ethernet/arc/Kconfig"
> +source "drivers/net/ethernet/asix/Kconfig"
> source "drivers/net/ethernet/atheros/Kconfig"
> source "drivers/net/ethernet/aurora/Kconfig"
> source "drivers/net/ethernet/broadcom/Kconfig"
> diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
> index f8f38dcb5f8a..9eb368d93607 100644
> --- a/drivers/net/ethernet/Makefile
> +++ b/drivers/net/ethernet/Makefile
> @@ -18,6 +18,7 @@ obj-$(CONFIG_NET_XGENE) += apm/
> obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
> obj-$(CONFIG_NET_VENDOR_AQUANTIA) += aquantia/
> obj-$(CONFIG_NET_VENDOR_ARC) += arc/
> +obj-$(CONFIG_NET_VENDOR_ASIX) += asix/
> obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
> obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/
> obj-$(CONFIG_NET_VENDOR_CADENCE) += cadence/
> diff --git a/drivers/net/ethernet/asix/Kconfig b/drivers/net/ethernet/asix/Kconfig
> new file mode 100644
> index 000000000000..4b127a4a659a
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/Kconfig
> @@ -0,0 +1,20 @@
> +#
> +# Asix network device configuration
> +#
> +
> +config NET_VENDOR_ASIX
> + bool "Asix devices"
> + depends on SPI
> + help
> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
Looks like too long, did it pass checkpatch?
> +
> +if NET_VENDOR_ASIX
> +
> +config SPI_AX88796C
> + tristate "Asix AX88796C-SPI support"
> + depends on SPI
> + depends on GPIOLIB
> + help
> + Say Y here if you intend to attach a Asix AX88796C as SPI mode
> +
> +endif # NET_VENDOR_ASIX
> diff --git a/drivers/net/ethernet/asix/Makefile b/drivers/net/ethernet/asix/Makefile
> new file mode 100644
> index 000000000000..0bfbbb042634
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/Makefile
> @@ -0,0 +1,6 @@
> +#
> +# Makefile for the Asix network device drivers.
> +#
> +
> +obj-$(CONFIG_SPI_AX88796C) += ax88796c.o
> +ax88796c-y := ax88796c_main.o ax88796c_ioctl.o ax88796c_spi.o
> diff --git a/drivers/net/ethernet/asix/ax88796c_ioctl.c b/drivers/net/ethernet/asix/ax88796c_ioctl.c
> new file mode 100644
> index 000000000000..eba361e2a8b7
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
> @@ -0,0 +1,293 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2010 ASIX Electronics Corporation
> + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
> + *
> + * ASIX AX88796C SPI Fast Ethernet Linux driver
> + */
> +
> +#include "ax88796c_main.h"
> +#include "ax88796c_spi.h"
> +#include "ax88796c_ioctl.h"
> +
> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
Looks here like pointer to const. Unless it is because of
AX_READ_STATUS() which cannot take const?
> +{
Please put file-scope definitions first, so this should go to the end.
> + struct spi_status ax_status;
> +
> + /* Check media link status first */
> + if (netif_carrier_ok(ax_local->ndev) ||
> + (ax_local->ps_level == AX_PS_D0) ||
> + (ax_local->ps_level == AX_PS_D1)) {
> + return 0;
> + }
> +
> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> + if (!(ax_status.status & AX_STATUS_READY))
This looks buggy... AX_READ_STATUS can fail, without reporting an error.
There is no error handling. What will be the value of ax_status? Sure,
some stack-protector-GCC-plugins might initialize it to 0, but that's
not a good design.
There is no error handling of all SPI functions so entire driver works
because of luck... if there is any error in the middle of some work, it
won't spot it.
> + return 1;
> +
> + return 0;
> +}
> +
> +u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local)
> +{
> + struct spi_status ax_status;
> + unsigned long start_time;
> +
> + /* Check media link status first */
> + if (netif_carrier_ok(ax_local->ndev) ||
> + (ax_local->ps_level == AX_PS_D0) ||
> + (ax_local->ps_level == AX_PS_D1)) {
> + return 0;
> + }
> +
> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> + if (!(ax_status.status & AX_STATUS_READY)) {
> +
> + /* AX88796C in power saving mode */
> + AX_WAKEUP(&ax_local->ax_spi);
> +
> + /* Check status */
> + start_time = jiffies;
> + do {
> + if (time_after(jiffies, start_time + HZ/2)) {
> + netdev_err(ax_local->ndev,
> + "timeout waiting for wakeup"
> + " from power saving\n");
> + break;
> + }
> +
> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
> +
> + } while (!(ax_status.status & AX_STATUS_READY));
> +
> + ax88796c_set_power_saving(ax_local, AX_PS_D0);
> +
> + return 1;
> + }
> +
> + return 0;
> +}
> +
> +void ax88796c_set_power_saving(struct ax88796c_device *ax_local, u8 ps_level)
> +{
> + u16 pmm;
> +
> + if (ps_level == AX_PS_D1)
> + pmm = PSCR_PS_D1;
> + else if (ps_level == AX_PS_D2)
> + pmm = PSCR_PS_D2;
> + else
> + pmm = PSCR_PS_D0;
> +
> + AX_WRITE(&ax_local->ax_spi, (AX_READ(&ax_local->ax_spi, P0_PSCR)
> + & PSCR_PS_MASK) | pmm, P0_PSCR);
> +}
> +
> +int ax88796c_mdio_read(struct net_device *ndev, int phy_id, int loc)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + unsigned long start_time;
> +
> + AX_WRITE(&ax_local->ax_spi, MDIOCR_RADDR(loc)
> + | MDIOCR_FADDR(phy_id) | MDIOCR_READ, P2_MDIOCR);
> +
> + start_time = jiffies;
> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
> + if (time_after(jiffies, start_time + HZ/100))
> + return -EBUSY;
> + }
> +
> + return AX_READ(&ax_local->ax_spi, P2_MDIODR);
> +}
> +
> +void
> +ax88796c_mdio_write(struct net_device *ndev, int phy_id, int loc, int val)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + unsigned long start_time;
> +
> + AX_WRITE(&ax_local->ax_spi, val, P2_MDIODR);
> +
> + AX_WRITE(&ax_local->ax_spi,
> + MDIOCR_RADDR(loc) | MDIOCR_FADDR(phy_id)
> + | MDIOCR_WRITE, P2_MDIOCR);
> +
> + start_time = jiffies;
> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
> + if (time_after(jiffies, start_time + HZ/100))
> + return;
> + }
> +
> + if (loc == MII_ADVERTISE) {
> + AX_WRITE(&ax_local->ax_spi, (BMCR_FULLDPLX | BMCR_ANRESTART |
> + BMCR_ANENABLE | BMCR_SPEED100), P2_MDIODR);
> + AX_WRITE(&ax_local->ax_spi, (MDIOCR_RADDR(MII_BMCR) |
> + MDIOCR_FADDR(phy_id) | MDIOCR_WRITE),
> + P2_MDIOCR);
> +
> + start_time = jiffies;
> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR)
> + & MDIOCR_VALID) == 0) {
> + if (time_after(jiffies, start_time + HZ/100))
> + return;
> + }
> + }
> +}
> +
> +void ax88796c_set_csums(struct ax88796c_device *ax_local)
> +{
> + if (ax_local->checksum & AX_RX_CHECKSUM) {
> + AX_WRITE(&ax_local->ax_spi, COERCR0_DEFAULT, P4_COERCR0);
> + AX_WRITE(&ax_local->ax_spi, COERCR1_DEFAULT, P4_COERCR1);
> + } else {
> + AX_WRITE(&ax_local->ax_spi, 0, P4_COERCR0);
> + AX_WRITE(&ax_local->ax_spi, 0, P4_COERCR1);
> + }
> +
> + if (ax_local->checksum & AX_TX_CHECKSUM) {
> + AX_WRITE(&ax_local->ax_spi, COETCR0_DEFAULT, P4_COETCR0);
> + AX_WRITE(&ax_local->ax_spi, COETCR1_TXPPPE, P4_COETCR1);
> + } else {
> + AX_WRITE(&ax_local->ax_spi, 0, P4_COETCR0);
> + AX_WRITE(&ax_local->ax_spi, 0, P4_COETCR1);
> + }
> +}
> +
> +static void ax88796c_get_drvinfo(struct net_device *ndev,
> + struct ethtool_drvinfo *info)
> +{
> + /* Inherit standard device info */
> + strncpy(info->driver, DRV_NAME, sizeof(info->driver));
> + strncpy(info->version, DRV_VERSION, sizeof(info->version));
> +}
> +
> +static u32 ax88796c_get_link(struct net_device *ndev)
> +{
> + u32 link;
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 power;
> +
> + down(&ax_local->spi_lock);
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + link = mii_link_ok(&ax_local->mii);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> + up(&ax_local->spi_lock);
> +
> + return link;
> +
> +
Empty lines.
> +}
> +
> +static u32 ax88796c_get_msglevel(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + return ax_local->msg_enable;
> +}
> +
> +static void ax88796c_set_msglevel(struct net_device *ndev, u32 level)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + ax_local->msg_enable = level;
> +}
> +
> +
One line break.
> +static int
> +ax88796c_get_link_ksettings(struct net_device *ndev,
> + struct ethtool_link_ksettings *cmd)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 power;
> +
> + down(&ax_local->spi_lock);
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + mii_ethtool_get_link_ksettings(&ax_local->mii, cmd);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> + up(&ax_local->spi_lock);
> +
> + return 0;
> +}
> +
> +static int
> +ax88796c_set_link_ksettings(struct net_device *ndev,
> + const struct ethtool_link_ksettings *cmd)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 power;
> +
> + down(&ax_local->spi_lock);
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + mii_ethtool_set_link_ksettings(&ax_local->mii, cmd);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> + up(&ax_local->spi_lock);
> + return 0;
> +
Line before return, not after.
> +}
> +
> +static int ax88796c_nway_reset(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + int ret;
> + u8 power;
> +
> + down(&ax_local->spi_lock);
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + ret = mii_nway_restart(&ax_local->mii);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> + up(&ax_local->spi_lock);
> + return ret;
> +}
> +
> +static u32 ax88796c_ethtool_getmsglevel(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + return ax_local->msg_enable;
> +}
> +
> +static void ax88796c_ethtool_setmsglevel(struct net_device *ndev, u32 level)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + ax_local->msg_enable = level;
> +}
> +
> +struct ethtool_ops ax88796c_ethtool_ops = {
> + .get_drvinfo = ax88796c_get_drvinfo,
> + .get_link = ax88796c_get_link,
> + .get_msglevel = ax88796c_get_msglevel,
> + .set_msglevel = ax88796c_set_msglevel,
> + .get_link_ksettings = ax88796c_get_link_ksettings,
> + .set_link_ksettings = ax88796c_set_link_ksettings,
> + .nway_reset = ax88796c_nway_reset,
> + .get_msglevel = ax88796c_ethtool_getmsglevel,
> + .set_msglevel = ax88796c_ethtool_setmsglevel,
> +};
> +
> +int ax88796c_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + int ret;
> + u8 power;
> +
> + down(&ax_local->spi_lock);
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + ret = generic_mii_ioctl(&ax_local->mii, if_mii(ifr), cmd, NULL);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> + up(&ax_local->spi_lock);
> +
> + return ret;
> +}
> +
> diff --git a/drivers/net/ethernet/asix/ax88796c_ioctl.h b/drivers/net/ethernet/asix/ax88796c_ioctl.h
> new file mode 100644
> index 000000000000..bafd573bd813
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.h
> @@ -0,0 +1,21 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2010 ASIX Electronics Corporation
> + *
> + * ASIX AX88796C SPI Fast Ethernet Linux driver
> + */
> +
> +#ifndef _AX88796C_IOCTL_H
> +#define _AX88796C_IOCTL_H
> +
> +extern struct ethtool_ops ax88796c_ethtool_ops;
> +
> +u8 ax88796c_check_power(struct ax88796c_device *ax_local);
> +u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local);
> +void ax88796c_set_power_saving(struct ax88796c_device *ax_local, u8 ps_level);
> +int ax88796c_mdio_read(struct net_device *dev, int phy_id, int loc);
> +void ax88796c_mdio_write(struct net_device *dev, int phy_id, int loc, int val);
> +void ax88796c_set_csums(struct ax88796c_device *ax_local);
> +int ax88796c_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
> +
> +#endif
> diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c
> new file mode 100644
> index 000000000000..c28cfb931319
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/ax88796c_main.c
> @@ -0,0 +1,1373 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2010 ASIX Electronics Corporation
> + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
> + *
> + * ASIX AX88796C SPI Fast Ethernet Linux driver
> + */
> +
> +#include "ax88796c_main.h"
> +#include "ax88796c_ioctl.h"
> +
> +static int comp;
> +static int ps_level = AX_PS_D0;
> +static int msg_enable = NETIF_MSG_PROBE |
> + NETIF_MSG_LINK |
> + /* NETIF_MSG_TIMER | */
> + NETIF_MSG_RX_ERR |
> + NETIF_MSG_TX_ERR |
> + /* NETIF_MSG_TX_QUEUED | */
> + /* NETIF_MSG_INTR | */
> + /* NETIF_MSG_TX_DONE | */
> + /* NETIF_MSG_RX_STATUS | */
> + /* NETIF_MSG_PKTDATA | */
> + /* NETIF_MSG_HW | */
> + NETIF_MSG_WOL;
> +
> +module_param(comp, int, 0);
> +MODULE_PARM_DESC(comp, "0=Non-Compression Mode, 1=Compression Mode");
> +
> +module_param(ps_level, int, 0);
> +MODULE_PARM_DESC(ps_level,
> + "Power Saving Level (0:disable 1:level 1 2:level 2)");
> +
> +module_param(msg_enable, int, 0);
> +MODULE_PARM_DESC(msg_enable, "Message mask (see linux/netdevice.h for bitmap)");
> +
> +static char *macaddr;
> +module_param(macaddr, charp, 0);
> +MODULE_PARM_DESC(macaddr, "MAC address");
I think MAC address as param is not accepted in mainline...
> +
> +MODULE_AUTHOR("ASIX");
> +MODULE_DESCRIPTION("ASIX AX88796C SPI Ethernet driver");
> +MODULE_LICENSE("GPL");
These three usually go to the end of file.
> +
> +static void ax88796c_dump_regs(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + u8 i, j;
> +
> + netdev_info(ndev,
> + " Page0 Page1 Page2 Page3 "
> + "Page4 Page5 Page6 Page7\n");
> + for (i = 0; i < 0x20; i += 2) {
> + netdev_info(ndev, "0x%02x ", i);
> + for (j = 0; j < 8; j++) {
> + netdev_info(ndev, "0x%04x ",
> + AX_READ(&ax_local->ax_spi, j * 0x20 + i));
> + }
> + netdev_info(ndev, "\n");
> + }
> + netdev_info(ndev, "\n");
> +}
> +
> +static void ax88796c_dump_phy_regs(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + int i;
> +
> + netdev_info(ndev, "Dump PHY registers:\n");
> + for (i = 0; i < 6; i++) {
> + netdev_info(ndev, " MR%d = 0x%04x\n", i,
> + ax88796c_mdio_read(ax_local->ndev,
> + ax_local->mii.phy_id, i));
> + }
> +}
> +
> +static void ax88796c_watchdog(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + u16 phy_status;
> + unsigned long time_to_chk = AX88796C_WATCHDOG_PERIOD;
> +
> + if (ax88796c_check_power(ax_local)) {
> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
> + return;
> + }
> +
> + ax88796c_set_power_saving(ax_local, AX_PS_D0);
> +
> + phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
> + if (phy_status & PSCR_PHYLINK) {
> +
> + ax_local->w_state = ax_nop;
> + time_to_chk = 0;
> +
> + } else if (!(phy_status & PSCR_PHYCOFF)) {
> + /* The ethernet cable has been plugged */
> + if (ax_local->w_state == chk_cable) {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Cable connected\n");
> +
> + ax_local->w_state = chk_link;
> + ax_local->w_ticks = 0;
> + } else {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Check media status\n");
> +
> + if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Restart autoneg\n");
> + ax88796c_mdio_write(ndev,
> + ax_local->mii.phy_id, MII_BMCR,
> + (BMCR_SPEED100 | BMCR_ANENABLE |
> + BMCR_ANRESTART));
> +
> + if (netif_msg_hw(ax_local))
> + ax88796c_dump_phy_regs(ax_local);
> + ax_local->w_ticks = 0;
> + }
> + }
> + } else {
> + if (netif_msg_timer(ax_local))
> + netdev_info(ndev, "Check cable status\n");
> +
> + ax_local->w_state = chk_cable;
> + }
> +
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + if (time_to_chk)
> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
> +}
> +
> +static void ax88796c_watchdog_timer(struct timer_list *t)
> +{
> + struct ax88796c_device *ax_local = from_timer(ax_local, t, watchdog);
> + //struct net_device *ndev = ax_local->ndev;
Clean up.
> +
> + set_bit(EVENT_WATCHDOG, &ax_local->flags);
> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
> +}
> +
> +static int ax88796c_soft_reset(struct ax88796c_device *ax_local)
> +{
> + unsigned long start;
> + u16 temp;
> +
> + AX_WRITE(&ax_local->ax_spi, PSR_RESET, P0_PSR);
> + AX_WRITE(&ax_local->ax_spi, PSR_RESET_CLR, P0_PSR);
> +
> + start = jiffies;
> + while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
> + if (time_after(jiffies, start + (160 * HZ / 1000))) {
> + dev_err(&ax_local->spi->dev,
> + "timeout waiting for reset completion\n");
> + return -1;
> + }
> + }
> +
> + temp = AX_READ(&ax_local->ax_spi, P4_SPICR);
> + if (ax_local->capabilities & AX_CAP_COMP) {
> + AX_WRITE(&ax_local->ax_spi,
> + (temp | SPICR_RCEN | SPICR_QCEN), P4_SPICR);
> + ax_local->ax_spi.comp = 1;
> + } else {
> + AX_WRITE(&ax_local->ax_spi,
> + (temp & ~(SPICR_RCEN | SPICR_QCEN)), P4_SPICR);
> + ax_local->ax_spi.comp = 0;
> + }
> +
> + return 0;
> +}
> +
> +static int ax88796c_reload_eeprom(struct ax88796c_device *ax_local)
> +{
> + unsigned long start;
> +
> + AX_WRITE(&ax_local->ax_spi, EECR_RELOAD, P3_EECR);
> +
> + start = jiffies;
> + while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
> + if (time_after(jiffies, start + (2 * HZ / 100))) {
> + dev_err(&ax_local->spi->dev,
> + "timeout waiting for reload eeprom\n");
> + return -1;
> + }
> + }
> +
> + return 0;
> +}
> +
> +static void ax88796c_set_hw_multicast(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u16 rx_ctl = RXCR_AB;
> + int mc_count = netdev_mc_count(ndev);
> +
> + memset(ax_local->multi_filter, 0, AX_MCAST_FILTER_SIZE);
> +
> + if (ndev->flags & IFF_PROMISC) {
> + rx_ctl |= RXCR_PRO;
> +
> + } else if (ndev->flags & IFF_ALLMULTI
> + || mc_count > AX_MAX_MCAST) {
> + rx_ctl |= RXCR_AMALL;
> +
> + } else if (mc_count == 0) {
> + /* just broadcast and directed */
> + } else {
> + u32 crc_bits;
> + int i;
> + struct netdev_hw_addr *ha;
> + netdev_for_each_mc_addr(ha, ndev) {
> + crc_bits = ether_crc(ETH_ALEN, ha->addr);
> + ax_local->multi_filter[crc_bits >> 29] |=
> + (1 << ((crc_bits >> 26) & 7));
> + }
> +
> + for (i = 0; i < 4; i++) {
> + AX_WRITE(&ax_local->ax_spi,
> + ((ax_local->multi_filter[i*2+1] << 8) |
> + ax_local->multi_filter[i*2]), P3_MFAR(i));
> +
> + }
> + }
> +
> + AX_WRITE(&ax_local->ax_spi, rx_ctl, P2_RXCR);
> +
No need for empty line.
> +}
> +
> +#if 0
Please comment why it is commented out.
> +static void ax88796c_set_multicast(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> +
> + set_bit(EVENT_SET_MULTI, &ax_local->flags);
> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
> +}
> +#endif
> +
> +static void ax88796c_set_mac_addr(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> +
> + AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[4] << 8) |
> + (u16)ndev->dev_addr[5]), P3_MACASR0);
> + AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[2] << 8) |
> + (u16)ndev->dev_addr[3]), P3_MACASR1);
> + AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[0] << 8) |
> + (u16)ndev->dev_addr[1]), P3_MACASR2);
> +}
> +
> +static int ax88796c_set_mac_address(struct net_device *ndev, void *p)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + struct sockaddr *addr = p;
> +
> + if (!is_valid_ether_addr(addr->sa_data))
> + return -EADDRNOTAVAIL;
> +
> + memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len);
> +
> + down(&ax_local->spi_lock);
> +
> + ax88796c_set_mac_addr(ndev);
> +
> + up(&ax_local->spi_lock);
> +
> + return 0;
> +}
> +
> +static int ax88796c_load_mac_addr(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u16 temp;
> +
> + /* Read the MAC address from AX88796C */
> + temp = AX_READ(&ax_local->ax_spi, P3_MACASR0);
> + ndev->dev_addr[5] = (u8)temp;
> + ndev->dev_addr[4] = (u8)(temp >> 8);
> +
> + temp = AX_READ(&ax_local->ax_spi, P3_MACASR1);
> + ndev->dev_addr[3] = (u8)temp;
> + ndev->dev_addr[2] = (u8)(temp >> 8);
> +
> + temp = AX_READ(&ax_local->ax_spi, P3_MACASR2);
> + ndev->dev_addr[1] = (u8)temp;
> + ndev->dev_addr[0] = (u8)(temp >> 8);
> +
> + /* Supported for no EEPROM */
> + if (!is_valid_ether_addr(ndev->dev_addr)) {
> + if (macaddr && mac_pton(macaddr, ndev->dev_addr))
> + return 0;
> +
> + if (netif_msg_probe(ax_local))
> + dev_info(&ax_local->spi->dev, "Use random MAC address\n");
> +
> + random_ether_addr(ndev->dev_addr);
> + }
> +
> + return 0;
> +}
> +
> +static void ax88796c_proc_tx_hdr(struct tx_pkt_info *info, u8 ip_summed)
> +{
> + u16 pkt_len_bar = (~info->pkt_len & TX_HDR_SOP_PKTLENBAR);
> +
> + /* Prepare SOP header */
> + info->sop.flags_len = info->pkt_len |
> + (ip_summed == CHECKSUM_NONE ? TX_HDR_SOP_DICF : 0);
> +
> + info->sop.seq_lenbar = ((info->seq_num << 11) & TX_HDR_SOP_SEQNUM)
> + | pkt_len_bar;
> + cpu_to_be16s(&info->sop.flags_len);
> + cpu_to_be16s(&info->sop.seq_lenbar);
> +
> + /* Prepare Segment header */
> + info->seg.flags_seqnum_seglen = TX_HDR_SEG_FS | TX_HDR_SEG_LS
> + | info->pkt_len;
> +
> + info->seg.eo_so_seglenbar = pkt_len_bar;
> +
> + cpu_to_be16s(&info->seg.flags_seqnum_seglen);
> + cpu_to_be16s(&info->seg.eo_so_seglenbar);
> +
> + /* Prepare EOP header */
> + info->eop.seq_len = ((info->seq_num << 11) &
> + TX_HDR_EOP_SEQNUM) | info->pkt_len;
> + info->eop.seqbar_lenbar = ((~info->seq_num << 11) &
> + TX_HDR_EOP_SEQNUMBAR) | pkt_len_bar;
> +
> + cpu_to_be16s(&info->eop.seq_len);
> + cpu_to_be16s(&info->eop.seqbar_lenbar);
> +}
> +
> +static int
> +ax88796c_check_free_pages(struct ax88796c_device *ax_local, u8 need_pages)
> +{
> + u8 free_pages;
> + u16 tmp;
> +
> + free_pages = AX_READ(&ax_local->ax_spi, P0_TFBFCR) & TX_FREEBUF_MASK;
> + if (free_pages < need_pages) {
> + /* schedule free page interrupt */
> + tmp = AX_READ(&ax_local->ax_spi, P0_TFBFCR)
> + & TFBFCR_SCHE_FREE_PAGE;
> + AX_WRITE(&ax_local->ax_spi, tmp | TFBFCR_TX_PAGE_SET |
> + TFBFCR_SET_FREE_PAGE(need_pages),
> + P0_TFBFCR);
> + return -ENOMEM;
> + }
> +
> + return 0;
> +}
> +
> +static struct sk_buff *
> +ax88796c_tx_fixup(struct net_device *ndev, struct sk_buff_head *q)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + struct sk_buff *skb, *tx_skb;
> + struct tx_pkt_info *info;
> + struct skb_data *entry;
> + int headroom;
> + int tailroom;
> + u8 need_pages;
> + u16 tol_len, pkt_len;
> + u8 padlen, seq_num;
> + u8 spi_len = ax_local->ax_spi.comp ? 1 : 4;
> +
> + if (skb_queue_empty(q))
> + return NULL;
> +
> + skb = skb_peek(q);
> + pkt_len = skb->len;
> + need_pages = (pkt_len + TX_OVERHEAD + 127) >> 7;
> + if (ax88796c_check_free_pages(ax_local, need_pages) != 0)
> + return NULL;
> +
> + headroom = skb_headroom(skb);
> + tailroom = skb_tailroom(skb);
> + padlen = ((pkt_len + 3) & 0x7FC) - pkt_len;
> + tol_len = ((pkt_len + 3) & 0x7FC) +
> + TX_OVERHEAD + TX_EOP_SIZE + spi_len;
> + seq_num = ++ax_local->seq_num & 0x1F;
> +
> + info = (struct tx_pkt_info *) skb->cb;
> + info->pkt_len = pkt_len;
> +
> + if ((!skb_cloned(skb)) &&
> + (headroom >= (TX_OVERHEAD + spi_len)) &&
> + (tailroom >= (padlen + TX_EOP_SIZE))) {
> +
> + info->seq_num = seq_num;
> + ax88796c_proc_tx_hdr(info, skb->ip_summed);
> +
> + /* SOP and SEG header */
> + memcpy(skb_push(skb, TX_OVERHEAD), &info->sop, TX_OVERHEAD);
> +
> + /* Write SPI TXQ header */
> + memcpy(skb_push(skb, spi_len), tx_cmd_buf, spi_len);
> +
> + /* Make 32-bit aligment */
> + skb_put(skb, padlen);
> +
> + /* EOP header */
> + memcpy(skb_put(skb, TX_EOP_SIZE), &info->eop, TX_EOP_SIZE);
> +
> + tx_skb = skb;
> + skb_unlink(skb, q);
> +
> + } else {
> +
> + tx_skb = alloc_skb(tol_len, GFP_KERNEL);
> + if (!tx_skb)
> + return NULL;
> +
> + /* Write SPI TXQ header */
> + memcpy(skb_put(tx_skb, spi_len), tx_cmd_buf, spi_len);
> +
> + info->seq_num = seq_num;
> + ax88796c_proc_tx_hdr(info, skb->ip_summed);
> +
> + /* SOP and SEG header */
> + memcpy(skb_put(tx_skb, TX_OVERHEAD),
> + &info->sop, TX_OVERHEAD);
> +
> + /* Packet */
> + memcpy(skb_put(tx_skb, ((pkt_len + 3) & 0xFFFC)),
> + skb->data, pkt_len);
> +
> + /* EOP header */
> + memcpy(skb_put(tx_skb, TX_EOP_SIZE),
> + &info->eop, TX_EOP_SIZE);
> +
> + skb_unlink(skb, q);
> + dev_kfree_skb(skb);
> + }
> +
> + entry = (struct skb_data *) tx_skb->cb;
> + memset(entry, 0, sizeof(*entry));
> + entry->len = pkt_len;
> +
> + if (netif_msg_pktdata(ax_local)) {
> + int loop;
> + netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
> + pkt_len, tx_skb->len, seq_num);
> +
> + netdev_info(ndev, " Dump SPI Header:\n ");
> + for (loop = 0; loop < 4; loop++)
> + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
> +
> + netdev_info(ndev, "\n");
> +
> + netdev_info(ndev, " Dump TX SOP:\n ");
> + for (loop = 0; loop < TX_OVERHEAD; loop++)
> + netdev_info(ndev, "%02x ", *(tx_skb->data + 4 + loop));
> +
> + netdev_info(ndev, "\n");
> +
> + netdev_info(ndev, " Dump TX packet:");
> + for (loop = TX_OVERHEAD + 4;
> + loop < (tx_skb->len - TX_EOP_SIZE); loop++) {
> + if (((loop + 8) % 16) == 0)
> + netdev_info(ndev, "\n ");
> + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
> + }
> + netdev_info(ndev, "\n");
> +
> + netdev_info(ndev, " Dump TX EOP:\n %02x %02x %02x %02x\n",
> + *(tx_skb->data + tx_skb->len - 4),
> + *(tx_skb->data + tx_skb->len - 3),
> + *(tx_skb->data + tx_skb->len - 2),
> + *(tx_skb->data + tx_skb->len - 1));
> + }
> +
> + return tx_skb;
> +}
> +
> +static int ax88796c_hard_xmit(struct ax88796c_device *ax_local)
> +{
> + struct sk_buff *tx_skb;
> + struct skb_data *entry;
> +
> + tx_skb = ax88796c_tx_fixup(ax_local->ndev, &ax_local->tx_wait_q);
> +
> + if (!tx_skb)
> + return 0;
> +
> + entry = (struct skb_data *)tx_skb->cb;
> +
> + AX_WRITE(&ax_local->ax_spi,
> + (TSNR_TXB_START | TSNR_PKT_CNT(1)), P0_TSNR);
> +
> + axspi_write_txq(&ax_local->ax_spi, tx_skb->data, tx_skb->len);
> +
> + if (((AX_READ(&ax_local->ax_spi, P0_TSNR) & TXNR_TXB_IDLE) == 0) ||
> + ((ISR_TXERR & AX_READ(&ax_local->ax_spi, P0_ISR)) != 0)) {
> +
> + /* Ack tx error int */
> + AX_WRITE(&ax_local->ax_spi, ISR_TXERR, P0_ISR);
> +
> + ax_local->stats.tx_dropped++;
> +
> + if (netif_msg_tx_err(ax_local))
> + netdev_err(ax_local->ndev,
> + "TX FIFO error, re-initialize the TX bridge\n");
> +
> + /* Reinitial tx bridge */
> + AX_WRITE(&ax_local->ax_spi, TXNR_TXB_REINIT |
> + AX_READ(&ax_local->ax_spi, P0_TSNR), P0_TSNR);
> + ax_local->seq_num = 0;
> + } else {
> + ax_local->stats.tx_packets++;
> + ax_local->stats.tx_bytes += entry->len;
> + }
> +
> + entry->state = tx_done;
> + dev_kfree_skb(tx_skb);
> +
> + return 1;
> +}
> +
> +static int
> +ax88796c_start_xmit(struct sk_buff *skb, struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> +
> + skb_queue_tail(&ax_local->tx_wait_q, skb);
> + if (skb_queue_len(&ax_local->tx_wait_q) > TX_QUEUE_HIGH_WATER) {
> + if (netif_msg_tx_queued(ax_local))
> + netdev_err(ndev, "Too much TX packets in queue %d\n",
> + skb_queue_len(&ax_local->tx_wait_q));
> +
> + netif_stop_queue(ndev);
> + }
> +
> + set_bit(EVENT_TX, &ax_local->flags);
> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
> +
> + return NETDEV_TX_OK;
> +
> +}
> +
> +
> +static inline void
> +ax88796c_skb_return(struct ax88796c_device *ax_local, struct sk_buff *skb,
> + struct rx_header *rxhdr)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + int status;
> +
> + do {
> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
> + break;
> +
> + /* checksum error bit is set */
> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
> + (rxhdr->flags & RX_HDR3_L4_ERR))
> + break;
> +
> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
> + skb->ip_summed = CHECKSUM_UNNECESSARY;
> + }
> + } while (0);
> +
> + ax_local->stats.rx_packets++;
> + ax_local->stats.rx_bytes += skb->len;
> + skb->dev = ndev;
> +
> + skb->truesize = skb->len + sizeof(struct sk_buff);
> + skb->protocol = eth_type_trans(skb, ax_local->ndev);
> +
> + if (netif_msg_rx_status(ax_local))
> + netdev_info(ndev, "< rx, len %zu, type 0x%x\n",
> + skb->len + sizeof(struct ethhdr), skb->protocol);
> +
> + status = netif_rx(skb);
> + if (status != NET_RX_SUCCESS && netif_msg_rx_err(ax_local))
> + netdev_info(ndev, "netif_rx status %d\n", status);
> +}
> +
> +static void dump_packet(struct net_device *ndev, const char *msg, int len, const char *data)
> +{
Too long lines.
> + netdev_printk(KERN_DEBUG, ndev, DRV_NAME ": %s - packet len:%d\n", msg, len);
> + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
> + data, len, true);
> +}
> +
> +static void
> +ax88796c_rx_fixup(struct ax88796c_device *ax_local, struct sk_buff *rx_skb)
> +{
> + struct rx_header *rxhdr = (struct rx_header *) rx_skb->data;
> + struct net_device *ndev = ax_local->ndev;
> + u16 len;
> +
> + be16_to_cpus(&rxhdr->flags_len);
> + be16_to_cpus(&rxhdr->seq_lenbar);
> + be16_to_cpus(&rxhdr->flags);
> +
> + if ((((short)rxhdr->flags_len) & RX_HDR1_PKT_LEN) !=
> + (~((short)rxhdr->seq_lenbar) & 0x7FF)) {
> + if (netif_msg_rx_err(ax_local)) {
> + int i;
> + netdev_err(ndev, "Header error\n");
> + //netdev_err(ndev, "Dump received frame\n");
> + /* for (i = 0; i < rx_skb->len; i++) { */
> + /* netdev_err(ndev, "%02x ", */
> + /* *(rx_skb->data + i)); */
> + /* if (((i + 1) % 16) == 0) */
> + /* netdev_err(ndev, "\n"); */
> + /* } */
> + dump_packet(ndev, __func__, rx_skb->len, rx_skb->data);
> + }
> + ax_local->stats.rx_frame_errors++;
> + kfree_skb(rx_skb);
> + return;
> + }
> +
> + if ((rxhdr->flags_len & RX_HDR1_MII_ERR) ||
> + (rxhdr->flags_len & RX_HDR1_CRC_ERR)) {
> + if (netif_msg_rx_err(ax_local))
> + netdev_err(ndev, "CRC or MII error\n");
> +
> + ax_local->stats.rx_crc_errors++;
> + kfree_skb(rx_skb);
> + return;
> + }
> +
> + len = rxhdr->flags_len & RX_HDR1_PKT_LEN;
> + if (netif_msg_pktdata(ax_local)) {
> + int loop;
> + netdev_info(ndev, "RX data, total len %d, packet len %d\n",
> + rx_skb->len, len);
> +
> + netdev_info(ndev, " Dump RX packet header:\n ");
> + for (loop = 0; loop < sizeof(*rxhdr); loop++)
> + netdev_info(ndev, "%02x ", *(rx_skb->data + loop));
> +
> + netdev_info(ndev, "\n Dump RX packet:");
> + for (loop = 0; loop < len; loop++) {
> + if ((loop % 16) == 0)
> + netdev_info(ndev, "\n ");
> + netdev_info(ndev, "%02x ",
> + *(rx_skb->data + loop + sizeof(*rxhdr)));
> + }
> + netdev_info(ndev, "\n");
> + }
> +
> + skb_pull(rx_skb, sizeof(*rxhdr));
> + __pskb_trim(rx_skb, len);
> +
> + return ax88796c_skb_return(ax_local, rx_skb, rxhdr);
> +}
> +
> +static int ax88796c_receive(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + struct sk_buff *skb;
> + struct skb_data *entry;
> + u16 w_count, pkt_len;
> + u8 pkt_cnt;
> +
> + /* check rx packet and total word count */
> + AX_WRITE(&ax_local->ax_spi, AX_READ(&ax_local->ax_spi, P0_RTWCR)
> + | RTWCR_RX_LATCH, P0_RTWCR);
> +
> + pkt_cnt = AX_READ(&ax_local->ax_spi, P0_RXBCR2) & RXBCR2_PKT_MASK;
> + if (!pkt_cnt)
> + return 0;
> +
> + pkt_len = AX_READ(&ax_local->ax_spi, P0_RCPHR) & 0x7FF;
> +
> + w_count = ((pkt_len + 6 + 3) & 0xFFFC) >> 1;
> +
> + skb = alloc_skb((w_count * 2), GFP_KERNEL);
> + if (!skb) {
> + if (netif_msg_rx_err(ax_local))
> + netdev_err(ndev,
> + "Couldn't allocate a sk_buff of size %d\n",
> + w_count * 2);
> +
> + AX_WRITE(&ax_local->ax_spi, RXBCR1_RXB_DISCARD, P0_RXBCR1);
> + return 0;
> + }
> + entry = (struct skb_data *) skb->cb;
> +
> + AX_WRITE(&ax_local->ax_spi, RXBCR1_RXB_START | w_count, P0_RXBCR1);
> +
> + axspi_read_rxq(&ax_local->ax_spi,
> + skb_put(skb, w_count * 2), skb->len);
> +
> + /* Check if rx bridge is idle */
> + if ((AX_READ(&ax_local->ax_spi, P0_RXBCR2) & RXBCR2_RXB_IDLE) == 0) {
> +
> + if (netif_msg_rx_err(ax_local))
> + netdev_err(ndev, "Rx Bridge is not idle\n");
> + AX_WRITE(&ax_local->ax_spi, RXBCR2_RXB_REINIT, P0_RXBCR2);
> +
> + entry->state = rx_err;
> +
> + } else {
> +
> + entry->state = rx_done;
> + }
> +
> + AX_WRITE(&ax_local->ax_spi, ISR_RXPKT, P0_ISR);
> +
> + ax88796c_rx_fixup(ax_local, skb);
> +
> + return 1;
> +}
> +
> +static void ax88796c_check_media(struct ax88796c_device *ax_local)
> +{
> + struct net_device *ndev = ax_local->ndev;
> + u16 bmsr, bmcr;
> +
> + if (netif_msg_hw(ax_local))
> + ax88796c_dump_phy_regs(ax_local);
> +
> + bmsr = ax88796c_mdio_read(ndev,
> + ax_local->mii.phy_id, MII_BMSR);
> +
> + if (!(bmsr & BMSR_LSTATUS) && netif_carrier_ok(ndev)) {
> +
> + netif_carrier_off(ndev);
> + if (netif_msg_link(ax_local))
> + netdev_info(ndev, "link down\n");
> +
> + ax_local->w_state = chk_cable;
> + mod_timer(&ax_local->watchdog,
> + jiffies + AX88796C_WATCHDOG_PERIOD);
> +
> + } else if ((bmsr & BMSR_LSTATUS) &&
> + !netif_carrier_ok(ndev)) {
> + bmcr = ax88796c_mdio_read(ndev,
> + ax_local->mii.phy_id, MII_BMCR);
> + if (netif_msg_link(ax_local))
> + netdev_info(ndev, "link up, %sMbps, %s-duplex\n",
> + (bmcr & BMCR_SPEED100) ? "100" : "10",
> + (bmcr & BMCR_FULLDPLX) ? "full" : "half");
> +
> + netif_carrier_on(ndev);
> + }
> +
> + return;
> +}
> +
> +static int ax88796c_process_isr(struct ax88796c_device *ax_local)
> +{
> + u16 isr;
> + u8 done = 0;
> + struct net_device *ndev = ax_local->ndev;
> +
> + isr = AX_READ(&ax_local->ax_spi, P0_ISR);
> + AX_WRITE(&ax_local->ax_spi, isr, P0_ISR);
> +
> + if (netif_msg_intr(ax_local))
> + netdev_info(ndev, " ISR 0x%04x\n", isr);
> +
> + if (isr & ISR_TXERR) {
> + if (netif_msg_intr(ax_local))
> + netdev_info(ndev, " TXERR interrupt\n");
> + AX_WRITE(&ax_local->ax_spi, TXNR_TXB_REINIT, P0_TSNR);
> + ax_local->seq_num = 0x1f;
> + }
> +
> + if (isr & ISR_TXPAGES) {
> +
> + if (netif_msg_intr(ax_local))
> + netdev_info(ndev, " TXPAGES interrupt\n");
> +
> + set_bit(EVENT_TX, &ax_local->flags);
> + }
> +
> + if (isr & ISR_LINK) {
> +
> + if (netif_msg_intr(ax_local))
> + netdev_info(ndev, " Link change interrupt\n");
> +
> + ax88796c_check_media(ax_local);
> + }
> +
> + if (isr & ISR_RXPKT) {
> +
> + if (netif_msg_intr(ax_local))
> + netdev_info(ndev, " RX interrupt\n");
> +
> + done = ax88796c_receive(ax_local->ndev);
> + }
> +
> + return done;
> +}
> +
> +static irqreturn_t ax88796c_interrupt(int irq, void *dev_instance)
> +{
> + struct net_device *ndev = dev_instance;
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> +
> + if (ndev == NULL) {
> + pr_err("irq %d for unknown device.\n", irq);
> + return IRQ_RETVAL(0);
> + }
> +
> + disable_irq_nosync(irq);
> +
> + if (netif_msg_intr(ax_local))
> + netdev_info(ndev, "Interrupt occurred\n");
> +
> + set_bit(EVENT_INTR, &ax_local->flags);
> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
> +
> + return IRQ_HANDLED;
> +}
> +
> +
Only one line
> +static void ax88796c_work(struct work_struct *work)
> +{
> + struct ax88796c_device *ax_local =
> + container_of(work, struct ax88796c_device, ax_work);
> + u8 power = 0;
> +
> + down(&ax_local->spi_lock);
> +
> + if (test_bit(EVENT_WATCHDOG, &ax_local->flags)) {
> +
> + ax88796c_watchdog(ax_local);
> +
> + clear_bit(EVENT_WATCHDOG, &ax_local->flags);
> + }
> +
> + if (test_bit(EVENT_SET_MULTI, &ax_local->flags)) {
> +
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + ax88796c_set_hw_multicast(ax_local->ndev);
> + clear_bit(EVENT_SET_MULTI, &ax_local->flags);
> + }
> +
> + if (test_bit(EVENT_INTR, &ax_local->flags)) {
> +
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
> +
> + while (1) {
> + if (!ax88796c_process_isr(ax_local))
> + break;
> + }
> +
> + clear_bit(EVENT_INTR, &ax_local->flags);
> +
> + AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
> +
> + enable_irq(ax_local->ndev->irq);
> + }
> +
> + if (test_bit(EVENT_TX, &ax_local->flags)) {
> +
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + while (skb_queue_len(&ax_local->tx_wait_q)) {
> + if (!ax88796c_hard_xmit(ax_local))
> + break;
> + }
> +
> + clear_bit(EVENT_TX, &ax_local->flags);
> +
> + if (netif_queue_stopped(ax_local->ndev) &&
> + (skb_queue_len(&ax_local->tx_wait_q) < TX_QUEUE_LOW_WATER))
> + netif_wake_queue(ax_local->ndev);
> + }
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + up(&ax_local->spi_lock);
> +}
> +
> +static struct net_device_stats *ax88796c_get_stats(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + return &ax_local->stats;
> +}
> +
> +void ax88796c_phy_init(struct ax88796c_device *ax_local)
> +{
> + u16 advertise = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
> +
> + /* Setup LED mode */
> + AX_WRITE(&ax_local->ax_spi,
> + (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |
> + LCR_LED1_100MODE), P2_LCR0);
> + AX_WRITE(&ax_local->ax_spi,
> + (AX_READ(&ax_local->ax_spi, P2_LCR1) & LCR_LED2_MASK) |
> + LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);
> +
> + /* Enable PHY auto-polling */
> + AX_WRITE(&ax_local->ax_spi,
> + POOLCR_PHYID(ax_local->mii.phy_id) | POOLCR_POLL_EN |
> + POOLCR_POLL_FLOWCTRL | POOLCR_POLL_BMCR, P2_POOLCR);
> +
> + ax88796c_mdio_write(ax_local->ndev,
> + ax_local->mii.phy_id, MII_ADVERTISE, advertise);
> +
> + ax88796c_mdio_write(ax_local->ndev, ax_local->mii.phy_id, MII_BMCR,
> + BMCR_SPEED100 | BMCR_ANENABLE | BMCR_ANRESTART);
> +}
> +
> +static int
> +ax88796c_open(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + int ret;
> + u8 power;
> + unsigned long irq_flag = IRQF_SHARED;
> +
> + netif_carrier_off(ax_local->ndev);
> +
> + down(&ax_local->spi_lock);
> +
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + ret = ax88796c_soft_reset(ax_local);
> + if (ret < 0) {
> + return -ENODEV;
> + }
> +
> + ret = request_irq(ndev->irq, ax88796c_interrupt,
> + irq_flag, ndev->name, ndev);
> + if (ret) {
> + netdev_err(ndev, "unable to get IRQ %d (errno=%d).\n",
> + ndev->irq, ret);
> + return -ENXIO;
> + }
> +
> + ax_local->seq_num = 0x1f;
> +
> + ax88796c_set_mac_addr(ndev);
> + ax88796c_set_csums(ax_local);
> +
> + /* Disable stuffing packet */
> + AX_WRITE(&ax_local->ax_spi,
> + AX_READ(&ax_local->ax_spi, P1_RXBSPCR)
> + & ~RXBSPCR_STUF_ENABLE, P1_RXBSPCR);
> +
> + /* Enable RX packet process */
> + AX_WRITE(&ax_local->ax_spi, RPPER_RXEN, P1_RPPER);
> +
> + AX_WRITE(&ax_local->ax_spi, AX_READ(&ax_local->ax_spi, P0_FER)
> + | FER_RXEN | FER_TXEN | FER_BSWAP | FER_IRQ_PULL, P0_FER);
> +
> + ax88796c_phy_init(ax_local);
> +
> + netif_start_queue(ndev);
> +
> + AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
> +
> + if (netif_msg_hw(ax_local)) {
> + netdev_info(ndev,
> + "Dump all MAC registers after initialization:\n");
> + ax88796c_dump_regs(ax_local);
> + ax88796c_dump_phy_regs(ax_local);
> + }
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + spi_message_init(&ax_local->ax_spi.rx_msg);
> +
> + up(&ax_local->spi_lock);
> +
> + timer_setup(&ax_local->watchdog, ax88796c_watchdog_timer, 0);
> + /* init_timer(&ax_local->watchdog); */
> + /* ax_local->watchdog.function = &ax88796c_watchdog_timer; */
> + /* ax_local->watchdog.data = (unsigned long) ndev; */
I guess it's a development code.
> + ax_local->watchdog.expires = jiffies + AX88796C_WATCHDOG_PERIOD;
> + ax_local->w_state = chk_cable;
> + ax_local->w_ticks = 0;
> +
> + add_timer(&ax_local->watchdog);
> +
> + return 0;
> +}
> +
> +static void ax88796c_free_skb_queue(struct sk_buff_head *q)
> +{
> + struct sk_buff *skb;
> +
> + while (q->qlen) {
> + skb = skb_dequeue(q);
> + kfree_skb(skb);
> + }
> +}
> +
> +static int
> +ax88796c_close(struct net_device *ndev)
> +{
> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 power;
> +
> + netif_stop_queue(ndev);
> +
> + del_timer_sync(&ax_local->watchdog);
> +
> + free_irq(ndev->irq, ndev);
> +
> + down(&ax_local->spi_lock);
> +
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
> + ax88796c_free_skb_queue(&ax_local->tx_wait_q);
> +
> + ax88796c_soft_reset(ax_local);
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + up(&ax_local->spi_lock);
> +
> + return 0;
> +}
> +
> +static const struct net_device_ops ax88796c_netdev_ops = {
> + .ndo_open = ax88796c_open,
> + .ndo_stop = ax88796c_close,
> + .ndo_start_xmit = ax88796c_start_xmit,
> + .ndo_get_stats = ax88796c_get_stats,
> + /* .ndo_set_multicast_list = ax88796c_set_multicast, */
Still need a comment.
> + .ndo_do_ioctl = ax88796c_ioctl,
> + .ndo_set_mac_address = ax88796c_set_mac_address,
> +};
> +
> +
> +static int ax88796c_hard_reset(struct ax88796c_device *ax_local)
> +{
> + struct device *dev = (struct device*)&ax_local->spi->dev;
> + struct gpio_desc *reset_gpio;
> +
> + /* reset info */
> + reset_gpio = gpiod_get(dev, "reset", 0);
> + if (IS_ERR(reset_gpio)) {
> + dev_err(dev, "Could not get 'reset' GPIO: %ld", PTR_ERR(reset_gpio));
> + return PTR_ERR(reset_gpio);
> + }
> +
> + /* set reset */
> + gpiod_direction_output(reset_gpio, 1);
> + msleep(100);
> + gpiod_direction_output(reset_gpio, 0);
> + gpiod_put(reset_gpio);
> + msleep(10);
> +
> + return 0;
> +}
> +
> +static int ax88796c_probe(struct spi_device *spi)
> +{
> + struct net_device *ndev;
> + struct ax88796c_device *ax_local;
> + int ret;
> + u16 temp;
> +
> + ndev = devm_alloc_etherdev(&spi->dev, sizeof(*ax_local));
> + if (!ndev) {
> + dev_err(&spi->dev, "AX88796C SPI: Could not allocate ethernet device\n");
> + return -ENOMEM;
> + }
> +
> + ax_local = to_ax88796c_device(ndev);
> + memset(ax_local, 0, sizeof(*ax_local));
> +
> + dev_set_drvdata(&spi->dev, ax_local);
> + ax_local->spi = spi;
> + ax_local->ax_spi.spi = spi;
> +
> + ndev->irq = spi->irq;
> +
> + ax_local->msg_enable = msg_enable;
One space after '='.
> + if (ps_level > AX_PS_D2 || ps_level < 0)
> + ax_local->ps_level = 0;
> + else
> + ax_local->ps_level = ps_level;
> +
> + ax_local->capabilities |= comp ? AX_CAP_COMP : 0;
> +
> + if (netif_msg_probe(ax_local)) {
> + dev_info(&spi->dev, "AX88796C-SPI Configuration:\n");
> + dev_info(&spi->dev, " Compression : %s\n",
> + ax_local->capabilities & AX_CAP_COMP ? "ON" : "OFF");
> + dev_info(&spi->dev, " Power Saving Level: %d\n",
> + ax_local->ps_level);
> + }
> +
> + ndev->netdev_ops = &ax88796c_netdev_ops;
> + ndev->ethtool_ops = &ax88796c_ethtool_ops;
No spaces before '='.
> +
> + ax_local->ndev = ndev;
Set all priv-storing-pointers in one place, so next to dev_set_drvdata()
unless it is chosen by probe() flow on purpose.
> +
> + /* Initialize MII structure */
> + ax_local->mii.dev = ndev;
> + ax_local->mii.mdio_read = ax88796c_mdio_read;
> + ax_local->mii.mdio_write = ax88796c_mdio_write;
> + ax_local->mii.phy_id_mask = 0x3f;
> + ax_local->mii.reg_num_mask = 0x1f;
> + ax_local->mii.phy_id = 0x10;
> +
> + /* ax88796c gpio reset */
> + ax88796c_hard_reset(ax_local);
> +
> + /* Reset AX88796C */
> + ret = ax88796c_soft_reset(ax_local);
> + if (ret < 0) {
> + return -ENODEV;
> + }
No need for {}.
> +
> + /* Check board revision */
> + temp = AX_READ(&ax_local->ax_spi, P2_CRIR);
> + if ((temp & 0xF) != 0x0) {
> + dev_err(&spi->dev, "spi read failed: %d\n", temp);
> + return -ENODEV;
> + }
> +
> + temp = AX_READ(&ax_local->ax_spi, P0_BOR);
> + if (temp == 0x1234) {
> + ax_local->plat_endian = PLAT_LITTLE_ENDIAN;
> + } else {
> + AX_WRITE(&ax_local->ax_spi, 0xFFFF, P0_BOR);
> + ax_local->plat_endian = PLAT_BIG_ENDIAN;
> + }
> +
> + if (netif_msg_hw(ax_local)) {
> + dev_info(&spi->dev,
> + "Dump all MAC registers before initialization:\n");
> + ax88796c_dump_regs(ax_local);
> + ax88796c_dump_phy_regs(ax_local);
> + }
> +
> + /*Reload EEPROM*/
> + ax88796c_reload_eeprom(ax_local);
> +
> + ax88796c_load_mac_addr(ndev);
> +
> + if (netif_msg_probe(ax_local))
> + dev_info(&spi->dev,
> + "irq %d, MAC addr "
> + "%02X:%02X:%02X:%02X:%02X:%02X\n",
> + ndev->irq,
> + ndev->dev_addr[0], ndev->dev_addr[1],
> + ndev->dev_addr[2], ndev->dev_addr[3],
> + ndev->dev_addr[4], ndev->dev_addr[5]);
> +
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + INIT_WORK(&ax_local->ax_work, ax88796c_work);
> +
> + ax_local->ax_work_queue =
> + create_singlethread_workqueue("ax88796c_work");
> +
> + sema_init(&ax_local->spi_lock, 1);
> +
> + skb_queue_head_init(&ax_local->tx_wait_q);
> +
> + ndev->features |= NETIF_F_HW_CSUM;
> + ax_local->checksum = AX_RX_CHECKSUM | AX_TX_CHECKSUM;
> + ndev->hard_header_len += (TX_OVERHEAD + 4);
> +
> + ret = register_netdev(ndev);
> + if (!ret) {
> + if (netif_msg_probe(ax_local))
> + netdev_info(ndev, "%s %s registered\n",
> + dev_driver_string(&spi->dev),
> + dev_name(&spi->dev));
> + return ret;
> + }
That's unusual flow - exit on success early. Follow the kernel pattern
of "return 0" on success and jumps to common error handling like:
ret = register_netdev(ndev)
if (ret)
// handle error: maybe dev_err and goto
if (netif_msg_probe())
netdev_info();
return 0;
> +
> + dev_err(&spi->dev, "failed to register a network device\n");
> + destroy_workqueue(ax_local->ax_work_queue);
> +
> + return ret;
> +}
> +
> +static int
> +ax88796c_suspend(struct spi_device *spi, pm_message_t mesg)
> +{
> + struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
> + struct net_device *ndev = ax_local->ndev;
> + u8 power;
> +
> + if (!ndev || !netif_running(ndev))
> + return 0;
!ndev cannot happen (device should not be suspended before end of
probe). If it can, there is a bug which you should not silently ignore.
> +
> + netif_device_detach(ndev);
> +
> + netif_stop_queue(ndev);
> +
> + down(&ax_local->spi_lock);
> +
> + power = ax88796c_check_power_and_wake(ax_local);
> +
> + AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
> + ax88796c_free_skb_queue(&ax_local->tx_wait_q);
> +
> + if (ax_local->wol) {
> +
> + AX_WRITE(&ax_local->ax_spi, 0, P5_WFTR);
> +
> + if (ax_local->wol & WFCR_LINKCH) { /* Link change */
> +
> + /* Disable wol power saving in link change mode */
> + AX_WRITE(&ax_local->ax_spi,
> + (AX_READ(&ax_local->ax_spi, P0_PSCR)
> + & ~PSCR_WOLPS), P0_PSCR);
> +
> + if (netif_msg_wol(ax_local))
> + netdev_info(ndev,
> + "Enable link change wakeup\n");
> +
> + AX_WRITE(&ax_local->ax_spi, WFTR_8192MS, P5_WFTR);
> + }
> + if (ax_local->wol & WFCR_MAGICP) { /* Magic packet */
> + if (netif_msg_wol(ax_local))
> + netdev_info(ndev,
> + "Enable magic packet wakeup\n");
> + }
> +
> + AX_WRITE(&ax_local->ax_spi,
> + ax_local->wol | WFCR_WAKEUP | WFCR_PMEEN, P0_WFCR);
> + }
> +
> + if (power)
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + up(&ax_local->spi_lock);
> +
> + return 0;
> +}
> +
> +static int
> +ax88796c_resume(struct spi_device *spi)
> +{
> + struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
> + struct net_device *ndev = ax_local->ndev;
> + u16 pme;
> +
> + down(&ax_local->spi_lock);
> +
> + /* Wakeup AX88796C first */
> + ax88796c_check_power_and_wake(ax_local);
> + msleep(200);
> +
> + pme = AX_READ(&ax_local->ax_spi, P0_WFCR);
> + if (ax_local->wol && ~(pme & WFCR_WAITEVENT)) {
> +
> + if (pme & WFCR_LINKCHS) {
> + if (netif_msg_wol(ax_local))
> + netdev_info(ndev,
> + "Wakeuped from link change.\n");
> + } else if (pme & WFCR_MAGICPS) {
> + if (netif_msg_wol(ax_local))
> + netdev_info(ndev,
> + "Wakeuped from magic packet.\n");
> + }
> +
> + AX_WRITE(&ax_local->ax_spi, WFCR_CLRWAKE, P0_WFCR);
> + }
> +
> + netif_device_attach(ndev);
> +
> + /* Initialize all the local variables*/
> + ax88796c_soft_reset(ax_local);
> +
> + ax_local->seq_num = 0x1f;
> +
> + ax88796c_set_mac_addr(ndev);
> + ax88796c_set_csums(ax_local);
> +
> + /* Disable stuffing packet */
> + AX_WRITE(&ax_local->ax_spi,
> + AX_READ(&ax_local->ax_spi, P1_RXBSPCR)
> + & ~RXBSPCR_STUF_ENABLE, P1_RXBSPCR);
> +
> + /* Enable RX packet process */
> + AX_WRITE(&ax_local->ax_spi, RPPER_RXEN, P1_RPPER);
> +
> + AX_WRITE(&ax_local->ax_spi,
> + AX_READ(&ax_local->ax_spi, P0_FER)
> + | FER_RXEN | FER_TXEN | FER_BSWAP, P0_FER);
> +
> + ax88796c_phy_init(ax_local);
> +
> + AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
> +
> + if (netif_msg_hw(ax_local)) {
> + netdev_info(ndev,
> + "Dump all MAC registers after initialization:\n");
> + ax88796c_dump_regs(ax_local);
> + ax88796c_dump_phy_regs(ax_local);
> + }
> +
> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
> +
> + netif_start_queue(ndev);
> +
> + up(&ax_local->spi_lock);
> +
> + return 0;
> +}
> +
> +static int ax88796c_remove(struct spi_device *spi)
> +{
> + struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
> + struct net_device *ndev = ax_local->ndev;
> +
> + if (netif_msg_probe(ax_local))
> + netdev_info(ndev, "removing network device %s %s\n",
> + dev_driver_string(&spi->dev),
> + dev_name(&spi->dev));
> +
> + destroy_workqueue(ax_local->ax_work_queue);
> +
> + unregister_netdev(ndev);
> +
> + if (netif_msg_probe(ax_local))
> + dev_info(&spi->dev, "device removed\n");
> +
> + return 0;
> +}
> +
> +#ifdef CONFIG_USE_OF
#ifdef should not be needed.
> +static const struct of_device_id ax88796c_dt_ids[] = {
> + { .compatible = "asix,ax88796c" },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, ax88796c_dt_ids);
> +#endif
> +
> +static const struct spi_device_id asix_id[] = {
> + { "ax88796c", 0 },
> + { }
> +};
> +MODULE_DEVICE_TABLE(spi, asix_id);
> +
> +static struct spi_driver ax88796c_spi_driver = {
> + .driver = {
> + .name = DRV_NAME,
> + .owner = THIS_MODULE,
No need for owner.
> +#ifdef CONFIG_USE_OF
> + .of_match_table = of_match_ptr(ax88796c_dt_ids),
> +#endif
No need for ifdef.
> + },
> + .probe = ax88796c_probe,
> + .remove = ax88796c_remove,
> +// .suspend = ax88796c_suspend,
> +// .resume = ax88796c_resume,
?
> + .id_table = asix_id,
> +};
> +
> +static __init int ax88796c_spi_init(void)
> +{
> + pr_info("Register AX88796C SPI Ethernet Driver.\n");
No, no printing of driver inits. It will bother everyone in the world.
This all should be just module driver, no init/exit.
> + return spi_register_driver(&ax88796c_spi_driver);
> +}
> +
> +static __exit void ax88796c_spi_exit(void)
> +{
> + spi_unregister_driver(&ax88796c_spi_driver);
> +}
> +
> +module_init(ax88796c_spi_init);
> +module_exit(ax88796c_spi_exit);
> diff --git a/drivers/net/ethernet/asix/ax88796c_main.h b/drivers/net/ethernet/asix/ax88796c_main.h
> new file mode 100644
> index 000000000000..6c61766b1788
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/ax88796c_main.h
> @@ -0,0 +1,596 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2010 ASIX Electronics Corporation
> + * Copyright (c) 2020 Samsung Electronics
> + *
> + * ASIX AX88796C SPI Fast Ethernet Linux driver
> + */
> +
> +#ifndef _AX88796C_MAIN_H
> +#define _AX88796C_MAIN_H
> +
> +#define pr_fmt(fmt) "ax88796c: " fmt
> +
> +/* INCLUDE FILE DECLARATIONS */
> +#ifdef CONFIG_USE_OF
No ifdef.
> +#include <linux/of.h>
> +#endif
> +#include <linux/crc32.h>
> +#include <linux/etherdevice.h>
> +#include <linux/ethtool.h>
> +#include <linux/gpio/consumer.h>
> +#include <linux/init.h>
> +#include <linux/io.h>
> +#include <linux/kmod.h>
> +#include <linux/mii.h>
> +#include <linux/module.h>
> +#include <linux/netdevice.h>
> +#include <linux/platform_device.h>
> +#include <linux/sched.h>
> +#include <linux/spi/spi.h>
> +#include <linux/timer.h>
> +#include <linux/uaccess.h>
> +#include <linux/usb.h>
> +#include <linux/version.h>
> +#include <linux/workqueue.h>
All of these should be removed except the headers used directly in this
header.
> +
> +#include <asm/dma.h>
> +
> +#include "ax88796c_spi.h"
> +
> +/* NAMING CONSTANT AND TYPE DECLARATIONS */
> +/* These identify the driver base version and may not be removed. */
> +#define DRV_NAME "ax88796c"
> +#define ADP_NAME "ASIX AX88796C SPI Ethernet Adapter"
> +#define DRV_VERSION "1.2.0"
> +
> +#define TX_QUEUE_HIGH_WATER 45 /* Tx queue high water mark */
> +#define TX_QUEUE_LOW_WATER 20 /* Tx queue low water mark */
> +
> +#define AX88796C_WATCHDOG_PERIOD (1 * HZ)
> +#define AX88796C_WATCHDOG_RESTART 7
> +
> +#define TX_OVERHEAD 8
> +#define TX_EOP_SIZE 4
> +
> +#define AX_MCAST_FILTER_SIZE 8
> +#define AX_MAX_MCAST 64
> +#define AX_MAX_CLK 80000000
> +#define TX_HDR_SOP_DICF 0x8000
> +#define TX_HDR_SOP_CPHI 0x4000
> +#define TX_HDR_SOP_INT 0x2000
> +#define TX_HDR_SOP_MDEQ 0x1000
> +#define TX_HDR_SOP_PKTLEN 0x07FF
> +#define TX_HDR_SOP_SEQNUM 0xF800
> +#define TX_HDR_SOP_PKTLENBAR 0x07FF
> +
> +#define TX_HDR_SEG_FS 0x8000
> +#define TX_HDR_SEG_LS 0x4000
> +#define TX_HDR_SEG_SEGNUM 0x3800
> +#define TX_HDR_SEG_SEGLEN 0x0700
> +#define TX_HDR_SEG_EOFST 0xC000
> +#define TX_HDR_SEG_SOFST 0x3800
> +#define TX_HDR_SEG_SEGLENBAR 0x07FF
> +
> +#define TX_HDR_EOP_SEQNUM 0xF800
> +#define TX_HDR_EOP_PKTLEN 0x07FF
> +#define TX_HDR_EOP_SEQNUMBAR 0xF800
> +#define TX_HDR_EOP_PKTLENBAR 0x07FF
> +
> +/* Rx header fields mask */
> +#define RX_HDR1_MCBC 0x8000
> +#define RX_HDR1_STUFF_PKT 0x4000
> +#define RX_HDR1_MII_ERR 0x2000
> +#define RX_HDR1_CRC_ERR 0x1000
> +#define RX_HDR1_PKT_LEN 0x07FF
> +
> +#define RX_HDR2_SEQ_NUM 0xF800
> +#define RX_HDR2_PKT_LEN_BAR 0x7FFF
> +
> +#define RX_HDR3_PE 0x8000
> +#define RX_HDR3_L4_TYPE_TCP 0x1000
> +#define RX_HDR3_L4_TYPE_UDP 0x0400
> +#define RX_HDR3_L3_ERR 0x0200
> +#define RX_HDR3_L4_ERR 0x0100
> +#define RX_HDR3_PRIORITY(x) ((x) << 4)
> +#define RX_HDR3_STRIP 0x0008
> +#define RX_HDR3_VLAN_ID 0x0007
> +
> +#define AX_RX_CHECKSUM 1
> +#define AX_TX_CHECKSUM 2
> +
> +enum watchdog_state {
> + chk_link = 0,
> + chk_cable,
> + ax_nop,
> +};
> +
> +struct ax88796c_device {
> +
> + struct resource *addr_res; /* resources found */
> + struct resource *addr_req; /* resources requested */
> + struct resource *irq_res;
> +
> + struct spi_device *spi;
> + struct net_device *ndev;
> + struct mii_if_info mii;
> + struct net_device_stats stats;
> +
> + struct timer_list watchdog;
> + enum watchdog_state w_state;
> + size_t w_ticks;
> +
> + struct work_struct ax_work;
> + struct workqueue_struct *ax_work_queue;
> + struct tasklet_struct bh;
> +
> + struct semaphore spi_lock;
> +
> + struct sk_buff_head tx_wait_q;
> +
> + struct axspi_data ax_spi;
> +
> + int msg_enable;
> +
> + u16 seq_num;
> +
> + u16 wol;
> +
> + u8 checksum;
> +
> + u8 multi_filter[AX_MCAST_FILTER_SIZE];
> +
> + unsigned long capabilities;
> + #define AX_CAP_DMA 1
> + #define AX_CAP_COMP 2
> + #define AX_CAP_BIDIR 4
> +
> + u8 plat_endian;
> + #define PLAT_LITTLE_ENDIAN 0
> + #define PLAT_BIG_ENDIAN 1
> +
> + unsigned long flags;
> + #define EVENT_INTR 1
> + #define EVENT_TX 2
> + #define EVENT_SET_MULTI 4
> + #define EVENT_WATCHDOG 8
> +
> + u8 ps_level;
> + #define AX_PS_D0 0
> + #define AX_PS_D1 1
> + #define AX_PS_D2 2
> +
> +
> +};
> +
> +#define to_ax88796c_device(ndev) ((struct ax88796c_device *)netdev_priv(ndev))
> +
> +enum skb_state {
> + illegal = 0,
> + tx_done,
> + rx_done,
> + rx_err,
> +};
> +
> +struct skb_data;
> +
> +struct skb_data {
> + enum skb_state state;
> + struct net_device *ndev;
> + struct sk_buff *skb;
> + size_t len;
> + dma_addr_t phy_addr;
> +};
> +
> +/* A88796C register definition */
> + /* Definition of PAGE0 */
> +#define P0_PSR (0x00)
> + #define PSR_DEV_READY (1 << 7)
> + #define PSR_RESET (0 << 15)
> + #define PSR_RESET_CLR (1 << 15)
> +#define P0_BOR (0x02)
> +#define P0_FER (0x04)
> + #define FER_IPALM (1 << 0)
> + #define FER_DCRC (1 << 1)
> + #define FER_RH3M (1 << 2)
> + #define FER_HEADERSWAP (1 << 7)
> + #define FER_WSWAP (1 << 8)
> + #define FER_BSWAP (1 << 9)
> + #define FER_INTHI (1 << 10)
> + #define FER_INTLO (0 << 10)
> + #define FER_IRQ_PULL (1 << 11)
> + #define FER_RXEN (1 << 14)
> + #define FER_TXEN (1 << 15)
> +#define P0_ISR (0x06)
> + #define ISR_RXPKT (1 << 0)
> + #define ISR_MDQ (1 << 4)
> + #define ISR_TXT (1 << 5)
> + #define ISR_TXPAGES (1 << 6)
> + #define ISR_TXERR (1 << 8)
> + #define ISR_LINK (1 << 9)
> +#define P0_IMR (0x08)
> + #define IMR_RXPKT (1 << 0)
> + #define IMR_MDQ (1 << 4)
> + #define IMR_TXT (1 << 5)
> + #define IMR_TXPAGES (1 << 6)
> + #define IMR_TXERR (1 << 8)
> + #define IMR_LINK (1 << 9)
> + #define IMR_MASKALL (0xFFFF)
> + #define IMR_DEFAULT (IMR_TXERR)
> +#define P0_WFCR (0x0A)
> + #define WFCR_PMEIND (1 << 0) /* PME indication */
> + #define WFCR_PMETYPE (1 << 1) /* PME I/O type */
> + #define WFCR_PMEPOL (1 << 2) /* PME polarity */
> + #define WFCR_PMERST (1 << 3) /* Reset PME */
> + #define WFCR_SLEEP (1 << 4) /* Enable sleep mode */
> + #define WFCR_WAKEUP (1 << 5) /* Enable wakeup mode */
> + #define WFCR_WAITEVENT (1 << 6) /* Reserved */
> + #define WFCR_CLRWAKE (1 << 7) /* Clear wakeup */
> + #define WFCR_LINKCH (1 << 8) /* Enable link change */
> + #define WFCR_MAGICP (1 << 9) /* Enable magic packet */
> + #define WFCR_WAKEF (1 << 10) /* Enable wakeup frame */
> + #define WFCR_PMEEN (1 << 11) /* Enable PME pin */
> + #define WFCR_LINKCHS (1 << 12) /* Link change status */
> + #define WFCR_MAGICPS (1 << 13) /* Magic packet status */
> + #define WFCR_WAKEFS (1 << 14) /* Wakeup frame status */
> + #define WFCR_PMES (1 << 15) /* PME pin status */
> +#define P0_PSCR (0x0C)
> + #define PSCR_PS_MASK (0xFFF0)
> + #define PSCR_PS_D0 (0)
> + #define PSCR_PS_D1 (1 << 0)
> + #define PSCR_PS_D2 (1 << 1)
> + #define PSCR_FPS (1 << 3) /* Enable fiber mode PS */
> + #define PSCR_SWPS (1 << 4) /* Enable software */
> + /* PS control */
> + #define PSCR_WOLPS (1 << 5) /* Enable WOL PS */
> + #define PSCR_SWWOL (1 << 6) /* Enable software select */
> + /* WOL PS */
> + #define PSCR_PHYOSC (1 << 7) /* Internal PHY OSC control */
> + #define PSCR_FOFEF (1 << 8) /* Force PHY generate FEF */
> + #define PSCR_FOF (1 << 9) /* Force PHY in fiber mode */
> + #define PSCR_PHYPD (1 << 10) /* PHY power down. */
> + /* Active high */
> + #define PSCR_PHYRST (1 << 11) /* PHY reset signal. */
> + /* Active low */
> + #define PSCR_PHYCSIL (1 << 12) /* PHY cable energy detect */
> + #define PSCR_PHYCOFF (1 << 13) /* PHY cable off */
> + #define PSCR_PHYLINK (1 << 14) /* PHY link status */
> + #define PSCR_EEPOK (1 << 15) /* EEPROM load complete */
> +#define P0_MACCR (0x0E)
> + #define MACCR_RXFC_ENABLE (1 << 3)
> + #define MACCR_RXFC_MASK 0xFFF7
> + #define MACCR_TXFC_ENABLE (1 << 4)
> + #define MACCR_TXFC_MASK 0xFFEF
> + #define MACCR_PF (1 << 7)
> + #define MACCR_PMM_BITS 8
> + #define MACCR_PMM_MASK (0x1F00)
> + #define MACCR_PMM_RESET (1 << 8)
> + #define MACCR_PMM_WAIT (2 << 8)
> + #define MACCR_PMM_READY (3 << 8)
> + #define MACCR_PMM_D1 (4 << 8)
> + #define MACCR_PMM_D2 (5 << 8)
> + #define MACCR_PMM_WAKE (7 << 8)
> + #define MACCR_PMM_D1_WAKE (8 << 8)
> + #define MACCR_PMM_D2_WAKE (9 << 8)
> + #define MACCR_PMM_SLEEP (10 << 8)
> + #define MACCR_PMM_PHY_RESET (11 << 8)
> + #define MACCR_PMM_SOFT_D1 (16 << 8)
> + #define MACCR_PMM_SOFT_D2 (17 << 8)
> +#define P0_TFBFCR (0x10)
> + #define TFBFCR_SCHE_FREE_PAGE 0xE07F
> + #define TFBFCR_FREE_PAGE_BITS 0x07
> + #define TFBFCR_FREE_PAGE_LATCH (1 << 6)
> + #define TFBFCR_SET_FREE_PAGE(x) ((x & 0x3F) << TFBFCR_FREE_PAGE_BITS)
> + #define TFBFCR_TX_PAGE_SET (1 << 13)
> + #define TFBFCR_MANU_ENTX (1 << 15)
> + #define TX_FREEBUF_MASK 0x003F
> + #define TX_DPTSTART 0x4000
> +
> +#define P0_TSNR (0x12)
> + #define TXNR_TXB_ERR (1 << 5)
> + #define TXNR_TXB_IDLE (1 << 6)
> + #define TSNR_PKT_CNT(x) (((x) & 0x3F) << 8)
> + #define TXNR_TXB_REINIT (1 << 14)
> + #define TSNR_TXB_START (1 << 15)
> +#define P0_RTDPR (0x14)
> +#define P0_RXBCR1 (0x16)
> + #define RXBCR1_RXB_DISCARD (1 << 14)
> + #define RXBCR1_RXB_START (1 << 15)
> +#define P0_RXBCR2 (0x18)
> + #define RXBCR2_PKT_MASK (0xFF)
> + #define RXBCR2_RXPC_MASK (0x7F)
> + #define RXBCR2_RXB_READY (1 << 13)
> + #define RXBCR2_RXB_IDLE (1 << 14)
> + #define RXBCR2_RXB_REINIT (1 << 15)
> +#define P0_RTWCR (0x1A)
> + #define RTWCR_RXWC_MASK (0x3FFF)
> + #define RTWCR_RX_LATCH (1 << 15)
> +#define P0_RCPHR (0x1C)
> +
> + /* Definition of PAGE1 */
> +#define P1_RPPER (0x22)
> + #define RPPER_RXEN (1 << 0)
> +#define P1_MRCR (0x28)
> +#define P1_MDR (0x2A)
> +#define P1_RMPR (0x2C)
> +#define P1_TMPR (0x2E)
> +#define P1_RXBSPCR (0x30)
> + #define RXBSPCR_STUF_WORD_CNT(x) (((x) & 0x7000) >> 12)
> + #define RXBSPCR_STUF_ENABLE (1 << 15)
> +#define P1_MCR (0x32)
> + #define MCR_SBP (1 << 8)
> + #define MCR_SM (1 << 9)
> + #define MCR_CRCENLAN (1 << 11)
> + #define MCR_STP (1 << 12)
> + /* Definition of PAGE2 */
> +#define P2_CIR (0x42)
> +#define P2_POOLCR (0x44)
> + #define POOLCR_POLL_EN (1 << 0)
> + #define POOLCR_POLL_FLOWCTRL (1 << 1)
> + #define POOLCR_POLL_BMCR (1 << 2)
> + #define POOLCR_PHYID(x) ((x) << 8)
> +#define P2_PHYSR (0x46)
> +#define P2_MDIODR (0x48)
> +#define P2_MDIOCR (0x4A)
> + #define MDIOCR_RADDR(x) ((x) & 0x1F)
> + #define MDIOCR_FADDR(x) (((x) & 0x1F) << 8)
> + #define MDIOCR_VALID (1 << 13)
> + #define MDIOCR_READ (1 << 14)
> + #define MDIOCR_WRITE (1 << 15)
> +#define P2_LCR0 (0x4C)
> + #define LCR_LED0_EN (1 << 0)
> + #define LCR_LED0_100MODE (1 << 1)
> + #define LCR_LED0_DUPLEX (1 << 2)
> + #define LCR_LED0_LINK (1 << 3)
> + #define LCR_LED0_ACT (1 << 4)
> + #define LCR_LED0_COL (1 << 5)
> + #define LCR_LED0_10MODE (1 << 6)
> + #define LCR_LED0_DUPCOL (1 << 7)
> + #define LCR_LED1_EN (1 << 8)
> + #define LCR_LED1_100MODE (1 << 9)
> + #define LCR_LED1_DUPLEX (1 << 10)
> + #define LCR_LED1_LINK (1 << 11)
> + #define LCR_LED1_ACT (1 << 12)
> + #define LCR_LED1_COL (1 << 13)
> + #define LCR_LED1_10MODE (1 << 14)
> + #define LCR_LED1_DUPCOL (1 << 15)
> +#define P2_LCR1 (0x4E)
> + #define LCR_LED2_MASK (0xFF00)
> + #define LCR_LED2_EN (1 << 0)
> + #define LCR_LED2_100MODE (1 << 1)
> + #define LCR_LED2_DUPLEX (1 << 2)
> + #define LCR_LED2_LINK (1 << 3)
> + #define LCR_LED2_ACT (1 << 4)
> + #define LCR_LED2_COL (1 << 5)
> + #define LCR_LED2_10MODE (1 << 6)
> + #define LCR_LED2_DUPCOL (1 << 7)
> +#define P2_IPGCR (0x50)
> +#define P2_CRIR (0x52)
> +#define P2_FLHWCR (0x54)
> +#define P2_RXCR (0x56)
> + #define RXCR_PRO (1 << 0)
> + #define RXCR_AMALL (1 << 1)
> + #define RXCR_SEP (1 << 2)
> + #define RXCR_AB (1 << 3)
> + #define RXCR_AM (1 << 4)
> + #define RXCR_AP (1 << 5)
> + #define RXCR_ARP (1 << 6)
> +#define P2_JLCR (0x58)
> +#define P2_MPLR (0x5C)
> +
> + /* Definition of PAGE3 */
> +#define P3_MACASR0 (0x62)
> + #define P3_MACASR(x) (P3_MACASR0 + 2*x)
> + #define MACASR_LOWBYTE_MASK 0x00FF
> + #define MACASR_HIGH_BITS 0x08
> +#define P3_MACASR1 (0x64)
> +#define P3_MACASR2 (0x66)
> +#define P3_MFAR01 (0x68)
> +#define P3_MFAR_BASE (0x68)
> + #define P3_MFAR(x) (P3_MFAR_BASE + 2*x)
> +
> +#define P3_MFAR23 (0x6A)
> +#define P3_MFAR45 (0x6C)
> +#define P3_MFAR67 (0x6E)
> +#define P3_VID0FR (0x70)
> +#define P3_VID1FR (0x72)
> +#define P3_EECSR (0x74)
> +#define P3_EEDR (0x76)
> +#define P3_EECR (0x78)
> + #define EECR_ADDR_MASK (0x00FF)
> + #define EECR_READ_ACT (1 << 8)
> + #define EECR_WRITE_ACT (1 << 9)
> + #define EECR_WRITE_DISABLE (1 << 10)
> + #define EECR_WRITE_ENABLE (1 << 11)
> + #define EECR_EE_READY (1 << 13)
> + #define EECR_RELOAD (1 << 14)
> + #define EECR_RESET (1 << 15)
> +#define P3_TPCR (0x7A)
> + #define TPCR_PATT_MASK (0xFF)
> + #define TPCR_RAND_PKT_EN (1 << 14)
> + #define TPCR_FIXED_PKT_EN (1 << 15)
> +#define P3_TPLR (0x7C)
> + /* Definition of PAGE4 */
> +#define P4_SPICR (0x8A)
> + #define SPICR_RCEN (1 << 0)
> + #define SPICR_QCEN (1 << 1)
> + #define SPICR_RBRE (1 << 3)
> + #define SPICR_PMM (1 << 4)
> + #define SPICR_LOOPBACK (1 << 8)
> + #define SPICR_CORE_RES_CLR (1 << 10)
> + #define SPICR_SPI_RES_CLR (1 << 11)
> +#define P4_SPIISMR (0x8C)
> +
> +#define P4_COERCR0 (0x92)
> + #define COERCR0_RXIPCE (1 << 0)
> + #define COERCR0_RXIPVE (1 << 1)
> + #define COERCR0_RXV6PE (1 << 2)
> + #define COERCR0_RXTCPE (1 << 3)
> + #define COERCR0_RXUDPE (1 << 4)
> + #define COERCR0_RXICMP (1 << 5)
> + #define COERCR0_RXIGMP (1 << 6)
> + #define COERCR0_RXICV6 (1 << 7)
> +
> + #define COERCR0_RXTCPV6 (1 << 8)
> + #define COERCR0_RXUDPV6 (1 << 9)
> + #define COERCR0_RXICMV6 (1 << 10)
> + #define COERCR0_RXIGMV6 (1 << 11)
> + #define COERCR0_RXICV6V6 (1 << 12)
> +
> + #define COERCR0_DEFAULT (COERCR0_RXIPCE | COERCR0_RXV6PE | \
> + COERCR0_RXTCPE | COERCR0_RXUDPE | \
> + COERCR0_RXTCPV6 | COERCR0_RXUDPV6)
> +#define P4_COERCR1 (0x94)
> + #define COERCR1_IPCEDP (1 << 0)
> + #define COERCR1_IPVEDP (1 << 1)
> + #define COERCR1_V6VEDP (1 << 2)
> + #define COERCR1_TCPEDP (1 << 3)
> + #define COERCR1_UDPEDP (1 << 4)
> + #define COERCR1_ICMPDP (1 << 5)
> + #define COERCR1_IGMPDP (1 << 6)
> + #define COERCR1_ICV6DP (1 << 7)
> + #define COERCR1_RX64TE (1 << 8)
> + #define COERCR1_RXPPPE (1 << 9)
> + #define COERCR1_TCP6DP (1 << 10)
> + #define COERCR1_UDP6DP (1 << 11)
> + #define COERCR1_IC6DP (1 << 12)
> + #define COERCR1_IG6DP (1 << 13)
> + #define COERCR1_ICV66DP (1 << 14)
> + #define COERCR1_RPCE (1 << 15)
> +
> + #define COERCR1_DEFAULT (COERCR1_RXPPPE)
> +#define P4_COETCR0 (0x96)
> + #define COETCR0_TXIP (1 << 0)
> + #define COETCR0_TXTCP (1 << 1)
> + #define COETCR0_TXUDP (1 << 2)
> + #define COETCR0_TXICMP (1 << 3)
> + #define COETCR0_TXIGMP (1 << 4)
> + #define COETCR0_TXICV6 (1 << 5)
> + #define COETCR0_TXTCPV6 (1 << 8)
> + #define COETCR0_TXUDPV6 (1 << 9)
> + #define COETCR0_TXICMV6 (1 << 10)
> + #define COETCR0_TXIGMV6 (1 << 11)
> + #define COETCR0_TXICV6V6 (1 << 12)
> +
> + #define COETCR0_DEFAULT (COETCR0_TXIP | COETCR0_TXTCP | \
> + COETCR0_TXUDP | COETCR0_TXTCPV6 | \
> + COETCR0_TXUDPV6)
> +#define P4_COETCR1 (0x98)
> + #define COETCR1_TX64TE (1 << 0)
> + #define COETCR1_TXPPPE (1 << 1)
> +
> +#define P4_COECEDR (0x9A)
> +#define P4_L2CECR (0x9C)
> +
> + /* Definition of PAGE5 */
> +#define P5_WFTR (0xA2)
> + #define WFTR_2MS (0x01)
> + #define WFTR_4MS (0x02)
> + #define WFTR_8MS (0x03)
> + #define WFTR_16MS (0x04)
> + #define WFTR_32MS (0x05)
> + #define WFTR_64MS (0x06)
> + #define WFTR_128MS (0x07)
> + #define WFTR_256MS (0x08)
> + #define WFTR_512MS (0x09)
> + #define WFTR_1024MS (0x0A)
> + #define WFTR_2048MS (0x0B)
> + #define WFTR_4096MS (0x0C)
> + #define WFTR_8192MS (0x0D)
> + #define WFTR_16384MS (0x0E)
> + #define WFTR_32768MS (0x0F)
> +#define P5_WFCCR (0xA4)
> +#define P5_WFCR03 (0xA6)
> + #define WFCR03_F0_EN (1 << 0)
> + #define WFCR03_F1_EN (1 << 4)
> + #define WFCR03_F2_EN (1 << 8)
> + #define WFCR03_F3_EN (1 << 12)
> +#define P5_WFCR47 (0xA8)
> + #define WFCR47_F4_EN (1 << 0)
> + #define WFCR47_F5_EN (1 << 4)
> + #define WFCR47_F6_EN (1 << 8)
> + #define WFCR47_F7_EN (1 << 12)
> +#define P5_WF0BMR0 (0xAA)
> +#define P5_WF0BMR1 (0xAC)
> +#define P5_WF0CR (0xAE)
> +#define P5_WF0OBR (0xB0)
> +#define P5_WF1BMR0 (0xB2)
> +#define P5_WF1BMR1 (0xB4)
> +#define P5_WF1CR (0xB6)
> +#define P5_WF1OBR (0xB8)
> +#define P5_WF2BMR0 (0xBA)
> +#define P5_WF2BMR1 (0xBC)
> +
> + /* Definition of PAGE6 */
> +#define P6_WF2CR (0xC2)
> +#define P6_WF2OBR (0xC4)
> +#define P6_WF3BMR0 (0xC6)
> +#define P6_WF3BMR1 (0xC8)
> +#define P6_WF3CR (0xCA)
> +#define P6_WF3OBR (0xCC)
> +#define P6_WF4BMR0 (0xCE)
> +#define P6_WF4BMR1 (0xD0)
> +#define P6_WF4CR (0xD2)
> +#define P6_WF4OBR (0xD4)
> +#define P6_WF5BMR0 (0xD6)
> +#define P6_WF5BMR1 (0xD8)
> +#define P6_WF5CR (0xDA)
> +#define P6_WF5OBR (0xDC)
> +
> +/* Definition of PAGE7 */
> +#define P7_WF6BMR0 (0xE2)
> +#define P7_WF6BMR1 (0xE4)
> +#define P7_WF6CR (0xE6)
> +#define P7_WF6OBR (0xE8)
> +#define P7_WF7BMR0 (0xEA)
> +#define P7_WF7BMR1 (0xEC)
> +#define P7_WF7CR (0xEE)
> +#define P7_WF7OBR (0xF0)
> +#define P7_WFR01 (0xF2)
> +#define P7_WFR23 (0xF4)
> +#define P7_WFR45 (0xF6)
> +#define P7_WFR67 (0xF8)
> +#define P7_WFPC0 (0xFA)
> +#define P7_WFPC1 (0xFC)
> +
> +
> +/* Tx headers structure */
> +struct tx_sop_header {
> + /* bit 15-11: flags, bit 10-0: packet length */
> + u16 flags_len;
> + /* bit 15-11: sequence number, bit 11-0: packet length bar */
> + u16 seq_lenbar;
> +} __packed;
> +
> +struct tx_segment_header {
> + /* bit 15-14: flags, bit 13-11: segment number */
> + /* bit 10-0: segment length */
> + u16 flags_seqnum_seglen;
> + /* bit 15-14: end offset, bit 13-11: start offset */
> + /* bit 10-0: segment length bar */
> + u16 eo_so_seglenbar;
> +} __packed;
> +
> +struct tx_eop_header {
> + /* bit 15-11: sequence number, bit 10-0: packet length */
> + u16 seq_len;
> + /* bit 15-11: sequence number bar, bit 10-0: packet length bar */
> + u16 seqbar_lenbar;
> +} __packed;
> +
> +struct tx_pkt_info {
> + struct tx_sop_header sop;
> + struct tx_segment_header seg;
> + struct tx_eop_header eop;
> + u16 pkt_len;
> + u16 seq_num;
> +} __packed;
> +
> +/* Rx headers structure */
> +struct rx_header {
> + u16 flags_len;
> + u16 seq_lenbar;
> + u16 flags;
> +} __packed;
> +
> +#endif /* #ifndef _AX88796C_MAIN_H */
> diff --git a/drivers/net/ethernet/asix/ax88796c_spi.c b/drivers/net/ethernet/asix/ax88796c_spi.c
> new file mode 100644
> index 000000000000..5304eb33aad2
> --- /dev/null
> +++ b/drivers/net/ethernet/asix/ax88796c_spi.c
> @@ -0,0 +1,103 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2010 ASIX Electronics Corporation
> + *
> + * ASIX AX88796C SPI Fast Ethernet Linux driver
> + */
> +
> +#include "ax88796c_main.h"
> +#include "ax88796c_spi.h"
> +
> +/* driver bus management functions */
> +void axspi_wakeup(struct axspi_data *ax_spi)
> +{
> + u8 tx_buf;
> + int ret;
> +
> + tx_buf = AX_SPICMD_EXIT_PWD; /* OP */
> + ret = spi_write(ax_spi->spi, &tx_buf, 1);
> + if (ret)
> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
> +}
> +
> +void axspi_read_status(struct axspi_data *ax_spi, struct spi_status *status)
> +{
> + u8 tx_buf;
> + int ret;
> +
> + /* OP */
> + tx_buf = AX_SPICMD_READ_STATUS;
> + ret = spi_write_then_read(ax_spi->spi, &tx_buf, 1, (u8 *)&status, 3);
> + if (ret)
> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
> + else
> + le16_to_cpus(&status->isr);
> +}
> +
> +int axspi_read_rxq(struct axspi_data *ax_spi, void *data, int len)
> +{
> + struct spi_transfer *xfer = ax_spi->spi_rx_xfer;
> + int ret;
> +
> + memcpy(ax_spi->cmd_buf, rx_cmd_buf, 5);
> +
> + xfer->tx_buf = ax_spi->cmd_buf;
> + xfer->rx_buf = NULL;
> + xfer->len = ax_spi->comp ? 2 : 5;
> + xfer->bits_per_word = 8;
> + spi_message_add_tail(xfer, &ax_spi->rx_msg);
> +
> + xfer++;
> + xfer->rx_buf = data;
> + xfer->tx_buf = NULL;
> + xfer->len = len;
> + xfer->bits_per_word = 8;
> + spi_message_add_tail(xfer, &ax_spi->rx_msg);
> + ret = spi_sync(ax_spi->spi, &ax_spi->rx_msg);
> + if (ret)
> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
> +
> + return ret;
> +}
> +
> +int axspi_write_txq(struct axspi_data *ax_spi, void *data, int len)
> +{
> + return spi_write(ax_spi->spi, data, len);
> +}
> +
> +u16 axspi_read_reg(struct axspi_data *ax_spi, u8 reg)
> +{
> + u8 tx_buf[4];
> + u16 rx_buf = 0;
> + int ret;
> + int len = ax_spi->comp ? 3 : 4;
> +
> + tx_buf[0] = 0x03; /* OP code read register */
> + tx_buf[1] = reg; /* register address */
> + tx_buf[2] = 0xFF; /* dumy cycle */
> + tx_buf[3] = 0xFF; /* dumy cycle */
> + ret = spi_write_then_read(ax_spi->spi, tx_buf, len, (u8 *)&rx_buf, 2);
> + if (ret)
> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
> + else
> + le16_to_cpus(&rx_buf);
> +
> + return rx_buf;
> +}
> +
> +void axspi_write_reg(struct axspi_data *ax_spi, u8 reg, u16 value)
> +{
> + u8 tx_buf[4];
> + int ret;
> +
> + tx_buf[0] = AX_SPICMD_WRITE_REG; /* OP code read register */
> + tx_buf[1] = reg; /* register address */
> + tx_buf[2] = value;
> + tx_buf[3] = value >> 8;
> +
> + ret = spi_write(ax_spi->spi, tx_buf, 4);
> + if (ret)
> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
> +
Run the checkpatch string and fix almost all issues (except ones you
disagree).
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-25 18:44 ` Krzysztof Kozlowski
@ 2020-08-26 14:59 ` Lukasz Stelmach
-1 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-08-26 14:59 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: David S. Miller, Jakub Kicinski, Kukjin Kim, Rob Herring,
Russell King, linux-arm-kernel, linux-kernel, linux-samsung-soc,
netdev, devicetree, m.szyprowski, b.zolnierkie
[-- Attachment #1: Type: text/plain, Size: 82619 bytes --]
It was <2020-08-25 wto 20:44>, when Krzysztof Kozlowski wrote:
> On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
>> ASIX AX88796[1] is a versatile ethernet adapter chip, that can be
>> connected to a CPU with a 8/16-bit bus or with an SPI. This driver
>> supports SPI connection.
>>
>> The driver has been ported from the vendor kernel for ARTIK5[2]
>> boards. Several changes were made to adapt it to the current kernel
>> which include:
>>
>> + updated DT configuration,
>> + clock configuration moved to DT,
>> + new timer, ethtool and gpio APIs
>> + dev_* instead of pr_* and custom printk() wrappers.
>>
>> [1] https://protect2.fireeye.com/v1/url?k=074e9e9d-5a9dc212-074f15d2-0cc47a31ce52-0f896a3d08738907&q=1&e=bcaebfa2-4f00-46b6-a35d-096f39710f47&u=https%3A%2F%2Fwww.asix.com.tw%2Fproducts.php%3Fop%3DpItemdetail%26PItemID%3D104%3B65%3B86%26PLine%3D65
>> [2] https://protect2.fireeye.com/v1/url?k=553869ec-08eb3563-5539e2a3-0cc47a31ce52-fc42424019c6fd8f&q=1&e=bcaebfa2-4f00-46b6-a35d-096f39710f47&u=https%3A%2F%2Fgit.tizen.org%2Fcgit%2Fprofile%2Fcommon%2Fplatform%2Fkernel%2Flinux-3.10-artik%2F
>>
>> The other ax88796 driver is for NE2000 compatible AX88796L chip. These
>> chips are not compatible. Hence, two separate drivers are required.
>
> Hi,
>
> Thanks for the driver, nice work. Few comments below.
>
Thank you. I fixed most problems and asked some question where I didn't
understand.
>>
>> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
>> ---
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/asix/Kconfig | 20 +
>> drivers/net/ethernet/asix/Makefile | 6 +
>> drivers/net/ethernet/asix/ax88796c_ioctl.c | 293 +++++
>> drivers/net/ethernet/asix/ax88796c_ioctl.h | 21 +
>> drivers/net/ethernet/asix/ax88796c_main.c | 1373 ++++++++++++++++++++
>> drivers/net/ethernet/asix/ax88796c_main.h | 596 +++++++++
>> drivers/net/ethernet/asix/ax88796c_spi.c | 103 ++
>> drivers/net/ethernet/asix/ax88796c_spi.h | 67 +
>> 10 files changed, 2481 insertions(+)
>> create mode 100644 drivers/net/ethernet/asix/Kconfig
>> create mode 100644 drivers/net/ethernet/asix/Makefile
>> create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.c
>> create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.h
>> create mode 100644 drivers/net/ethernet/asix/ax88796c_main.c
>> create mode 100644 drivers/net/ethernet/asix/ax88796c_main.h
>> create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.c
>> create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.h
>>
>> diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
>> index de50e8b9e656..f3b218e45ea5 100644
>> --- a/drivers/net/ethernet/Kconfig
>> +++ b/drivers/net/ethernet/Kconfig
>> @@ -32,6 +32,7 @@ source "drivers/net/ethernet/apm/Kconfig"
>> source "drivers/net/ethernet/apple/Kconfig"
>> source "drivers/net/ethernet/aquantia/Kconfig"
>> source "drivers/net/ethernet/arc/Kconfig"
>> +source "drivers/net/ethernet/asix/Kconfig"
>> source "drivers/net/ethernet/atheros/Kconfig"
>> source "drivers/net/ethernet/aurora/Kconfig"
>> source "drivers/net/ethernet/broadcom/Kconfig"
>> diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
>> index f8f38dcb5f8a..9eb368d93607 100644
>> --- a/drivers/net/ethernet/Makefile
>> +++ b/drivers/net/ethernet/Makefile
>> @@ -18,6 +18,7 @@ obj-$(CONFIG_NET_XGENE) += apm/
>> obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
>> obj-$(CONFIG_NET_VENDOR_AQUANTIA) += aquantia/
>> obj-$(CONFIG_NET_VENDOR_ARC) += arc/
>> +obj-$(CONFIG_NET_VENDOR_ASIX) += asix/
>> obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
>> obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/
>> obj-$(CONFIG_NET_VENDOR_CADENCE) += cadence/
>> diff --git a/drivers/net/ethernet/asix/Kconfig b/drivers/net/ethernet/asix/Kconfig
>> new file mode 100644
>> index 000000000000..4b127a4a659a
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/Kconfig
>> @@ -0,0 +1,20 @@
>> +#
>> +# Asix network device configuration
>> +#
>> +
>> +config NET_VENDOR_ASIX
>> + bool "Asix devices"
>> + depends on SPI
>> + help
>> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
>
> Looks like too long, did it pass checkpatch?
Yes? Let me try again. Yes, this one passed, but I missed a few other
problems. Thank you.
>> +
>> +if NET_VENDOR_ASIX
>> +
>> +config SPI_AX88796C
>> + tristate "Asix AX88796C-SPI support"
>> + depends on SPI
>> + depends on GPIOLIB
>> + help
>> + Say Y here if you intend to attach a Asix AX88796C as SPI mode
>> +
>> +endif # NET_VENDOR_ASIX
>> diff --git a/drivers/net/ethernet/asix/Makefile b/drivers/net/ethernet/asix/Makefile
>> new file mode 100644
>> index 000000000000..0bfbbb042634
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/Makefile
>> @@ -0,0 +1,6 @@
>> +#
>> +# Makefile for the Asix network device drivers.
>> +#
>> +
>> +obj-$(CONFIG_SPI_AX88796C) += ax88796c.o
>> +ax88796c-y := ax88796c_main.o ax88796c_ioctl.o ax88796c_spi.o
>> diff --git a/drivers/net/ethernet/asix/ax88796c_ioctl.c b/drivers/net/ethernet/asix/ax88796c_ioctl.c
>> new file mode 100644
>> index 000000000000..eba361e2a8b7
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
>> @@ -0,0 +1,293 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2010 ASIX Electronics Corporation
>> + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
>> + *
>> + * ASIX AX88796C SPI Fast Ethernet Linux driver
>> + */
>> +
>> +#include "ax88796c_main.h"
>> +#include "ax88796c_spi.h"
>> +#include "ax88796c_ioctl.h"
>> +
>> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
>
> Looks here like pointer to const. Unless it is because of
> AX_READ_STATUS() which cannot take const?
It can. I changed other stuff in ax88796c_spi.[hc] to const too.
>> +{
>
> Please put file-scope definitions first, so this should go to the end.
I don't understand.
>> + struct spi_status ax_status;
>> +
>> + /* Check media link status first */
>> + if (netif_carrier_ok(ax_local->ndev) ||
>> + (ax_local->ps_level == AX_PS_D0) ||
>> + (ax_local->ps_level == AX_PS_D1)) {
>> + return 0;
>> + }
>> +
>> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> + if (!(ax_status.status & AX_STATUS_READY))
>
> This looks buggy... AX_READ_STATUS can fail, without reporting an error.
> There is no error handling. What will be the value of ax_status? Sure,
> some stack-protector-GCC-plugins might initialize it to 0, but that's
> not a good design.
>
> There is no error handling of all SPI functions so entire driver works
> because of luck... if there is any error in the middle of some work, it
> won't spot it.
You are right this requires more work. I will do it.
>> + return 1;
>> +
>> + return 0;
>> +}
>> +
>> +u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local)
>> +{
>> + struct spi_status ax_status;
>> + unsigned long start_time;
>> +
>> + /* Check media link status first */
>> + if (netif_carrier_ok(ax_local->ndev) ||
>> + (ax_local->ps_level == AX_PS_D0) ||
>> + (ax_local->ps_level == AX_PS_D1)) {
>> + return 0;
>> + }
>> +
>> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> + if (!(ax_status.status & AX_STATUS_READY)) {
>> +
>> + /* AX88796C in power saving mode */
>> + AX_WAKEUP(&ax_local->ax_spi);
>> +
>> + /* Check status */
>> + start_time = jiffies;
>> + do {
>> + if (time_after(jiffies, start_time + HZ/2)) {
>> + netdev_err(ax_local->ndev,
>> + "timeout waiting for wakeup"
>> + " from power saving\n");
>> + break;
>> + }
>> +
>> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> +
>> + } while (!(ax_status.status & AX_STATUS_READY));
>> +
>> + ax88796c_set_power_saving(ax_local, AX_PS_D0);
>> +
>> + return 1;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +void ax88796c_set_power_saving(struct ax88796c_device *ax_local, u8 ps_level)
>> +{
>> + u16 pmm;
>> +
>> + if (ps_level == AX_PS_D1)
>> + pmm = PSCR_PS_D1;
>> + else if (ps_level == AX_PS_D2)
>> + pmm = PSCR_PS_D2;
>> + else
>> + pmm = PSCR_PS_D0;
>> +
>> + AX_WRITE(&ax_local->ax_spi, (AX_READ(&ax_local->ax_spi, P0_PSCR)
>> + & PSCR_PS_MASK) | pmm, P0_PSCR);
>> +}
>> +
>> +int ax88796c_mdio_read(struct net_device *ndev, int phy_id, int loc)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + unsigned long start_time;
>> +
>> + AX_WRITE(&ax_local->ax_spi, MDIOCR_RADDR(loc)
>> + | MDIOCR_FADDR(phy_id) | MDIOCR_READ, P2_MDIOCR);
>> +
>> + start_time = jiffies;
>> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
>> + if (time_after(jiffies, start_time + HZ/100))
>> + return -EBUSY;
>> + }
>> +
>> + return AX_READ(&ax_local->ax_spi, P2_MDIODR);
>> +}
>> +
>> +void
>> +ax88796c_mdio_write(struct net_device *ndev, int phy_id, int loc, int val)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + unsigned long start_time;
>> +
>> + AX_WRITE(&ax_local->ax_spi, val, P2_MDIODR);
>> +
>> + AX_WRITE(&ax_local->ax_spi,
>> + MDIOCR_RADDR(loc) | MDIOCR_FADDR(phy_id)
>> + | MDIOCR_WRITE, P2_MDIOCR);
>> +
>> + start_time = jiffies;
>> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
>> + if (time_after(jiffies, start_time + HZ/100))
>> + return;
>> + }
>> +
>> + if (loc == MII_ADVERTISE) {
>> + AX_WRITE(&ax_local->ax_spi, (BMCR_FULLDPLX | BMCR_ANRESTART |
>> + BMCR_ANENABLE | BMCR_SPEED100), P2_MDIODR);
>> + AX_WRITE(&ax_local->ax_spi, (MDIOCR_RADDR(MII_BMCR) |
>> + MDIOCR_FADDR(phy_id) | MDIOCR_WRITE),
>> + P2_MDIOCR);
>> +
>> + start_time = jiffies;
>> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR)
>> + & MDIOCR_VALID) == 0) {
>> + if (time_after(jiffies, start_time + HZ/100))
>> + return;
>> + }
>> + }
>> +}
>> +
>> +void ax88796c_set_csums(struct ax88796c_device *ax_local)
>> +{
>> + if (ax_local->checksum & AX_RX_CHECKSUM) {
>> + AX_WRITE(&ax_local->ax_spi, COERCR0_DEFAULT, P4_COERCR0);
>> + AX_WRITE(&ax_local->ax_spi, COERCR1_DEFAULT, P4_COERCR1);
>> + } else {
>> + AX_WRITE(&ax_local->ax_spi, 0, P4_COERCR0);
>> + AX_WRITE(&ax_local->ax_spi, 0, P4_COERCR1);
>> + }
>> +
>> + if (ax_local->checksum & AX_TX_CHECKSUM) {
>> + AX_WRITE(&ax_local->ax_spi, COETCR0_DEFAULT, P4_COETCR0);
>> + AX_WRITE(&ax_local->ax_spi, COETCR1_TXPPPE, P4_COETCR1);
>> + } else {
>> + AX_WRITE(&ax_local->ax_spi, 0, P4_COETCR0);
>> + AX_WRITE(&ax_local->ax_spi, 0, P4_COETCR1);
>> + }
>> +}
>> +
>> +static void ax88796c_get_drvinfo(struct net_device *ndev,
>> + struct ethtool_drvinfo *info)
>> +{
>> + /* Inherit standard device info */
>> + strncpy(info->driver, DRV_NAME, sizeof(info->driver));
>> + strncpy(info->version, DRV_VERSION, sizeof(info->version));
>> +}
>> +
>> +static u32 ax88796c_get_link(struct net_device *ndev)
>> +{
>> + u32 link;
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + link = mii_link_ok(&ax_local->mii);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> + up(&ax_local->spi_lock);
>> +
>> + return link;
>> +
>> +
>
> Empty lines.
Fixed.
>> +}
>> +
>> +static u32 ax88796c_get_msglevel(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + return ax_local->msg_enable;
>> +}
>> +
>> +static void ax88796c_set_msglevel(struct net_device *ndev, u32 level)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + ax_local->msg_enable = level;
>> +}
>> +
>> +
>
> One line break.
Fixed.
>> +static int
>> +ax88796c_get_link_ksettings(struct net_device *ndev,
>> + struct ethtool_link_ksettings *cmd)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + mii_ethtool_get_link_ksettings(&ax_local->mii, cmd);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> + up(&ax_local->spi_lock);
>> +
>> + return 0;
>> +}
>> +
>> +static int
>> +ax88796c_set_link_ksettings(struct net_device *ndev,
>> + const struct ethtool_link_ksettings *cmd)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + mii_ethtool_set_link_ksettings(&ax_local->mii, cmd);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> + up(&ax_local->spi_lock);
>> + return 0;
>> +
>
> Line before return, not after.
>
Fixed.
>> +}
>> +
>> +static int ax88796c_nway_reset(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + int ret;
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + ret = mii_nway_restart(&ax_local->mii);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> + up(&ax_local->spi_lock);
>> + return ret;
>> +}
>> +
>> +static u32 ax88796c_ethtool_getmsglevel(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + return ax_local->msg_enable;
>> +}
>> +
>> +static void ax88796c_ethtool_setmsglevel(struct net_device *ndev, u32 level)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + ax_local->msg_enable = level;
>> +}
>> +
>> +struct ethtool_ops ax88796c_ethtool_ops = {
>> + .get_drvinfo = ax88796c_get_drvinfo,
>> + .get_link = ax88796c_get_link,
>> + .get_msglevel = ax88796c_get_msglevel,
>> + .set_msglevel = ax88796c_set_msglevel,
>> + .get_link_ksettings = ax88796c_get_link_ksettings,
>> + .set_link_ksettings = ax88796c_set_link_ksettings,
>> + .nway_reset = ax88796c_nway_reset,
>> + .get_msglevel = ax88796c_ethtool_getmsglevel,
>> + .set_msglevel = ax88796c_ethtool_setmsglevel,
>> +};
>> +
>> +int ax88796c_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + int ret;
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + ret = generic_mii_ioctl(&ax_local->mii, if_mii(ifr), cmd, NULL);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> + up(&ax_local->spi_lock);
>> +
>> + return ret;
>> +}
>> +
>> diff --git a/drivers/net/ethernet/asix/ax88796c_ioctl.h b/drivers/net/ethernet/asix/ax88796c_ioctl.h
>> new file mode 100644
>> index 000000000000..bafd573bd813
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.h
>> @@ -0,0 +1,21 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2010 ASIX Electronics Corporation
>> + *
>> + * ASIX AX88796C SPI Fast Ethernet Linux driver
>> + */
>> +
>> +#ifndef _AX88796C_IOCTL_H
>> +#define _AX88796C_IOCTL_H
>> +
>> +extern struct ethtool_ops ax88796c_ethtool_ops;
>> +
>> +u8 ax88796c_check_power(struct ax88796c_device *ax_local);
>> +u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local);
>> +void ax88796c_set_power_saving(struct ax88796c_device *ax_local, u8 ps_level);
>> +int ax88796c_mdio_read(struct net_device *dev, int phy_id, int loc);
>> +void ax88796c_mdio_write(struct net_device *dev, int phy_id, int loc, int val);
>> +void ax88796c_set_csums(struct ax88796c_device *ax_local);
>> +int ax88796c_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
>> +
>> +#endif
>> diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c
>> new file mode 100644
>> index 000000000000..c28cfb931319
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/ax88796c_main.c
>> @@ -0,0 +1,1373 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2010 ASIX Electronics Corporation
>> + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
>> + *
>> + * ASIX AX88796C SPI Fast Ethernet Linux driver
>> + */
>> +
>> +#include "ax88796c_main.h"
>> +#include "ax88796c_ioctl.h"
>> +
>> +static int comp;
>> +static int ps_level = AX_PS_D0;
>> +static int msg_enable = NETIF_MSG_PROBE |
>> + NETIF_MSG_LINK |
>> + /* NETIF_MSG_TIMER | */
>> + NETIF_MSG_RX_ERR |
>> + NETIF_MSG_TX_ERR |
>> + /* NETIF_MSG_TX_QUEUED | */
>> + /* NETIF_MSG_INTR | */
>> + /* NETIF_MSG_TX_DONE | */
>> + /* NETIF_MSG_RX_STATUS | */
>> + /* NETIF_MSG_PKTDATA | */
>> + /* NETIF_MSG_HW | */
>> + NETIF_MSG_WOL;
>> +
>> +module_param(comp, int, 0);
>> +MODULE_PARM_DESC(comp, "0=Non-Compression Mode, 1=Compression Mode");
>> +
>> +module_param(ps_level, int, 0);
>> +MODULE_PARM_DESC(ps_level,
>> + "Power Saving Level (0:disable 1:level 1 2:level 2)");
>> +
>> +module_param(msg_enable, int, 0);
>> +MODULE_PARM_DESC(msg_enable, "Message mask (see linux/netdevice.h for bitmap)");
>> +
>> +static char *macaddr;
>> +module_param(macaddr, charp, 0);
>> +MODULE_PARM_DESC(macaddr, "MAC address");
>
> I think MAC address as param is not accepted in mainline...
>
$ git grep MODULE_PARM_DESC\(macaddr -- drivers/net | wc -l
6
>> +
>
>> +MODULE_AUTHOR("ASIX");
>> +MODULE_DESCRIPTION("ASIX AX88796C SPI Ethernet driver");
>> +MODULE_LICENSE("GPL");
>
> These three usually go to the end of file.
>
Fixed.
>> +
>> +static void ax88796c_dump_regs(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + u8 i, j;
>> +
>> + netdev_info(ndev,
>> + " Page0 Page1 Page2 Page3 "
>> + "Page4 Page5 Page6 Page7\n");
>> + for (i = 0; i < 0x20; i += 2) {
>> + netdev_info(ndev, "0x%02x ", i);
>> + for (j = 0; j < 8; j++) {
>> + netdev_info(ndev, "0x%04x ",
>> + AX_READ(&ax_local->ax_spi, j * 0x20 + i));
>> + }
>> + netdev_info(ndev, "\n");
>> + }
>> + netdev_info(ndev, "\n");
>> +}
>> +
>> +static void ax88796c_dump_phy_regs(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + int i;
>> +
>> + netdev_info(ndev, "Dump PHY registers:\n");
>> + for (i = 0; i < 6; i++) {
>> + netdev_info(ndev, " MR%d = 0x%04x\n", i,
>> + ax88796c_mdio_read(ax_local->ndev,
>> + ax_local->mii.phy_id, i));
>> + }
>> +}
>> +
>> +static void ax88796c_watchdog(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + u16 phy_status;
>> + unsigned long time_to_chk = AX88796C_WATCHDOG_PERIOD;
>> +
>> + if (ax88796c_check_power(ax_local)) {
>> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
>> + return;
>> + }
>> +
>> + ax88796c_set_power_saving(ax_local, AX_PS_D0);
>> +
>> + phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
>> + if (phy_status & PSCR_PHYLINK) {
>> +
>> + ax_local->w_state = ax_nop;
>> + time_to_chk = 0;
>> +
>> + } else if (!(phy_status & PSCR_PHYCOFF)) {
>> + /* The ethernet cable has been plugged */
>> + if (ax_local->w_state == chk_cable) {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Cable connected\n");
>> +
>> + ax_local->w_state = chk_link;
>> + ax_local->w_ticks = 0;
>> + } else {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Check media status\n");
>> +
>> + if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Restart autoneg\n");
>> + ax88796c_mdio_write(ndev,
>> + ax_local->mii.phy_id, MII_BMCR,
>> + (BMCR_SPEED100 | BMCR_ANENABLE |
>> + BMCR_ANRESTART));
>> +
>> + if (netif_msg_hw(ax_local))
>> + ax88796c_dump_phy_regs(ax_local);
>> + ax_local->w_ticks = 0;
>> + }
>> + }
>> + } else {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Check cable status\n");
>> +
>> + ax_local->w_state = chk_cable;
>> + }
>> +
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + if (time_to_chk)
>> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
>> +}
>> +
>> +static void ax88796c_watchdog_timer(struct timer_list *t)
>> +{
>> + struct ax88796c_device *ax_local = from_timer(ax_local, t, watchdog);
>> + //struct net_device *ndev = ax_local->ndev;
>
> Clean up.
>
Done.
>> +
>> + set_bit(EVENT_WATCHDOG, &ax_local->flags);
>> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
>> +}
>> +
>> +static int ax88796c_soft_reset(struct ax88796c_device *ax_local)
>> +{
>> + unsigned long start;
>> + u16 temp;
>> +
>> + AX_WRITE(&ax_local->ax_spi, PSR_RESET, P0_PSR);
>> + AX_WRITE(&ax_local->ax_spi, PSR_RESET_CLR, P0_PSR);
>> +
>> + start = jiffies;
>> + while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
>> + if (time_after(jiffies, start + (160 * HZ / 1000))) {
>> + dev_err(&ax_local->spi->dev,
>> + "timeout waiting for reset completion\n");
>> + return -1;
>> + }
>> + }
>> +
>> + temp = AX_READ(&ax_local->ax_spi, P4_SPICR);
>> + if (ax_local->capabilities & AX_CAP_COMP) {
>> + AX_WRITE(&ax_local->ax_spi,
>> + (temp | SPICR_RCEN | SPICR_QCEN), P4_SPICR);
>> + ax_local->ax_spi.comp = 1;
>> + } else {
>> + AX_WRITE(&ax_local->ax_spi,
>> + (temp & ~(SPICR_RCEN | SPICR_QCEN)), P4_SPICR);
>> + ax_local->ax_spi.comp = 0;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int ax88796c_reload_eeprom(struct ax88796c_device *ax_local)
>> +{
>> + unsigned long start;
>> +
>> + AX_WRITE(&ax_local->ax_spi, EECR_RELOAD, P3_EECR);
>> +
>> + start = jiffies;
>> + while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
>> + if (time_after(jiffies, start + (2 * HZ / 100))) {
>> + dev_err(&ax_local->spi->dev,
>> + "timeout waiting for reload eeprom\n");
>> + return -1;
>> + }
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static void ax88796c_set_hw_multicast(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u16 rx_ctl = RXCR_AB;
>> + int mc_count = netdev_mc_count(ndev);
>> +
>> + memset(ax_local->multi_filter, 0, AX_MCAST_FILTER_SIZE);
>> +
>> + if (ndev->flags & IFF_PROMISC) {
>> + rx_ctl |= RXCR_PRO;
>> +
>> + } else if (ndev->flags & IFF_ALLMULTI
>> + || mc_count > AX_MAX_MCAST) {
>> + rx_ctl |= RXCR_AMALL;
>> +
>> + } else if (mc_count == 0) {
>> + /* just broadcast and directed */
>> + } else {
>> + u32 crc_bits;
>> + int i;
>> + struct netdev_hw_addr *ha;
>> + netdev_for_each_mc_addr(ha, ndev) {
>> + crc_bits = ether_crc(ETH_ALEN, ha->addr);
>> + ax_local->multi_filter[crc_bits >> 29] |=
>> + (1 << ((crc_bits >> 26) & 7));
>> + }
>> +
>> + for (i = 0; i < 4; i++) {
>> + AX_WRITE(&ax_local->ax_spi,
>> + ((ax_local->multi_filter[i*2+1] << 8) |
>> + ax_local->multi_filter[i*2]), P3_MFAR(i));
>> +
>> + }
>> + }
>> +
>> + AX_WRITE(&ax_local->ax_spi, rx_ctl, P2_RXCR);
>> +
>
> No need for empty line.
>
Fixed.
>> +}
>> +
>> +#if 0
>
> Please comment why it is commented out.
>
Always has been (-; This is how it came from the vendor I missed it when
I focused on making things work. I will investigate it and either
uncomment or remove it.
>> +static void ax88796c_set_multicast(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> +
>> + set_bit(EVENT_SET_MULTI, &ax_local->flags);
>> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
>> +}
>> +#endif
>> +
>> +static void ax88796c_set_mac_addr(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> +
>> + AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[4] << 8) |
>> + (u16)ndev->dev_addr[5]), P3_MACASR0);
>> + AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[2] << 8) |
>> + (u16)ndev->dev_addr[3]), P3_MACASR1);
>> + AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[0] << 8) |
>> + (u16)ndev->dev_addr[1]), P3_MACASR2);
>> +}
>> +
>> +static int ax88796c_set_mac_address(struct net_device *ndev, void *p)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + struct sockaddr *addr = p;
>> +
>> + if (!is_valid_ether_addr(addr->sa_data))
>> + return -EADDRNOTAVAIL;
>> +
>> + memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len);
>> +
>> + down(&ax_local->spi_lock);
>> +
>> + ax88796c_set_mac_addr(ndev);
>> +
>> + up(&ax_local->spi_lock);
>> +
>> + return 0;
>> +}
>> +
>> +static int ax88796c_load_mac_addr(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u16 temp;
>> +
>> + /* Read the MAC address from AX88796C */
>> + temp = AX_READ(&ax_local->ax_spi, P3_MACASR0);
>> + ndev->dev_addr[5] = (u8)temp;
>> + ndev->dev_addr[4] = (u8)(temp >> 8);
>> +
>> + temp = AX_READ(&ax_local->ax_spi, P3_MACASR1);
>> + ndev->dev_addr[3] = (u8)temp;
>> + ndev->dev_addr[2] = (u8)(temp >> 8);
>> +
>> + temp = AX_READ(&ax_local->ax_spi, P3_MACASR2);
>> + ndev->dev_addr[1] = (u8)temp;
>> + ndev->dev_addr[0] = (u8)(temp >> 8);
>> +
>> + /* Supported for no EEPROM */
>> + if (!is_valid_ether_addr(ndev->dev_addr)) {
>> + if (macaddr && mac_pton(macaddr, ndev->dev_addr))
>> + return 0;
>> +
>> + if (netif_msg_probe(ax_local))
>> + dev_info(&ax_local->spi->dev, "Use random MAC address\n");
>> +
>> + random_ether_addr(ndev->dev_addr);
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static void ax88796c_proc_tx_hdr(struct tx_pkt_info *info, u8 ip_summed)
>> +{
>> + u16 pkt_len_bar = (~info->pkt_len & TX_HDR_SOP_PKTLENBAR);
>> +
>> + /* Prepare SOP header */
>> + info->sop.flags_len = info->pkt_len |
>> + (ip_summed == CHECKSUM_NONE ? TX_HDR_SOP_DICF : 0);
>> +
>> + info->sop.seq_lenbar = ((info->seq_num << 11) & TX_HDR_SOP_SEQNUM)
>> + | pkt_len_bar;
>> + cpu_to_be16s(&info->sop.flags_len);
>> + cpu_to_be16s(&info->sop.seq_lenbar);
>> +
>> + /* Prepare Segment header */
>> + info->seg.flags_seqnum_seglen = TX_HDR_SEG_FS | TX_HDR_SEG_LS
>> + | info->pkt_len;
>> +
>> + info->seg.eo_so_seglenbar = pkt_len_bar;
>> +
>> + cpu_to_be16s(&info->seg.flags_seqnum_seglen);
>> + cpu_to_be16s(&info->seg.eo_so_seglenbar);
>> +
>> + /* Prepare EOP header */
>> + info->eop.seq_len = ((info->seq_num << 11) &
>> + TX_HDR_EOP_SEQNUM) | info->pkt_len;
>> + info->eop.seqbar_lenbar = ((~info->seq_num << 11) &
>> + TX_HDR_EOP_SEQNUMBAR) | pkt_len_bar;
>> +
>> + cpu_to_be16s(&info->eop.seq_len);
>> + cpu_to_be16s(&info->eop.seqbar_lenbar);
>> +}
>> +
>> +static int
>> +ax88796c_check_free_pages(struct ax88796c_device *ax_local, u8 need_pages)
>> +{
>> + u8 free_pages;
>> + u16 tmp;
>> +
>> + free_pages = AX_READ(&ax_local->ax_spi, P0_TFBFCR) & TX_FREEBUF_MASK;
>> + if (free_pages < need_pages) {
>> + /* schedule free page interrupt */
>> + tmp = AX_READ(&ax_local->ax_spi, P0_TFBFCR)
>> + & TFBFCR_SCHE_FREE_PAGE;
>> + AX_WRITE(&ax_local->ax_spi, tmp | TFBFCR_TX_PAGE_SET |
>> + TFBFCR_SET_FREE_PAGE(need_pages),
>> + P0_TFBFCR);
>> + return -ENOMEM;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static struct sk_buff *
>> +ax88796c_tx_fixup(struct net_device *ndev, struct sk_buff_head *q)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + struct sk_buff *skb, *tx_skb;
>> + struct tx_pkt_info *info;
>> + struct skb_data *entry;
>> + int headroom;
>> + int tailroom;
>> + u8 need_pages;
>> + u16 tol_len, pkt_len;
>> + u8 padlen, seq_num;
>> + u8 spi_len = ax_local->ax_spi.comp ? 1 : 4;
>> +
>> + if (skb_queue_empty(q))
>> + return NULL;
>> +
>> + skb = skb_peek(q);
>> + pkt_len = skb->len;
>> + need_pages = (pkt_len + TX_OVERHEAD + 127) >> 7;
>> + if (ax88796c_check_free_pages(ax_local, need_pages) != 0)
>> + return NULL;
>> +
>> + headroom = skb_headroom(skb);
>> + tailroom = skb_tailroom(skb);
>> + padlen = ((pkt_len + 3) & 0x7FC) - pkt_len;
>> + tol_len = ((pkt_len + 3) & 0x7FC) +
>> + TX_OVERHEAD + TX_EOP_SIZE + spi_len;
>> + seq_num = ++ax_local->seq_num & 0x1F;
>> +
>> + info = (struct tx_pkt_info *) skb->cb;
>> + info->pkt_len = pkt_len;
>> +
>> + if ((!skb_cloned(skb)) &&
>> + (headroom >= (TX_OVERHEAD + spi_len)) &&
>> + (tailroom >= (padlen + TX_EOP_SIZE))) {
>> +
>> + info->seq_num = seq_num;
>> + ax88796c_proc_tx_hdr(info, skb->ip_summed);
>> +
>> + /* SOP and SEG header */
>> + memcpy(skb_push(skb, TX_OVERHEAD), &info->sop, TX_OVERHEAD);
>> +
>> + /* Write SPI TXQ header */
>> + memcpy(skb_push(skb, spi_len), tx_cmd_buf, spi_len);
>> +
>> + /* Make 32-bit aligment */
>> + skb_put(skb, padlen);
>> +
>> + /* EOP header */
>> + memcpy(skb_put(skb, TX_EOP_SIZE), &info->eop, TX_EOP_SIZE);
>> +
>> + tx_skb = skb;
>> + skb_unlink(skb, q);
>> +
>> + } else {
>> +
>> + tx_skb = alloc_skb(tol_len, GFP_KERNEL);
>> + if (!tx_skb)
>> + return NULL;
>> +
>> + /* Write SPI TXQ header */
>> + memcpy(skb_put(tx_skb, spi_len), tx_cmd_buf, spi_len);
>> +
>> + info->seq_num = seq_num;
>> + ax88796c_proc_tx_hdr(info, skb->ip_summed);
>> +
>> + /* SOP and SEG header */
>> + memcpy(skb_put(tx_skb, TX_OVERHEAD),
>> + &info->sop, TX_OVERHEAD);
>> +
>> + /* Packet */
>> + memcpy(skb_put(tx_skb, ((pkt_len + 3) & 0xFFFC)),
>> + skb->data, pkt_len);
>> +
>> + /* EOP header */
>> + memcpy(skb_put(tx_skb, TX_EOP_SIZE),
>> + &info->eop, TX_EOP_SIZE);
>> +
>> + skb_unlink(skb, q);
>> + dev_kfree_skb(skb);
>> + }
>> +
>> + entry = (struct skb_data *) tx_skb->cb;
>> + memset(entry, 0, sizeof(*entry));
>> + entry->len = pkt_len;
>> +
>> + if (netif_msg_pktdata(ax_local)) {
>> + int loop;
>> + netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
>> + pkt_len, tx_skb->len, seq_num);
>> +
>> + netdev_info(ndev, " Dump SPI Header:\n ");
>> + for (loop = 0; loop < 4; loop++)
>> + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
>> +
>> + netdev_info(ndev, "\n");
>> +
>> + netdev_info(ndev, " Dump TX SOP:\n ");
>> + for (loop = 0; loop < TX_OVERHEAD; loop++)
>> + netdev_info(ndev, "%02x ", *(tx_skb->data + 4 + loop));
>> +
>> + netdev_info(ndev, "\n");
>> +
>> + netdev_info(ndev, " Dump TX packet:");
>> + for (loop = TX_OVERHEAD + 4;
>> + loop < (tx_skb->len - TX_EOP_SIZE); loop++) {
>> + if (((loop + 8) % 16) == 0)
>> + netdev_info(ndev, "\n ");
>> + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
>> + }
>> + netdev_info(ndev, "\n");
>> +
>> + netdev_info(ndev, " Dump TX EOP:\n %02x %02x %02x %02x\n",
>> + *(tx_skb->data + tx_skb->len - 4),
>> + *(tx_skb->data + tx_skb->len - 3),
>> + *(tx_skb->data + tx_skb->len - 2),
>> + *(tx_skb->data + tx_skb->len - 1));
>> + }
>> +
>> + return tx_skb;
>> +}
>> +
>> +static int ax88796c_hard_xmit(struct ax88796c_device *ax_local)
>> +{
>> + struct sk_buff *tx_skb;
>> + struct skb_data *entry;
>> +
>> + tx_skb = ax88796c_tx_fixup(ax_local->ndev, &ax_local->tx_wait_q);
>> +
>> + if (!tx_skb)
>> + return 0;
>> +
>> + entry = (struct skb_data *)tx_skb->cb;
>> +
>> + AX_WRITE(&ax_local->ax_spi,
>> + (TSNR_TXB_START | TSNR_PKT_CNT(1)), P0_TSNR);
>> +
>> + axspi_write_txq(&ax_local->ax_spi, tx_skb->data, tx_skb->len);
>> +
>> + if (((AX_READ(&ax_local->ax_spi, P0_TSNR) & TXNR_TXB_IDLE) == 0) ||
>> + ((ISR_TXERR & AX_READ(&ax_local->ax_spi, P0_ISR)) != 0)) {
>> +
>> + /* Ack tx error int */
>> + AX_WRITE(&ax_local->ax_spi, ISR_TXERR, P0_ISR);
>> +
>> + ax_local->stats.tx_dropped++;
>> +
>> + if (netif_msg_tx_err(ax_local))
>> + netdev_err(ax_local->ndev,
>> + "TX FIFO error, re-initialize the TX bridge\n");
>> +
>> + /* Reinitial tx bridge */
>> + AX_WRITE(&ax_local->ax_spi, TXNR_TXB_REINIT |
>> + AX_READ(&ax_local->ax_spi, P0_TSNR), P0_TSNR);
>> + ax_local->seq_num = 0;
>> + } else {
>> + ax_local->stats.tx_packets++;
>> + ax_local->stats.tx_bytes += entry->len;
>> + }
>> +
>> + entry->state = tx_done;
>> + dev_kfree_skb(tx_skb);
>> +
>> + return 1;
>> +}
>> +
>> +static int
>> +ax88796c_start_xmit(struct sk_buff *skb, struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> +
>> + skb_queue_tail(&ax_local->tx_wait_q, skb);
>> + if (skb_queue_len(&ax_local->tx_wait_q) > TX_QUEUE_HIGH_WATER) {
>> + if (netif_msg_tx_queued(ax_local))
>> + netdev_err(ndev, "Too much TX packets in queue %d\n",
>> + skb_queue_len(&ax_local->tx_wait_q));
>> +
>> + netif_stop_queue(ndev);
>> + }
>> +
>> + set_bit(EVENT_TX, &ax_local->flags);
>> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
>> +
>> + return NETDEV_TX_OK;
>> +
>> +}
>> +
>> +
>> +static inline void
>> +ax88796c_skb_return(struct ax88796c_device *ax_local, struct sk_buff *skb,
>> + struct rx_header *rxhdr)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + int status;
>> +
>> + do {
>> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
>> + break;
>> +
>> + /* checksum error bit is set */
>> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
>> + (rxhdr->flags & RX_HDR3_L4_ERR))
>> + break;
>> +
>> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
>> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
>> + skb->ip_summed = CHECKSUM_UNNECESSARY;
>> + }
>> + } while (0);
>> +
>> + ax_local->stats.rx_packets++;
>> + ax_local->stats.rx_bytes += skb->len;
>> + skb->dev = ndev;
>> +
>> + skb->truesize = skb->len + sizeof(struct sk_buff);
>> + skb->protocol = eth_type_trans(skb, ax_local->ndev);
>> +
>> + if (netif_msg_rx_status(ax_local))
>> + netdev_info(ndev, "< rx, len %zu, type 0x%x\n",
>> + skb->len + sizeof(struct ethhdr), skb->protocol);
>> +
>> + status = netif_rx(skb);
>> + if (status != NET_RX_SUCCESS && netif_msg_rx_err(ax_local))
>> + netdev_info(ndev, "netif_rx status %d\n", status);
>> +}
>> +
>> +static void dump_packet(struct net_device *ndev, const char *msg, int len, const char *data)
>> +{
>
> Too long lines.
>
Fixed.
>> + netdev_printk(KERN_DEBUG, ndev, DRV_NAME ": %s - packet len:%d\n", msg, len);
>> + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
>> + data, len, true);
>> +}
>> +
>> +static void
>> +ax88796c_rx_fixup(struct ax88796c_device *ax_local, struct sk_buff *rx_skb)
>> +{
>> + struct rx_header *rxhdr = (struct rx_header *) rx_skb->data;
>> + struct net_device *ndev = ax_local->ndev;
>> + u16 len;
>> +
>> + be16_to_cpus(&rxhdr->flags_len);
>> + be16_to_cpus(&rxhdr->seq_lenbar);
>> + be16_to_cpus(&rxhdr->flags);
>> +
>> + if ((((short)rxhdr->flags_len) & RX_HDR1_PKT_LEN) !=
>> + (~((short)rxhdr->seq_lenbar) & 0x7FF)) {
>> + if (netif_msg_rx_err(ax_local)) {
>> + int i;
>> + netdev_err(ndev, "Header error\n");
>> + //netdev_err(ndev, "Dump received frame\n");
>> + /* for (i = 0; i < rx_skb->len; i++) { */
>> + /* netdev_err(ndev, "%02x ", */
>> + /* *(rx_skb->data + i)); */
>> + /* if (((i + 1) % 16) == 0) */
>> + /* netdev_err(ndev, "\n"); */
>> + /* } */
>> + dump_packet(ndev, __func__, rx_skb->len, rx_skb->data);
>> + }
>> + ax_local->stats.rx_frame_errors++;
>> + kfree_skb(rx_skb);
>> + return;
>> + }
>> +
>> + if ((rxhdr->flags_len & RX_HDR1_MII_ERR) ||
>> + (rxhdr->flags_len & RX_HDR1_CRC_ERR)) {
>> + if (netif_msg_rx_err(ax_local))
>> + netdev_err(ndev, "CRC or MII error\n");
>> +
>> + ax_local->stats.rx_crc_errors++;
>> + kfree_skb(rx_skb);
>> + return;
>> + }
>> +
>> + len = rxhdr->flags_len & RX_HDR1_PKT_LEN;
>> + if (netif_msg_pktdata(ax_local)) {
>> + int loop;
>> + netdev_info(ndev, "RX data, total len %d, packet len %d\n",
>> + rx_skb->len, len);
>> +
>> + netdev_info(ndev, " Dump RX packet header:\n ");
>> + for (loop = 0; loop < sizeof(*rxhdr); loop++)
>> + netdev_info(ndev, "%02x ", *(rx_skb->data + loop));
>> +
>> + netdev_info(ndev, "\n Dump RX packet:");
>> + for (loop = 0; loop < len; loop++) {
>> + if ((loop % 16) == 0)
>> + netdev_info(ndev, "\n ");
>> + netdev_info(ndev, "%02x ",
>> + *(rx_skb->data + loop + sizeof(*rxhdr)));
>> + }
>> + netdev_info(ndev, "\n");
>> + }
>> +
>> + skb_pull(rx_skb, sizeof(*rxhdr));
>> + __pskb_trim(rx_skb, len);
>> +
>> + return ax88796c_skb_return(ax_local, rx_skb, rxhdr);
>> +}
>> +
>> +static int ax88796c_receive(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + struct sk_buff *skb;
>> + struct skb_data *entry;
>> + u16 w_count, pkt_len;
>> + u8 pkt_cnt;
>> +
>> + /* check rx packet and total word count */
>> + AX_WRITE(&ax_local->ax_spi, AX_READ(&ax_local->ax_spi, P0_RTWCR)
>> + | RTWCR_RX_LATCH, P0_RTWCR);
>> +
>> + pkt_cnt = AX_READ(&ax_local->ax_spi, P0_RXBCR2) & RXBCR2_PKT_MASK;
>> + if (!pkt_cnt)
>> + return 0;
>> +
>> + pkt_len = AX_READ(&ax_local->ax_spi, P0_RCPHR) & 0x7FF;
>> +
>> + w_count = ((pkt_len + 6 + 3) & 0xFFFC) >> 1;
>> +
>> + skb = alloc_skb((w_count * 2), GFP_KERNEL);
>> + if (!skb) {
>> + if (netif_msg_rx_err(ax_local))
>> + netdev_err(ndev,
>> + "Couldn't allocate a sk_buff of size %d\n",
>> + w_count * 2);
>> +
>> + AX_WRITE(&ax_local->ax_spi, RXBCR1_RXB_DISCARD, P0_RXBCR1);
>> + return 0;
>> + }
>> + entry = (struct skb_data *) skb->cb;
>> +
>> + AX_WRITE(&ax_local->ax_spi, RXBCR1_RXB_START | w_count, P0_RXBCR1);
>> +
>> + axspi_read_rxq(&ax_local->ax_spi,
>> + skb_put(skb, w_count * 2), skb->len);
>> +
>> + /* Check if rx bridge is idle */
>> + if ((AX_READ(&ax_local->ax_spi, P0_RXBCR2) & RXBCR2_RXB_IDLE) == 0) {
>> +
>> + if (netif_msg_rx_err(ax_local))
>> + netdev_err(ndev, "Rx Bridge is not idle\n");
>> + AX_WRITE(&ax_local->ax_spi, RXBCR2_RXB_REINIT, P0_RXBCR2);
>> +
>> + entry->state = rx_err;
>> +
>> + } else {
>> +
>> + entry->state = rx_done;
>> + }
>> +
>> + AX_WRITE(&ax_local->ax_spi, ISR_RXPKT, P0_ISR);
>> +
>> + ax88796c_rx_fixup(ax_local, skb);
>> +
>> + return 1;
>> +}
>> +
>> +static void ax88796c_check_media(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + u16 bmsr, bmcr;
>> +
>> + if (netif_msg_hw(ax_local))
>> + ax88796c_dump_phy_regs(ax_local);
>> +
>> + bmsr = ax88796c_mdio_read(ndev,
>> + ax_local->mii.phy_id, MII_BMSR);
>> +
>> + if (!(bmsr & BMSR_LSTATUS) && netif_carrier_ok(ndev)) {
>> +
>> + netif_carrier_off(ndev);
>> + if (netif_msg_link(ax_local))
>> + netdev_info(ndev, "link down\n");
>> +
>> + ax_local->w_state = chk_cable;
>> + mod_timer(&ax_local->watchdog,
>> + jiffies + AX88796C_WATCHDOG_PERIOD);
>> +
>> + } else if ((bmsr & BMSR_LSTATUS) &&
>> + !netif_carrier_ok(ndev)) {
>> + bmcr = ax88796c_mdio_read(ndev,
>> + ax_local->mii.phy_id, MII_BMCR);
>> + if (netif_msg_link(ax_local))
>> + netdev_info(ndev, "link up, %sMbps, %s-duplex\n",
>> + (bmcr & BMCR_SPEED100) ? "100" : "10",
>> + (bmcr & BMCR_FULLDPLX) ? "full" : "half");
>> +
>> + netif_carrier_on(ndev);
>> + }
>> +
>> + return;
>> +}
>> +
>> +static int ax88796c_process_isr(struct ax88796c_device *ax_local)
>> +{
>> + u16 isr;
>> + u8 done = 0;
>> + struct net_device *ndev = ax_local->ndev;
>> +
>> + isr = AX_READ(&ax_local->ax_spi, P0_ISR);
>> + AX_WRITE(&ax_local->ax_spi, isr, P0_ISR);
>> +
>> + if (netif_msg_intr(ax_local))
>> + netdev_info(ndev, " ISR 0x%04x\n", isr);
>> +
>> + if (isr & ISR_TXERR) {
>> + if (netif_msg_intr(ax_local))
>> + netdev_info(ndev, " TXERR interrupt\n");
>> + AX_WRITE(&ax_local->ax_spi, TXNR_TXB_REINIT, P0_TSNR);
>> + ax_local->seq_num = 0x1f;
>> + }
>> +
>> + if (isr & ISR_TXPAGES) {
>> +
>> + if (netif_msg_intr(ax_local))
>> + netdev_info(ndev, " TXPAGES interrupt\n");
>> +
>> + set_bit(EVENT_TX, &ax_local->flags);
>> + }
>> +
>> + if (isr & ISR_LINK) {
>> +
>> + if (netif_msg_intr(ax_local))
>> + netdev_info(ndev, " Link change interrupt\n");
>> +
>> + ax88796c_check_media(ax_local);
>> + }
>> +
>> + if (isr & ISR_RXPKT) {
>> +
>> + if (netif_msg_intr(ax_local))
>> + netdev_info(ndev, " RX interrupt\n");
>> +
>> + done = ax88796c_receive(ax_local->ndev);
>> + }
>> +
>> + return done;
>> +}
>> +
>> +static irqreturn_t ax88796c_interrupt(int irq, void *dev_instance)
>> +{
>> + struct net_device *ndev = dev_instance;
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> +
>> + if (ndev == NULL) {
>> + pr_err("irq %d for unknown device.\n", irq);
>> + return IRQ_RETVAL(0);
>> + }
>> +
>> + disable_irq_nosync(irq);
>> +
>> + if (netif_msg_intr(ax_local))
>> + netdev_info(ndev, "Interrupt occurred\n");
>> +
>> + set_bit(EVENT_INTR, &ax_local->flags);
>> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
>> +
>> + return IRQ_HANDLED;
>> +}
>> +
>> +
>
> Only one line
>
Fixed.
>> +static void ax88796c_work(struct work_struct *work)
>> +{
>> + struct ax88796c_device *ax_local =
>> + container_of(work, struct ax88796c_device, ax_work);
>> + u8 power = 0;
>> +
>> + down(&ax_local->spi_lock);
>> +
>> + if (test_bit(EVENT_WATCHDOG, &ax_local->flags)) {
>> +
>> + ax88796c_watchdog(ax_local);
>> +
>> + clear_bit(EVENT_WATCHDOG, &ax_local->flags);
>> + }
>> +
>> + if (test_bit(EVENT_SET_MULTI, &ax_local->flags)) {
>> +
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + ax88796c_set_hw_multicast(ax_local->ndev);
>> + clear_bit(EVENT_SET_MULTI, &ax_local->flags);
>> + }
>> +
>> + if (test_bit(EVENT_INTR, &ax_local->flags)) {
>> +
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
>> +
>> + while (1) {
>> + if (!ax88796c_process_isr(ax_local))
>> + break;
>> + }
>> +
>> + clear_bit(EVENT_INTR, &ax_local->flags);
>> +
>> + AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
>> +
>> + enable_irq(ax_local->ndev->irq);
>> + }
>> +
>> + if (test_bit(EVENT_TX, &ax_local->flags)) {
>> +
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + while (skb_queue_len(&ax_local->tx_wait_q)) {
>> + if (!ax88796c_hard_xmit(ax_local))
>> + break;
>> + }
>> +
>> + clear_bit(EVENT_TX, &ax_local->flags);
>> +
>> + if (netif_queue_stopped(ax_local->ndev) &&
>> + (skb_queue_len(&ax_local->tx_wait_q) < TX_QUEUE_LOW_WATER))
>> + netif_wake_queue(ax_local->ndev);
>> + }
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + up(&ax_local->spi_lock);
>> +}
>> +
>> +static struct net_device_stats *ax88796c_get_stats(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + return &ax_local->stats;
>> +}
>> +
>> +void ax88796c_phy_init(struct ax88796c_device *ax_local)
>> +{
>> + u16 advertise = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
>> +
>> + /* Setup LED mode */
>> + AX_WRITE(&ax_local->ax_spi,
>> + (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |
>> + LCR_LED1_100MODE), P2_LCR0);
>> + AX_WRITE(&ax_local->ax_spi,
>> + (AX_READ(&ax_local->ax_spi, P2_LCR1) & LCR_LED2_MASK) |
>> + LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);
>> +
>> + /* Enable PHY auto-polling */
>> + AX_WRITE(&ax_local->ax_spi,
>> + POOLCR_PHYID(ax_local->mii.phy_id) | POOLCR_POLL_EN |
>> + POOLCR_POLL_FLOWCTRL | POOLCR_POLL_BMCR, P2_POOLCR);
>> +
>> + ax88796c_mdio_write(ax_local->ndev,
>> + ax_local->mii.phy_id, MII_ADVERTISE, advertise);
>> +
>> + ax88796c_mdio_write(ax_local->ndev, ax_local->mii.phy_id, MII_BMCR,
>> + BMCR_SPEED100 | BMCR_ANENABLE | BMCR_ANRESTART);
>> +}
>> +
>> +static int
>> +ax88796c_open(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + int ret;
>> + u8 power;
>> + unsigned long irq_flag = IRQF_SHARED;
>> +
>> + netif_carrier_off(ax_local->ndev);
>> +
>> + down(&ax_local->spi_lock);
>> +
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + ret = ax88796c_soft_reset(ax_local);
>> + if (ret < 0) {
>> + return -ENODEV;
>> + }
>> +
>> + ret = request_irq(ndev->irq, ax88796c_interrupt,
>> + irq_flag, ndev->name, ndev);
>> + if (ret) {
>> + netdev_err(ndev, "unable to get IRQ %d (errno=%d).\n",
>> + ndev->irq, ret);
>> + return -ENXIO;
>> + }
>> +
>> + ax_local->seq_num = 0x1f;
>> +
>> + ax88796c_set_mac_addr(ndev);
>> + ax88796c_set_csums(ax_local);
>> +
>> + /* Disable stuffing packet */
>> + AX_WRITE(&ax_local->ax_spi,
>> + AX_READ(&ax_local->ax_spi, P1_RXBSPCR)
>> + & ~RXBSPCR_STUF_ENABLE, P1_RXBSPCR);
>> +
>> + /* Enable RX packet process */
>> + AX_WRITE(&ax_local->ax_spi, RPPER_RXEN, P1_RPPER);
>> +
>> + AX_WRITE(&ax_local->ax_spi, AX_READ(&ax_local->ax_spi, P0_FER)
>> + | FER_RXEN | FER_TXEN | FER_BSWAP | FER_IRQ_PULL, P0_FER);
>> +
>> + ax88796c_phy_init(ax_local);
>> +
>> + netif_start_queue(ndev);
>> +
>> + AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
>> +
>> + if (netif_msg_hw(ax_local)) {
>> + netdev_info(ndev,
>> + "Dump all MAC registers after initialization:\n");
>> + ax88796c_dump_regs(ax_local);
>> + ax88796c_dump_phy_regs(ax_local);
>> + }
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + spi_message_init(&ax_local->ax_spi.rx_msg);
>> +
>> + up(&ax_local->spi_lock);
>> +
>> + timer_setup(&ax_local->watchdog, ax88796c_watchdog_timer, 0);
>> + /* init_timer(&ax_local->watchdog); */
>> + /* ax_local->watchdog.function = &ax88796c_watchdog_timer; */
>> + /* ax_local->watchdog.data = (unsigned long) ndev; */
>
> I guess it's a development code.
>
Removed. This was an old timer/watchdog API.
>> + ax_local->watchdog.expires = jiffies + AX88796C_WATCHDOG_PERIOD;
>> + ax_local->w_state = chk_cable;
>> + ax_local->w_ticks = 0;
>> +
>> + add_timer(&ax_local->watchdog);
>> +
>> + return 0;
>> +}
>> +
>> +static void ax88796c_free_skb_queue(struct sk_buff_head *q)
>> +{
>> + struct sk_buff *skb;
>> +
>> + while (q->qlen) {
>> + skb = skb_dequeue(q);
>> + kfree_skb(skb);
>> + }
>> +}
>> +
>> +static int
>> +ax88796c_close(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u8 power;
>> +
>> + netif_stop_queue(ndev);
>> +
>> + del_timer_sync(&ax_local->watchdog);
>> +
>> + free_irq(ndev->irq, ndev);
>> +
>> + down(&ax_local->spi_lock);
>> +
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
>> + ax88796c_free_skb_queue(&ax_local->tx_wait_q);
>> +
>> + ax88796c_soft_reset(ax_local);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + up(&ax_local->spi_lock);
>> +
>> + return 0;
>> +}
>> +
>> +static const struct net_device_ops ax88796c_netdev_ops = {
>> + .ndo_open = ax88796c_open,
>> + .ndo_stop = ax88796c_close,
>> + .ndo_start_xmit = ax88796c_start_xmit,
>> + .ndo_get_stats = ax88796c_get_stats,
>> + /* .ndo_set_multicast_list = ax88796c_set_multicast, */
>
> Still need a comment.
>
Will do.
>> + .ndo_do_ioctl = ax88796c_ioctl,
>> + .ndo_set_mac_address = ax88796c_set_mac_address,
>> +};
>> +
>> +
>> +static int ax88796c_hard_reset(struct ax88796c_device *ax_local)
>> +{
>> + struct device *dev = (struct device*)&ax_local->spi->dev;
>> + struct gpio_desc *reset_gpio;
>> +
>> + /* reset info */
>> + reset_gpio = gpiod_get(dev, "reset", 0);
>> + if (IS_ERR(reset_gpio)) {
>> + dev_err(dev, "Could not get 'reset' GPIO: %ld", PTR_ERR(reset_gpio));
>> + return PTR_ERR(reset_gpio);
>> + }
>> +
>> + /* set reset */
>> + gpiod_direction_output(reset_gpio, 1);
>> + msleep(100);
>> + gpiod_direction_output(reset_gpio, 0);
>> + gpiod_put(reset_gpio);
>> + msleep(10);
>> +
>> + return 0;
>> +}
>> +
>> +static int ax88796c_probe(struct spi_device *spi)
>> +{
>> + struct net_device *ndev;
>> + struct ax88796c_device *ax_local;
>> + int ret;
>> + u16 temp;
>> +
>> + ndev = devm_alloc_etherdev(&spi->dev, sizeof(*ax_local));
>> + if (!ndev) {
>> + dev_err(&spi->dev, "AX88796C SPI: Could not allocate ethernet device\n");
>> + return -ENOMEM;
>> + }
>> +
>> + ax_local = to_ax88796c_device(ndev);
>> + memset(ax_local, 0, sizeof(*ax_local));
>> +
>> + dev_set_drvdata(&spi->dev, ax_local);
>> + ax_local->spi = spi;
>> + ax_local->ax_spi.spi = spi;
>> +
>> + ndev->irq = spi->irq;
>> +
>> + ax_local->msg_enable = msg_enable;
>
> One space after '='.
>
Fixed.
>> + if (ps_level > AX_PS_D2 || ps_level < 0)
>> + ax_local->ps_level = 0;
>> + else
>> + ax_local->ps_level = ps_level;
>> +
>> + ax_local->capabilities |= comp ? AX_CAP_COMP : 0;
>> +
>> + if (netif_msg_probe(ax_local)) {
>> + dev_info(&spi->dev, "AX88796C-SPI Configuration:\n");
>> + dev_info(&spi->dev, " Compression : %s\n",
>> + ax_local->capabilities & AX_CAP_COMP ? "ON" : "OFF");
>> + dev_info(&spi->dev, " Power Saving Level: %d\n",
>> + ax_local->ps_level);
>> + }
>> +
>> + ndev->netdev_ops = &ax88796c_netdev_ops;
>> + ndev->ethtool_ops = &ax88796c_ethtool_ops;
>
> No spaces before '='.
>
Fixed.
>> +
>> + ax_local->ndev = ndev;
>
> Set all priv-storing-pointers in one place, so next to dev_set_drvdata()
> unless it is chosen by probe() flow on purpose.
Done.
>> +
>> + /* Initialize MII structure */
>> + ax_local->mii.dev = ndev;
>> + ax_local->mii.mdio_read = ax88796c_mdio_read;
>> + ax_local->mii.mdio_write = ax88796c_mdio_write;
>> + ax_local->mii.phy_id_mask = 0x3f;
>> + ax_local->mii.reg_num_mask = 0x1f;
>> + ax_local->mii.phy_id = 0x10;
>> +
>> + /* ax88796c gpio reset */
>> + ax88796c_hard_reset(ax_local);
>> +
>> + /* Reset AX88796C */
>> + ret = ax88796c_soft_reset(ax_local);
>> + if (ret < 0) {
>> + return -ENODEV;
>> + }
>
> No need for {}.
>
Fixed
>> +
>> + /* Check board revision */
>> + temp = AX_READ(&ax_local->ax_spi, P2_CRIR);
>> + if ((temp & 0xF) != 0x0) {
>> + dev_err(&spi->dev, "spi read failed: %d\n", temp);
>> + return -ENODEV;
>> + }
>> +
>> + temp = AX_READ(&ax_local->ax_spi, P0_BOR);
>> + if (temp == 0x1234) {
>> + ax_local->plat_endian = PLAT_LITTLE_ENDIAN;
>> + } else {
>> + AX_WRITE(&ax_local->ax_spi, 0xFFFF, P0_BOR);
>> + ax_local->plat_endian = PLAT_BIG_ENDIAN;
>> + }
>> +
>> + if (netif_msg_hw(ax_local)) {
>> + dev_info(&spi->dev,
>> + "Dump all MAC registers before initialization:\n");
>> + ax88796c_dump_regs(ax_local);
>> + ax88796c_dump_phy_regs(ax_local);
>> + }
>> +
>> + /*Reload EEPROM*/
>> + ax88796c_reload_eeprom(ax_local);
>> +
>> + ax88796c_load_mac_addr(ndev);
>> +
>> + if (netif_msg_probe(ax_local))
>> + dev_info(&spi->dev,
>> + "irq %d, MAC addr "
>> + "%02X:%02X:%02X:%02X:%02X:%02X\n",
>> + ndev->irq,
>> + ndev->dev_addr[0], ndev->dev_addr[1],
>> + ndev->dev_addr[2], ndev->dev_addr[3],
>> + ndev->dev_addr[4], ndev->dev_addr[5]);
>> +
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + INIT_WORK(&ax_local->ax_work, ax88796c_work);
>> +
>> + ax_local->ax_work_queue =
>> + create_singlethread_workqueue("ax88796c_work");
>> +
>> + sema_init(&ax_local->spi_lock, 1);
>> +
>> + skb_queue_head_init(&ax_local->tx_wait_q);
>> +
>> + ndev->features |= NETIF_F_HW_CSUM;
>> + ax_local->checksum = AX_RX_CHECKSUM | AX_TX_CHECKSUM;
>> + ndev->hard_header_len += (TX_OVERHEAD + 4);
>> +
>> + ret = register_netdev(ndev);
>> + if (!ret) {
>> + if (netif_msg_probe(ax_local))
>> + netdev_info(ndev, "%s %s registered\n",
>> + dev_driver_string(&spi->dev),
>> + dev_name(&spi->dev));
>> + return ret;
>> + }
>
> That's unusual flow - exit on success early. Follow the kernel pattern
> of "return 0" on success and jumps to common error handling like:
>
> ret = register_netdev(ndev)
> if (ret)
> // handle error: maybe dev_err and goto
>
> if (netif_msg_probe())
> netdev_info();
>
> return 0;
>
Done.
>> +
>> + dev_err(&spi->dev, "failed to register a network device\n");
>> + destroy_workqueue(ax_local->ax_work_queue);
>> +
>> + return ret;
>> +}
>> +
>> +static int
>> +ax88796c_suspend(struct spi_device *spi, pm_message_t mesg)
>> +{
>> + struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
>> + struct net_device *ndev = ax_local->ndev;
>> + u8 power;
>> +
>> + if (!ndev || !netif_running(ndev))
>> + return 0;
>
> !ndev cannot happen (device should not be suspended before end of
> probe). If it can, there is a bug which you should not silently ignore.
>
Removed.
>> +
>> + netif_device_detach(ndev);
>> +
>> + netif_stop_queue(ndev);
>> +
>> + down(&ax_local->spi_lock);
>> +
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
>> + ax88796c_free_skb_queue(&ax_local->tx_wait_q);
>> +
>> + if (ax_local->wol) {
>> +
>> + AX_WRITE(&ax_local->ax_spi, 0, P5_WFTR);
>> +
>> + if (ax_local->wol & WFCR_LINKCH) { /* Link change */
>> +
>> + /* Disable wol power saving in link change mode */
>> + AX_WRITE(&ax_local->ax_spi,
>> + (AX_READ(&ax_local->ax_spi, P0_PSCR)
>> + & ~PSCR_WOLPS), P0_PSCR);
>> +
>> + if (netif_msg_wol(ax_local))
>> + netdev_info(ndev,
>> + "Enable link change wakeup\n");
>> +
>> + AX_WRITE(&ax_local->ax_spi, WFTR_8192MS, P5_WFTR);
>> + }
>> + if (ax_local->wol & WFCR_MAGICP) { /* Magic packet */
>> + if (netif_msg_wol(ax_local))
>> + netdev_info(ndev,
>> + "Enable magic packet wakeup\n");
>> + }
>> +
>> + AX_WRITE(&ax_local->ax_spi,
>> + ax_local->wol | WFCR_WAKEUP | WFCR_PMEEN, P0_WFCR);
>> + }
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + up(&ax_local->spi_lock);
>> +
>> + return 0;
>> +}
>> +
>> +static int
>> +ax88796c_resume(struct spi_device *spi)
>> +{
>> + struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
>> + struct net_device *ndev = ax_local->ndev;
>> + u16 pme;
>> +
>> + down(&ax_local->spi_lock);
>> +
>> + /* Wakeup AX88796C first */
>> + ax88796c_check_power_and_wake(ax_local);
>> + msleep(200);
>> +
>> + pme = AX_READ(&ax_local->ax_spi, P0_WFCR);
>> + if (ax_local->wol && ~(pme & WFCR_WAITEVENT)) {
>> +
>> + if (pme & WFCR_LINKCHS) {
>> + if (netif_msg_wol(ax_local))
>> + netdev_info(ndev,
>> + "Wakeuped from link change.\n");
>> + } else if (pme & WFCR_MAGICPS) {
>> + if (netif_msg_wol(ax_local))
>> + netdev_info(ndev,
>> + "Wakeuped from magic packet.\n");
>> + }
>> +
>> + AX_WRITE(&ax_local->ax_spi, WFCR_CLRWAKE, P0_WFCR);
>> + }
>> +
>> + netif_device_attach(ndev);
>> +
>> + /* Initialize all the local variables*/
>> + ax88796c_soft_reset(ax_local);
>> +
>> + ax_local->seq_num = 0x1f;
>> +
>> + ax88796c_set_mac_addr(ndev);
>> + ax88796c_set_csums(ax_local);
>> +
>> + /* Disable stuffing packet */
>> + AX_WRITE(&ax_local->ax_spi,
>> + AX_READ(&ax_local->ax_spi, P1_RXBSPCR)
>> + & ~RXBSPCR_STUF_ENABLE, P1_RXBSPCR);
>> +
>> + /* Enable RX packet process */
>> + AX_WRITE(&ax_local->ax_spi, RPPER_RXEN, P1_RPPER);
>> +
>> + AX_WRITE(&ax_local->ax_spi,
>> + AX_READ(&ax_local->ax_spi, P0_FER)
>> + | FER_RXEN | FER_TXEN | FER_BSWAP, P0_FER);
>> +
>> + ax88796c_phy_init(ax_local);
>> +
>> + AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
>> +
>> + if (netif_msg_hw(ax_local)) {
>> + netdev_info(ndev,
>> + "Dump all MAC registers after initialization:\n");
>> + ax88796c_dump_regs(ax_local);
>> + ax88796c_dump_phy_regs(ax_local);
>> + }
>> +
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + netif_start_queue(ndev);
>> +
>> + up(&ax_local->spi_lock);
>> +
>> + return 0;
>> +}
>> +
>> +static int ax88796c_remove(struct spi_device *spi)
>> +{
>> + struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
>> + struct net_device *ndev = ax_local->ndev;
>> +
>> + if (netif_msg_probe(ax_local))
>> + netdev_info(ndev, "removing network device %s %s\n",
>> + dev_driver_string(&spi->dev),
>> + dev_name(&spi->dev));
>> +
>> + destroy_workqueue(ax_local->ax_work_queue);
>> +
>> + unregister_netdev(ndev);
>> +
>> + if (netif_msg_probe(ax_local))
>> + dev_info(&spi->dev, "device removed\n");
>> +
>> + return 0;
>> +}
>> +
>> +#ifdef CONFIG_USE_OF
>
> #ifdef should not be needed.
>
Removed.
>> +static const struct of_device_id ax88796c_dt_ids[] = {
>> + { .compatible = "asix,ax88796c" },
>> + {},
>> +};
>> +MODULE_DEVICE_TABLE(of, ax88796c_dt_ids);
>> +#endif
>> +
>> +static const struct spi_device_id asix_id[] = {
>> + { "ax88796c", 0 },
>> + { }
>> +};
>> +MODULE_DEVICE_TABLE(spi, asix_id);
>> +
>> +static struct spi_driver ax88796c_spi_driver = {
>> + .driver = {
>> + .name = DRV_NAME,
>> + .owner = THIS_MODULE,
>
> No need for owner.
>
Removed
>> +#ifdef CONFIG_USE_OF
>> + .of_match_table = of_match_ptr(ax88796c_dt_ids),
>> +#endif
>
> No need for ifdef.
>
Removed
>> + },
>> + .probe = ax88796c_probe,
>> + .remove = ax88796c_remove,
>> +// .suspend = ax88796c_suspend,
>> +// .resume = ax88796c_resume,
>
> ?
My bad. This is an old PM api that no longer exists. I commented it out
at first and forgot it. I've converted it to the new API.
>> + .id_table = asix_id,
>> +};
>> +
>> +static __init int ax88796c_spi_init(void)
>> +{
>> + pr_info("Register AX88796C SPI Ethernet Driver.\n");
>
> No, no printing of driver inits. It will bother everyone in the world.
>
> This all should be just module driver, no init/exit.
>
Removed.
>> + return spi_register_driver(&ax88796c_spi_driver);
>> +}
>> +
>> +static __exit void ax88796c_spi_exit(void)
>> +{
>> + spi_unregister_driver(&ax88796c_spi_driver);
>> +}
>> +
>> +module_init(ax88796c_spi_init);
>> +module_exit(ax88796c_spi_exit);
>> diff --git a/drivers/net/ethernet/asix/ax88796c_main.h b/drivers/net/ethernet/asix/ax88796c_main.h
>> new file mode 100644
>> index 000000000000..6c61766b1788
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/ax88796c_main.h
>> @@ -0,0 +1,596 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2010 ASIX Electronics Corporation
>> + * Copyright (c) 2020 Samsung Electronics
>> + *
>> + * ASIX AX88796C SPI Fast Ethernet Linux driver
>> + */
>> +
>> +#ifndef _AX88796C_MAIN_H
>> +#define _AX88796C_MAIN_H
>> +
>> +#define pr_fmt(fmt) "ax88796c: " fmt
>> +
>> +/* INCLUDE FILE DECLARATIONS */
>> +#ifdef CONFIG_USE_OF
>
> No ifdef.
>
Removed
>> +#include <linux/of.h>
>> +#endif
>> +#include <linux/crc32.h>
>> +#include <linux/etherdevice.h>
>> +#include <linux/ethtool.h>
>> +#include <linux/gpio/consumer.h>
>> +#include <linux/init.h>
>> +#include <linux/io.h>
>> +#include <linux/kmod.h>
>> +#include <linux/mii.h>
>> +#include <linux/module.h>
>> +#include <linux/netdevice.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/sched.h>
>> +#include <linux/spi/spi.h>
>> +#include <linux/timer.h>
>> +#include <linux/uaccess.h>
>> +#include <linux/usb.h>
>> +#include <linux/version.h>
>> +#include <linux/workqueue.h>
>
> All of these should be removed except the headers used directly in this
> header.
>
This is "private" header file included in all ax88796c_*.c files and
these are headers required in them. It seems more conveninet to have
them all listed in one place. What is the reason to do otherwise?
>> +
>> +#include <asm/dma.h>
>> +
>> +#include "ax88796c_spi.h"
>> +
>> +/* NAMING CONSTANT AND TYPE DECLARATIONS */
>> +/* These identify the driver base version and may not be removed. */
>> +#define DRV_NAME "ax88796c"
>> +#define ADP_NAME "ASIX AX88796C SPI Ethernet Adapter"
>> +#define DRV_VERSION "1.2.0"
>> +
>> +#define TX_QUEUE_HIGH_WATER 45 /* Tx queue high water mark */
>> +#define TX_QUEUE_LOW_WATER 20 /* Tx queue low water mark */
>> +
>> +#define AX88796C_WATCHDOG_PERIOD (1 * HZ)
>> +#define AX88796C_WATCHDOG_RESTART 7
>> +
>> +#define TX_OVERHEAD 8
>> +#define TX_EOP_SIZE 4
>> +
>> +#define AX_MCAST_FILTER_SIZE 8
>> +#define AX_MAX_MCAST 64
>> +#define AX_MAX_CLK 80000000
>> +#define TX_HDR_SOP_DICF 0x8000
>> +#define TX_HDR_SOP_CPHI 0x4000
>> +#define TX_HDR_SOP_INT 0x2000
>> +#define TX_HDR_SOP_MDEQ 0x1000
>> +#define TX_HDR_SOP_PKTLEN 0x07FF
>> +#define TX_HDR_SOP_SEQNUM 0xF800
>> +#define TX_HDR_SOP_PKTLENBAR 0x07FF
>> +
>> +#define TX_HDR_SEG_FS 0x8000
>> +#define TX_HDR_SEG_LS 0x4000
>> +#define TX_HDR_SEG_SEGNUM 0x3800
>> +#define TX_HDR_SEG_SEGLEN 0x0700
>> +#define TX_HDR_SEG_EOFST 0xC000
>> +#define TX_HDR_SEG_SOFST 0x3800
>> +#define TX_HDR_SEG_SEGLENBAR 0x07FF
>> +
>> +#define TX_HDR_EOP_SEQNUM 0xF800
>> +#define TX_HDR_EOP_PKTLEN 0x07FF
>> +#define TX_HDR_EOP_SEQNUMBAR 0xF800
>> +#define TX_HDR_EOP_PKTLENBAR 0x07FF
>> +
>> +/* Rx header fields mask */
>> +#define RX_HDR1_MCBC 0x8000
>> +#define RX_HDR1_STUFF_PKT 0x4000
>> +#define RX_HDR1_MII_ERR 0x2000
>> +#define RX_HDR1_CRC_ERR 0x1000
>> +#define RX_HDR1_PKT_LEN 0x07FF
>> +
>> +#define RX_HDR2_SEQ_NUM 0xF800
>> +#define RX_HDR2_PKT_LEN_BAR 0x7FFF
>> +
>> +#define RX_HDR3_PE 0x8000
>> +#define RX_HDR3_L4_TYPE_TCP 0x1000
>> +#define RX_HDR3_L4_TYPE_UDP 0x0400
>> +#define RX_HDR3_L3_ERR 0x0200
>> +#define RX_HDR3_L4_ERR 0x0100
>> +#define RX_HDR3_PRIORITY(x) ((x) << 4)
>> +#define RX_HDR3_STRIP 0x0008
>> +#define RX_HDR3_VLAN_ID 0x0007
>> +
>> +#define AX_RX_CHECKSUM 1
>> +#define AX_TX_CHECKSUM 2
>> +
>> +enum watchdog_state {
>> + chk_link = 0,
>> + chk_cable,
>> + ax_nop,
>> +};
>> +
>> +struct ax88796c_device {
>> +
>> + struct resource *addr_res; /* resources found */
>> + struct resource *addr_req; /* resources requested */
>> + struct resource *irq_res;
>> +
>> + struct spi_device *spi;
>> + struct net_device *ndev;
>> + struct mii_if_info mii;
>> + struct net_device_stats stats;
>> +
>> + struct timer_list watchdog;
>> + enum watchdog_state w_state;
>> + size_t w_ticks;
>> +
>> + struct work_struct ax_work;
>> + struct workqueue_struct *ax_work_queue;
>> + struct tasklet_struct bh;
>> +
>> + struct semaphore spi_lock;
>> +
>> + struct sk_buff_head tx_wait_q;
>> +
>> + struct axspi_data ax_spi;
>> +
>> + int msg_enable;
>> +
>> + u16 seq_num;
>> +
>> + u16 wol;
>> +
>> + u8 checksum;
>> +
>> + u8 multi_filter[AX_MCAST_FILTER_SIZE];
>> +
>> + unsigned long capabilities;
>> + #define AX_CAP_DMA 1
>> + #define AX_CAP_COMP 2
>> + #define AX_CAP_BIDIR 4
>> +
>> + u8 plat_endian;
>> + #define PLAT_LITTLE_ENDIAN 0
>> + #define PLAT_BIG_ENDIAN 1
>> +
>> + unsigned long flags;
>> + #define EVENT_INTR 1
>> + #define EVENT_TX 2
>> + #define EVENT_SET_MULTI 4
>> + #define EVENT_WATCHDOG 8
>> +
>> + u8 ps_level;
>> + #define AX_PS_D0 0
>> + #define AX_PS_D1 1
>> + #define AX_PS_D2 2
>> +
>> +
>> +};
>> +
>> +#define to_ax88796c_device(ndev) ((struct ax88796c_device *)netdev_priv(ndev))
>> +
>> +enum skb_state {
>> + illegal = 0,
>> + tx_done,
>> + rx_done,
>> + rx_err,
>> +};
>> +
>> +struct skb_data;
>> +
>> +struct skb_data {
>> + enum skb_state state;
>> + struct net_device *ndev;
>> + struct sk_buff *skb;
>> + size_t len;
>> + dma_addr_t phy_addr;
>> +};
>> +
>> +/* A88796C register definition */
>> + /* Definition of PAGE0 */
>> +#define P0_PSR (0x00)
>> + #define PSR_DEV_READY (1 << 7)
>> + #define PSR_RESET (0 << 15)
>> + #define PSR_RESET_CLR (1 << 15)
>> +#define P0_BOR (0x02)
>> +#define P0_FER (0x04)
>> + #define FER_IPALM (1 << 0)
>> + #define FER_DCRC (1 << 1)
>> + #define FER_RH3M (1 << 2)
>> + #define FER_HEADERSWAP (1 << 7)
>> + #define FER_WSWAP (1 << 8)
>> + #define FER_BSWAP (1 << 9)
>> + #define FER_INTHI (1 << 10)
>> + #define FER_INTLO (0 << 10)
>> + #define FER_IRQ_PULL (1 << 11)
>> + #define FER_RXEN (1 << 14)
>> + #define FER_TXEN (1 << 15)
>> +#define P0_ISR (0x06)
>> + #define ISR_RXPKT (1 << 0)
>> + #define ISR_MDQ (1 << 4)
>> + #define ISR_TXT (1 << 5)
>> + #define ISR_TXPAGES (1 << 6)
>> + #define ISR_TXERR (1 << 8)
>> + #define ISR_LINK (1 << 9)
>> +#define P0_IMR (0x08)
>> + #define IMR_RXPKT (1 << 0)
>> + #define IMR_MDQ (1 << 4)
>> + #define IMR_TXT (1 << 5)
>> + #define IMR_TXPAGES (1 << 6)
>> + #define IMR_TXERR (1 << 8)
>> + #define IMR_LINK (1 << 9)
>> + #define IMR_MASKALL (0xFFFF)
>> + #define IMR_DEFAULT (IMR_TXERR)
>> +#define P0_WFCR (0x0A)
>> + #define WFCR_PMEIND (1 << 0) /* PME indication */
>> + #define WFCR_PMETYPE (1 << 1) /* PME I/O type */
>> + #define WFCR_PMEPOL (1 << 2) /* PME polarity */
>> + #define WFCR_PMERST (1 << 3) /* Reset PME */
>> + #define WFCR_SLEEP (1 << 4) /* Enable sleep mode */
>> + #define WFCR_WAKEUP (1 << 5) /* Enable wakeup mode */
>> + #define WFCR_WAITEVENT (1 << 6) /* Reserved */
>> + #define WFCR_CLRWAKE (1 << 7) /* Clear wakeup */
>> + #define WFCR_LINKCH (1 << 8) /* Enable link change */
>> + #define WFCR_MAGICP (1 << 9) /* Enable magic packet */
>> + #define WFCR_WAKEF (1 << 10) /* Enable wakeup frame */
>> + #define WFCR_PMEEN (1 << 11) /* Enable PME pin */
>> + #define WFCR_LINKCHS (1 << 12) /* Link change status */
>> + #define WFCR_MAGICPS (1 << 13) /* Magic packet status */
>> + #define WFCR_WAKEFS (1 << 14) /* Wakeup frame status */
>> + #define WFCR_PMES (1 << 15) /* PME pin status */
>> +#define P0_PSCR (0x0C)
>> + #define PSCR_PS_MASK (0xFFF0)
>> + #define PSCR_PS_D0 (0)
>> + #define PSCR_PS_D1 (1 << 0)
>> + #define PSCR_PS_D2 (1 << 1)
>> + #define PSCR_FPS (1 << 3) /* Enable fiber mode PS */
>> + #define PSCR_SWPS (1 << 4) /* Enable software */
>> + /* PS control */
>> + #define PSCR_WOLPS (1 << 5) /* Enable WOL PS */
>> + #define PSCR_SWWOL (1 << 6) /* Enable software select */
>> + /* WOL PS */
>> + #define PSCR_PHYOSC (1 << 7) /* Internal PHY OSC control */
>> + #define PSCR_FOFEF (1 << 8) /* Force PHY generate FEF */
>> + #define PSCR_FOF (1 << 9) /* Force PHY in fiber mode */
>> + #define PSCR_PHYPD (1 << 10) /* PHY power down. */
>> + /* Active high */
>> + #define PSCR_PHYRST (1 << 11) /* PHY reset signal. */
>> + /* Active low */
>> + #define PSCR_PHYCSIL (1 << 12) /* PHY cable energy detect */
>> + #define PSCR_PHYCOFF (1 << 13) /* PHY cable off */
>> + #define PSCR_PHYLINK (1 << 14) /* PHY link status */
>> + #define PSCR_EEPOK (1 << 15) /* EEPROM load complete */
>> +#define P0_MACCR (0x0E)
>> + #define MACCR_RXFC_ENABLE (1 << 3)
>> + #define MACCR_RXFC_MASK 0xFFF7
>> + #define MACCR_TXFC_ENABLE (1 << 4)
>> + #define MACCR_TXFC_MASK 0xFFEF
>> + #define MACCR_PF (1 << 7)
>> + #define MACCR_PMM_BITS 8
>> + #define MACCR_PMM_MASK (0x1F00)
>> + #define MACCR_PMM_RESET (1 << 8)
>> + #define MACCR_PMM_WAIT (2 << 8)
>> + #define MACCR_PMM_READY (3 << 8)
>> + #define MACCR_PMM_D1 (4 << 8)
>> + #define MACCR_PMM_D2 (5 << 8)
>> + #define MACCR_PMM_WAKE (7 << 8)
>> + #define MACCR_PMM_D1_WAKE (8 << 8)
>> + #define MACCR_PMM_D2_WAKE (9 << 8)
>> + #define MACCR_PMM_SLEEP (10 << 8)
>> + #define MACCR_PMM_PHY_RESET (11 << 8)
>> + #define MACCR_PMM_SOFT_D1 (16 << 8)
>> + #define MACCR_PMM_SOFT_D2 (17 << 8)
>> +#define P0_TFBFCR (0x10)
>> + #define TFBFCR_SCHE_FREE_PAGE 0xE07F
>> + #define TFBFCR_FREE_PAGE_BITS 0x07
>> + #define TFBFCR_FREE_PAGE_LATCH (1 << 6)
>> + #define TFBFCR_SET_FREE_PAGE(x) ((x & 0x3F) << TFBFCR_FREE_PAGE_BITS)
>> + #define TFBFCR_TX_PAGE_SET (1 << 13)
>> + #define TFBFCR_MANU_ENTX (1 << 15)
>> + #define TX_FREEBUF_MASK 0x003F
>> + #define TX_DPTSTART 0x4000
>> +
>> +#define P0_TSNR (0x12)
>> + #define TXNR_TXB_ERR (1 << 5)
>> + #define TXNR_TXB_IDLE (1 << 6)
>> + #define TSNR_PKT_CNT(x) (((x) & 0x3F) << 8)
>> + #define TXNR_TXB_REINIT (1 << 14)
>> + #define TSNR_TXB_START (1 << 15)
>> +#define P0_RTDPR (0x14)
>> +#define P0_RXBCR1 (0x16)
>> + #define RXBCR1_RXB_DISCARD (1 << 14)
>> + #define RXBCR1_RXB_START (1 << 15)
>> +#define P0_RXBCR2 (0x18)
>> + #define RXBCR2_PKT_MASK (0xFF)
>> + #define RXBCR2_RXPC_MASK (0x7F)
>> + #define RXBCR2_RXB_READY (1 << 13)
>> + #define RXBCR2_RXB_IDLE (1 << 14)
>> + #define RXBCR2_RXB_REINIT (1 << 15)
>> +#define P0_RTWCR (0x1A)
>> + #define RTWCR_RXWC_MASK (0x3FFF)
>> + #define RTWCR_RX_LATCH (1 << 15)
>> +#define P0_RCPHR (0x1C)
>> +
>> + /* Definition of PAGE1 */
>> +#define P1_RPPER (0x22)
>> + #define RPPER_RXEN (1 << 0)
>> +#define P1_MRCR (0x28)
>> +#define P1_MDR (0x2A)
>> +#define P1_RMPR (0x2C)
>> +#define P1_TMPR (0x2E)
>> +#define P1_RXBSPCR (0x30)
>> + #define RXBSPCR_STUF_WORD_CNT(x) (((x) & 0x7000) >> 12)
>> + #define RXBSPCR_STUF_ENABLE (1 << 15)
>> +#define P1_MCR (0x32)
>> + #define MCR_SBP (1 << 8)
>> + #define MCR_SM (1 << 9)
>> + #define MCR_CRCENLAN (1 << 11)
>> + #define MCR_STP (1 << 12)
>> + /* Definition of PAGE2 */
>> +#define P2_CIR (0x42)
>> +#define P2_POOLCR (0x44)
>> + #define POOLCR_POLL_EN (1 << 0)
>> + #define POOLCR_POLL_FLOWCTRL (1 << 1)
>> + #define POOLCR_POLL_BMCR (1 << 2)
>> + #define POOLCR_PHYID(x) ((x) << 8)
>> +#define P2_PHYSR (0x46)
>> +#define P2_MDIODR (0x48)
>> +#define P2_MDIOCR (0x4A)
>> + #define MDIOCR_RADDR(x) ((x) & 0x1F)
>> + #define MDIOCR_FADDR(x) (((x) & 0x1F) << 8)
>> + #define MDIOCR_VALID (1 << 13)
>> + #define MDIOCR_READ (1 << 14)
>> + #define MDIOCR_WRITE (1 << 15)
>> +#define P2_LCR0 (0x4C)
>> + #define LCR_LED0_EN (1 << 0)
>> + #define LCR_LED0_100MODE (1 << 1)
>> + #define LCR_LED0_DUPLEX (1 << 2)
>> + #define LCR_LED0_LINK (1 << 3)
>> + #define LCR_LED0_ACT (1 << 4)
>> + #define LCR_LED0_COL (1 << 5)
>> + #define LCR_LED0_10MODE (1 << 6)
>> + #define LCR_LED0_DUPCOL (1 << 7)
>> + #define LCR_LED1_EN (1 << 8)
>> + #define LCR_LED1_100MODE (1 << 9)
>> + #define LCR_LED1_DUPLEX (1 << 10)
>> + #define LCR_LED1_LINK (1 << 11)
>> + #define LCR_LED1_ACT (1 << 12)
>> + #define LCR_LED1_COL (1 << 13)
>> + #define LCR_LED1_10MODE (1 << 14)
>> + #define LCR_LED1_DUPCOL (1 << 15)
>> +#define P2_LCR1 (0x4E)
>> + #define LCR_LED2_MASK (0xFF00)
>> + #define LCR_LED2_EN (1 << 0)
>> + #define LCR_LED2_100MODE (1 << 1)
>> + #define LCR_LED2_DUPLEX (1 << 2)
>> + #define LCR_LED2_LINK (1 << 3)
>> + #define LCR_LED2_ACT (1 << 4)
>> + #define LCR_LED2_COL (1 << 5)
>> + #define LCR_LED2_10MODE (1 << 6)
>> + #define LCR_LED2_DUPCOL (1 << 7)
>> +#define P2_IPGCR (0x50)
>> +#define P2_CRIR (0x52)
>> +#define P2_FLHWCR (0x54)
>> +#define P2_RXCR (0x56)
>> + #define RXCR_PRO (1 << 0)
>> + #define RXCR_AMALL (1 << 1)
>> + #define RXCR_SEP (1 << 2)
>> + #define RXCR_AB (1 << 3)
>> + #define RXCR_AM (1 << 4)
>> + #define RXCR_AP (1 << 5)
>> + #define RXCR_ARP (1 << 6)
>> +#define P2_JLCR (0x58)
>> +#define P2_MPLR (0x5C)
>> +
>> + /* Definition of PAGE3 */
>> +#define P3_MACASR0 (0x62)
>> + #define P3_MACASR(x) (P3_MACASR0 + 2*x)
>> + #define MACASR_LOWBYTE_MASK 0x00FF
>> + #define MACASR_HIGH_BITS 0x08
>> +#define P3_MACASR1 (0x64)
>> +#define P3_MACASR2 (0x66)
>> +#define P3_MFAR01 (0x68)
>> +#define P3_MFAR_BASE (0x68)
>> + #define P3_MFAR(x) (P3_MFAR_BASE + 2*x)
>> +
>> +#define P3_MFAR23 (0x6A)
>> +#define P3_MFAR45 (0x6C)
>> +#define P3_MFAR67 (0x6E)
>> +#define P3_VID0FR (0x70)
>> +#define P3_VID1FR (0x72)
>> +#define P3_EECSR (0x74)
>> +#define P3_EEDR (0x76)
>> +#define P3_EECR (0x78)
>> + #define EECR_ADDR_MASK (0x00FF)
>> + #define EECR_READ_ACT (1 << 8)
>> + #define EECR_WRITE_ACT (1 << 9)
>> + #define EECR_WRITE_DISABLE (1 << 10)
>> + #define EECR_WRITE_ENABLE (1 << 11)
>> + #define EECR_EE_READY (1 << 13)
>> + #define EECR_RELOAD (1 << 14)
>> + #define EECR_RESET (1 << 15)
>> +#define P3_TPCR (0x7A)
>> + #define TPCR_PATT_MASK (0xFF)
>> + #define TPCR_RAND_PKT_EN (1 << 14)
>> + #define TPCR_FIXED_PKT_EN (1 << 15)
>> +#define P3_TPLR (0x7C)
>> + /* Definition of PAGE4 */
>> +#define P4_SPICR (0x8A)
>> + #define SPICR_RCEN (1 << 0)
>> + #define SPICR_QCEN (1 << 1)
>> + #define SPICR_RBRE (1 << 3)
>> + #define SPICR_PMM (1 << 4)
>> + #define SPICR_LOOPBACK (1 << 8)
>> + #define SPICR_CORE_RES_CLR (1 << 10)
>> + #define SPICR_SPI_RES_CLR (1 << 11)
>> +#define P4_SPIISMR (0x8C)
>> +
>> +#define P4_COERCR0 (0x92)
>> + #define COERCR0_RXIPCE (1 << 0)
>> + #define COERCR0_RXIPVE (1 << 1)
>> + #define COERCR0_RXV6PE (1 << 2)
>> + #define COERCR0_RXTCPE (1 << 3)
>> + #define COERCR0_RXUDPE (1 << 4)
>> + #define COERCR0_RXICMP (1 << 5)
>> + #define COERCR0_RXIGMP (1 << 6)
>> + #define COERCR0_RXICV6 (1 << 7)
>> +
>> + #define COERCR0_RXTCPV6 (1 << 8)
>> + #define COERCR0_RXUDPV6 (1 << 9)
>> + #define COERCR0_RXICMV6 (1 << 10)
>> + #define COERCR0_RXIGMV6 (1 << 11)
>> + #define COERCR0_RXICV6V6 (1 << 12)
>> +
>> + #define COERCR0_DEFAULT (COERCR0_RXIPCE | COERCR0_RXV6PE | \
>> + COERCR0_RXTCPE | COERCR0_RXUDPE | \
>> + COERCR0_RXTCPV6 | COERCR0_RXUDPV6)
>> +#define P4_COERCR1 (0x94)
>> + #define COERCR1_IPCEDP (1 << 0)
>> + #define COERCR1_IPVEDP (1 << 1)
>> + #define COERCR1_V6VEDP (1 << 2)
>> + #define COERCR1_TCPEDP (1 << 3)
>> + #define COERCR1_UDPEDP (1 << 4)
>> + #define COERCR1_ICMPDP (1 << 5)
>> + #define COERCR1_IGMPDP (1 << 6)
>> + #define COERCR1_ICV6DP (1 << 7)
>> + #define COERCR1_RX64TE (1 << 8)
>> + #define COERCR1_RXPPPE (1 << 9)
>> + #define COERCR1_TCP6DP (1 << 10)
>> + #define COERCR1_UDP6DP (1 << 11)
>> + #define COERCR1_IC6DP (1 << 12)
>> + #define COERCR1_IG6DP (1 << 13)
>> + #define COERCR1_ICV66DP (1 << 14)
>> + #define COERCR1_RPCE (1 << 15)
>> +
>> + #define COERCR1_DEFAULT (COERCR1_RXPPPE)
>> +#define P4_COETCR0 (0x96)
>> + #define COETCR0_TXIP (1 << 0)
>> + #define COETCR0_TXTCP (1 << 1)
>> + #define COETCR0_TXUDP (1 << 2)
>> + #define COETCR0_TXICMP (1 << 3)
>> + #define COETCR0_TXIGMP (1 << 4)
>> + #define COETCR0_TXICV6 (1 << 5)
>> + #define COETCR0_TXTCPV6 (1 << 8)
>> + #define COETCR0_TXUDPV6 (1 << 9)
>> + #define COETCR0_TXICMV6 (1 << 10)
>> + #define COETCR0_TXIGMV6 (1 << 11)
>> + #define COETCR0_TXICV6V6 (1 << 12)
>> +
>> + #define COETCR0_DEFAULT (COETCR0_TXIP | COETCR0_TXTCP | \
>> + COETCR0_TXUDP | COETCR0_TXTCPV6 | \
>> + COETCR0_TXUDPV6)
>> +#define P4_COETCR1 (0x98)
>> + #define COETCR1_TX64TE (1 << 0)
>> + #define COETCR1_TXPPPE (1 << 1)
>> +
>> +#define P4_COECEDR (0x9A)
>> +#define P4_L2CECR (0x9C)
>> +
>> + /* Definition of PAGE5 */
>> +#define P5_WFTR (0xA2)
>> + #define WFTR_2MS (0x01)
>> + #define WFTR_4MS (0x02)
>> + #define WFTR_8MS (0x03)
>> + #define WFTR_16MS (0x04)
>> + #define WFTR_32MS (0x05)
>> + #define WFTR_64MS (0x06)
>> + #define WFTR_128MS (0x07)
>> + #define WFTR_256MS (0x08)
>> + #define WFTR_512MS (0x09)
>> + #define WFTR_1024MS (0x0A)
>> + #define WFTR_2048MS (0x0B)
>> + #define WFTR_4096MS (0x0C)
>> + #define WFTR_8192MS (0x0D)
>> + #define WFTR_16384MS (0x0E)
>> + #define WFTR_32768MS (0x0F)
>> +#define P5_WFCCR (0xA4)
>> +#define P5_WFCR03 (0xA6)
>> + #define WFCR03_F0_EN (1 << 0)
>> + #define WFCR03_F1_EN (1 << 4)
>> + #define WFCR03_F2_EN (1 << 8)
>> + #define WFCR03_F3_EN (1 << 12)
>> +#define P5_WFCR47 (0xA8)
>> + #define WFCR47_F4_EN (1 << 0)
>> + #define WFCR47_F5_EN (1 << 4)
>> + #define WFCR47_F6_EN (1 << 8)
>> + #define WFCR47_F7_EN (1 << 12)
>> +#define P5_WF0BMR0 (0xAA)
>> +#define P5_WF0BMR1 (0xAC)
>> +#define P5_WF0CR (0xAE)
>> +#define P5_WF0OBR (0xB0)
>> +#define P5_WF1BMR0 (0xB2)
>> +#define P5_WF1BMR1 (0xB4)
>> +#define P5_WF1CR (0xB6)
>> +#define P5_WF1OBR (0xB8)
>> +#define P5_WF2BMR0 (0xBA)
>> +#define P5_WF2BMR1 (0xBC)
>> +
>> + /* Definition of PAGE6 */
>> +#define P6_WF2CR (0xC2)
>> +#define P6_WF2OBR (0xC4)
>> +#define P6_WF3BMR0 (0xC6)
>> +#define P6_WF3BMR1 (0xC8)
>> +#define P6_WF3CR (0xCA)
>> +#define P6_WF3OBR (0xCC)
>> +#define P6_WF4BMR0 (0xCE)
>> +#define P6_WF4BMR1 (0xD0)
>> +#define P6_WF4CR (0xD2)
>> +#define P6_WF4OBR (0xD4)
>> +#define P6_WF5BMR0 (0xD6)
>> +#define P6_WF5BMR1 (0xD8)
>> +#define P6_WF5CR (0xDA)
>> +#define P6_WF5OBR (0xDC)
>> +
>> +/* Definition of PAGE7 */
>> +#define P7_WF6BMR0 (0xE2)
>> +#define P7_WF6BMR1 (0xE4)
>> +#define P7_WF6CR (0xE6)
>> +#define P7_WF6OBR (0xE8)
>> +#define P7_WF7BMR0 (0xEA)
>> +#define P7_WF7BMR1 (0xEC)
>> +#define P7_WF7CR (0xEE)
>> +#define P7_WF7OBR (0xF0)
>> +#define P7_WFR01 (0xF2)
>> +#define P7_WFR23 (0xF4)
>> +#define P7_WFR45 (0xF6)
>> +#define P7_WFR67 (0xF8)
>> +#define P7_WFPC0 (0xFA)
>> +#define P7_WFPC1 (0xFC)
>> +
>> +
>> +/* Tx headers structure */
>> +struct tx_sop_header {
>> + /* bit 15-11: flags, bit 10-0: packet length */
>> + u16 flags_len;
>> + /* bit 15-11: sequence number, bit 11-0: packet length bar */
>> + u16 seq_lenbar;
>> +} __packed;
>> +
>> +struct tx_segment_header {
>> + /* bit 15-14: flags, bit 13-11: segment number */
>> + /* bit 10-0: segment length */
>> + u16 flags_seqnum_seglen;
>> + /* bit 15-14: end offset, bit 13-11: start offset */
>> + /* bit 10-0: segment length bar */
>> + u16 eo_so_seglenbar;
>> +} __packed;
>> +
>> +struct tx_eop_header {
>> + /* bit 15-11: sequence number, bit 10-0: packet length */
>> + u16 seq_len;
>> + /* bit 15-11: sequence number bar, bit 10-0: packet length bar */
>> + u16 seqbar_lenbar;
>> +} __packed;
>> +
>> +struct tx_pkt_info {
>> + struct tx_sop_header sop;
>> + struct tx_segment_header seg;
>> + struct tx_eop_header eop;
>> + u16 pkt_len;
>> + u16 seq_num;
>> +} __packed;
>> +
>> +/* Rx headers structure */
>> +struct rx_header {
>> + u16 flags_len;
>> + u16 seq_lenbar;
>> + u16 flags;
>> +} __packed;
>> +
>> +#endif /* #ifndef _AX88796C_MAIN_H */
>> diff --git a/drivers/net/ethernet/asix/ax88796c_spi.c b/drivers/net/ethernet/asix/ax88796c_spi.c
>> new file mode 100644
>> index 000000000000..5304eb33aad2
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/ax88796c_spi.c
>> @@ -0,0 +1,103 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2010 ASIX Electronics Corporation
>> + *
>> + * ASIX AX88796C SPI Fast Ethernet Linux driver
>> + */
>> +
>> +#include "ax88796c_main.h"
>> +#include "ax88796c_spi.h"
>> +
>> +/* driver bus management functions */
>> +void axspi_wakeup(struct axspi_data *ax_spi)
>> +{
>> + u8 tx_buf;
>> + int ret;
>> +
>> + tx_buf = AX_SPICMD_EXIT_PWD; /* OP */
>> + ret = spi_write(ax_spi->spi, &tx_buf, 1);
>> + if (ret)
>> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
>> +}
>> +
>> +void axspi_read_status(struct axspi_data *ax_spi, struct spi_status *status)
>> +{
>> + u8 tx_buf;
>> + int ret;
>> +
>> + /* OP */
>> + tx_buf = AX_SPICMD_READ_STATUS;
>> + ret = spi_write_then_read(ax_spi->spi, &tx_buf, 1, (u8 *)&status, 3);
>> + if (ret)
>> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
>> + else
>> + le16_to_cpus(&status->isr);
>> +}
>> +
>> +int axspi_read_rxq(struct axspi_data *ax_spi, void *data, int len)
>> +{
>> + struct spi_transfer *xfer = ax_spi->spi_rx_xfer;
>> + int ret;
>> +
>> + memcpy(ax_spi->cmd_buf, rx_cmd_buf, 5);
>> +
>> + xfer->tx_buf = ax_spi->cmd_buf;
>> + xfer->rx_buf = NULL;
>> + xfer->len = ax_spi->comp ? 2 : 5;
>> + xfer->bits_per_word = 8;
>> + spi_message_add_tail(xfer, &ax_spi->rx_msg);
>> +
>> + xfer++;
>> + xfer->rx_buf = data;
>> + xfer->tx_buf = NULL;
>> + xfer->len = len;
>> + xfer->bits_per_word = 8;
>> + spi_message_add_tail(xfer, &ax_spi->rx_msg);
>> + ret = spi_sync(ax_spi->spi, &ax_spi->rx_msg);
>> + if (ret)
>> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
>> +
>> + return ret;
>> +}
>> +
>> +int axspi_write_txq(struct axspi_data *ax_spi, void *data, int len)
>> +{
>> + return spi_write(ax_spi->spi, data, len);
>> +}
>> +
>> +u16 axspi_read_reg(struct axspi_data *ax_spi, u8 reg)
>> +{
>> + u8 tx_buf[4];
>> + u16 rx_buf = 0;
>> + int ret;
>> + int len = ax_spi->comp ? 3 : 4;
>> +
>> + tx_buf[0] = 0x03; /* OP code read register */
>> + tx_buf[1] = reg; /* register address */
>> + tx_buf[2] = 0xFF; /* dumy cycle */
>> + tx_buf[3] = 0xFF; /* dumy cycle */
>> + ret = spi_write_then_read(ax_spi->spi, tx_buf, len, (u8 *)&rx_buf, 2);
>> + if (ret)
>> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
>> + else
>> + le16_to_cpus(&rx_buf);
>> +
>> + return rx_buf;
>> +}
>> +
>> +void axspi_write_reg(struct axspi_data *ax_spi, u8 reg, u16 value)
>> +{
>> + u8 tx_buf[4];
>> + int ret;
>> +
>> + tx_buf[0] = AX_SPICMD_WRITE_REG; /* OP code read register */
>> + tx_buf[1] = reg; /* register address */
>> + tx_buf[2] = value;
>> + tx_buf[3] = value >> 8;
>> +
>> + ret = spi_write(ax_spi->spi, tx_buf, 4);
>> + if (ret)
>> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
>> +
>
> Run the checkpatch string and fix almost all issues (except ones you
> disagree).
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 483 bytes --]
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-26 14:59 ` Lukasz Stelmach
0 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-08-26 14:59 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Rob Herring, linux-kernel, Kukjin Kim, Jakub Kicinski,
David S. Miller, linux-arm-kernel, m.szyprowski
[-- Attachment #1.1: Type: text/plain, Size: 82619 bytes --]
It was <2020-08-25 wto 20:44>, when Krzysztof Kozlowski wrote:
> On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
>> ASIX AX88796[1] is a versatile ethernet adapter chip, that can be
>> connected to a CPU with a 8/16-bit bus or with an SPI. This driver
>> supports SPI connection.
>>
>> The driver has been ported from the vendor kernel for ARTIK5[2]
>> boards. Several changes were made to adapt it to the current kernel
>> which include:
>>
>> + updated DT configuration,
>> + clock configuration moved to DT,
>> + new timer, ethtool and gpio APIs
>> + dev_* instead of pr_* and custom printk() wrappers.
>>
>> [1] https://protect2.fireeye.com/v1/url?k=074e9e9d-5a9dc212-074f15d2-0cc47a31ce52-0f896a3d08738907&q=1&e=bcaebfa2-4f00-46b6-a35d-096f39710f47&u=https%3A%2F%2Fwww.asix.com.tw%2Fproducts.php%3Fop%3DpItemdetail%26PItemID%3D104%3B65%3B86%26PLine%3D65
>> [2] https://protect2.fireeye.com/v1/url?k=553869ec-08eb3563-5539e2a3-0cc47a31ce52-fc42424019c6fd8f&q=1&e=bcaebfa2-4f00-46b6-a35d-096f39710f47&u=https%3A%2F%2Fgit.tizen.org%2Fcgit%2Fprofile%2Fcommon%2Fplatform%2Fkernel%2Flinux-3.10-artik%2F
>>
>> The other ax88796 driver is for NE2000 compatible AX88796L chip. These
>> chips are not compatible. Hence, two separate drivers are required.
>
> Hi,
>
> Thanks for the driver, nice work. Few comments below.
>
Thank you. I fixed most problems and asked some question where I didn't
understand.
>>
>> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
>> ---
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/asix/Kconfig | 20 +
>> drivers/net/ethernet/asix/Makefile | 6 +
>> drivers/net/ethernet/asix/ax88796c_ioctl.c | 293 +++++
>> drivers/net/ethernet/asix/ax88796c_ioctl.h | 21 +
>> drivers/net/ethernet/asix/ax88796c_main.c | 1373 ++++++++++++++++++++
>> drivers/net/ethernet/asix/ax88796c_main.h | 596 +++++++++
>> drivers/net/ethernet/asix/ax88796c_spi.c | 103 ++
>> drivers/net/ethernet/asix/ax88796c_spi.h | 67 +
>> 10 files changed, 2481 insertions(+)
>> create mode 100644 drivers/net/ethernet/asix/Kconfig
>> create mode 100644 drivers/net/ethernet/asix/Makefile
>> create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.c
>> create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.h
>> create mode 100644 drivers/net/ethernet/asix/ax88796c_main.c
>> create mode 100644 drivers/net/ethernet/asix/ax88796c_main.h
>> create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.c
>> create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.h
>>
>> diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
>> index de50e8b9e656..f3b218e45ea5 100644
>> --- a/drivers/net/ethernet/Kconfig
>> +++ b/drivers/net/ethernet/Kconfig
>> @@ -32,6 +32,7 @@ source "drivers/net/ethernet/apm/Kconfig"
>> source "drivers/net/ethernet/apple/Kconfig"
>> source "drivers/net/ethernet/aquantia/Kconfig"
>> source "drivers/net/ethernet/arc/Kconfig"
>> +source "drivers/net/ethernet/asix/Kconfig"
>> source "drivers/net/ethernet/atheros/Kconfig"
>> source "drivers/net/ethernet/aurora/Kconfig"
>> source "drivers/net/ethernet/broadcom/Kconfig"
>> diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
>> index f8f38dcb5f8a..9eb368d93607 100644
>> --- a/drivers/net/ethernet/Makefile
>> +++ b/drivers/net/ethernet/Makefile
>> @@ -18,6 +18,7 @@ obj-$(CONFIG_NET_XGENE) += apm/
>> obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
>> obj-$(CONFIG_NET_VENDOR_AQUANTIA) += aquantia/
>> obj-$(CONFIG_NET_VENDOR_ARC) += arc/
>> +obj-$(CONFIG_NET_VENDOR_ASIX) += asix/
>> obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
>> obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/
>> obj-$(CONFIG_NET_VENDOR_CADENCE) += cadence/
>> diff --git a/drivers/net/ethernet/asix/Kconfig b/drivers/net/ethernet/asix/Kconfig
>> new file mode 100644
>> index 000000000000..4b127a4a659a
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/Kconfig
>> @@ -0,0 +1,20 @@
>> +#
>> +# Asix network device configuration
>> +#
>> +
>> +config NET_VENDOR_ASIX
>> + bool "Asix devices"
>> + depends on SPI
>> + help
>> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
>
> Looks like too long, did it pass checkpatch?
Yes? Let me try again. Yes, this one passed, but I missed a few other
problems. Thank you.
>> +
>> +if NET_VENDOR_ASIX
>> +
>> +config SPI_AX88796C
>> + tristate "Asix AX88796C-SPI support"
>> + depends on SPI
>> + depends on GPIOLIB
>> + help
>> + Say Y here if you intend to attach a Asix AX88796C as SPI mode
>> +
>> +endif # NET_VENDOR_ASIX
>> diff --git a/drivers/net/ethernet/asix/Makefile b/drivers/net/ethernet/asix/Makefile
>> new file mode 100644
>> index 000000000000..0bfbbb042634
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/Makefile
>> @@ -0,0 +1,6 @@
>> +#
>> +# Makefile for the Asix network device drivers.
>> +#
>> +
>> +obj-$(CONFIG_SPI_AX88796C) += ax88796c.o
>> +ax88796c-y := ax88796c_main.o ax88796c_ioctl.o ax88796c_spi.o
>> diff --git a/drivers/net/ethernet/asix/ax88796c_ioctl.c b/drivers/net/ethernet/asix/ax88796c_ioctl.c
>> new file mode 100644
>> index 000000000000..eba361e2a8b7
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.c
>> @@ -0,0 +1,293 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2010 ASIX Electronics Corporation
>> + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
>> + *
>> + * ASIX AX88796C SPI Fast Ethernet Linux driver
>> + */
>> +
>> +#include "ax88796c_main.h"
>> +#include "ax88796c_spi.h"
>> +#include "ax88796c_ioctl.h"
>> +
>> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
>
> Looks here like pointer to const. Unless it is because of
> AX_READ_STATUS() which cannot take const?
It can. I changed other stuff in ax88796c_spi.[hc] to const too.
>> +{
>
> Please put file-scope definitions first, so this should go to the end.
I don't understand.
>> + struct spi_status ax_status;
>> +
>> + /* Check media link status first */
>> + if (netif_carrier_ok(ax_local->ndev) ||
>> + (ax_local->ps_level == AX_PS_D0) ||
>> + (ax_local->ps_level == AX_PS_D1)) {
>> + return 0;
>> + }
>> +
>> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> + if (!(ax_status.status & AX_STATUS_READY))
>
> This looks buggy... AX_READ_STATUS can fail, without reporting an error.
> There is no error handling. What will be the value of ax_status? Sure,
> some stack-protector-GCC-plugins might initialize it to 0, but that's
> not a good design.
>
> There is no error handling of all SPI functions so entire driver works
> because of luck... if there is any error in the middle of some work, it
> won't spot it.
You are right this requires more work. I will do it.
>> + return 1;
>> +
>> + return 0;
>> +}
>> +
>> +u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local)
>> +{
>> + struct spi_status ax_status;
>> + unsigned long start_time;
>> +
>> + /* Check media link status first */
>> + if (netif_carrier_ok(ax_local->ndev) ||
>> + (ax_local->ps_level == AX_PS_D0) ||
>> + (ax_local->ps_level == AX_PS_D1)) {
>> + return 0;
>> + }
>> +
>> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> + if (!(ax_status.status & AX_STATUS_READY)) {
>> +
>> + /* AX88796C in power saving mode */
>> + AX_WAKEUP(&ax_local->ax_spi);
>> +
>> + /* Check status */
>> + start_time = jiffies;
>> + do {
>> + if (time_after(jiffies, start_time + HZ/2)) {
>> + netdev_err(ax_local->ndev,
>> + "timeout waiting for wakeup"
>> + " from power saving\n");
>> + break;
>> + }
>> +
>> + AX_READ_STATUS(&ax_local->ax_spi, &ax_status);
>> +
>> + } while (!(ax_status.status & AX_STATUS_READY));
>> +
>> + ax88796c_set_power_saving(ax_local, AX_PS_D0);
>> +
>> + return 1;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +void ax88796c_set_power_saving(struct ax88796c_device *ax_local, u8 ps_level)
>> +{
>> + u16 pmm;
>> +
>> + if (ps_level == AX_PS_D1)
>> + pmm = PSCR_PS_D1;
>> + else if (ps_level == AX_PS_D2)
>> + pmm = PSCR_PS_D2;
>> + else
>> + pmm = PSCR_PS_D0;
>> +
>> + AX_WRITE(&ax_local->ax_spi, (AX_READ(&ax_local->ax_spi, P0_PSCR)
>> + & PSCR_PS_MASK) | pmm, P0_PSCR);
>> +}
>> +
>> +int ax88796c_mdio_read(struct net_device *ndev, int phy_id, int loc)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + unsigned long start_time;
>> +
>> + AX_WRITE(&ax_local->ax_spi, MDIOCR_RADDR(loc)
>> + | MDIOCR_FADDR(phy_id) | MDIOCR_READ, P2_MDIOCR);
>> +
>> + start_time = jiffies;
>> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
>> + if (time_after(jiffies, start_time + HZ/100))
>> + return -EBUSY;
>> + }
>> +
>> + return AX_READ(&ax_local->ax_spi, P2_MDIODR);
>> +}
>> +
>> +void
>> +ax88796c_mdio_write(struct net_device *ndev, int phy_id, int loc, int val)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + unsigned long start_time;
>> +
>> + AX_WRITE(&ax_local->ax_spi, val, P2_MDIODR);
>> +
>> + AX_WRITE(&ax_local->ax_spi,
>> + MDIOCR_RADDR(loc) | MDIOCR_FADDR(phy_id)
>> + | MDIOCR_WRITE, P2_MDIOCR);
>> +
>> + start_time = jiffies;
>> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR) & MDIOCR_VALID) == 0) {
>> + if (time_after(jiffies, start_time + HZ/100))
>> + return;
>> + }
>> +
>> + if (loc == MII_ADVERTISE) {
>> + AX_WRITE(&ax_local->ax_spi, (BMCR_FULLDPLX | BMCR_ANRESTART |
>> + BMCR_ANENABLE | BMCR_SPEED100), P2_MDIODR);
>> + AX_WRITE(&ax_local->ax_spi, (MDIOCR_RADDR(MII_BMCR) |
>> + MDIOCR_FADDR(phy_id) | MDIOCR_WRITE),
>> + P2_MDIOCR);
>> +
>> + start_time = jiffies;
>> + while ((AX_READ(&ax_local->ax_spi, P2_MDIOCR)
>> + & MDIOCR_VALID) == 0) {
>> + if (time_after(jiffies, start_time + HZ/100))
>> + return;
>> + }
>> + }
>> +}
>> +
>> +void ax88796c_set_csums(struct ax88796c_device *ax_local)
>> +{
>> + if (ax_local->checksum & AX_RX_CHECKSUM) {
>> + AX_WRITE(&ax_local->ax_spi, COERCR0_DEFAULT, P4_COERCR0);
>> + AX_WRITE(&ax_local->ax_spi, COERCR1_DEFAULT, P4_COERCR1);
>> + } else {
>> + AX_WRITE(&ax_local->ax_spi, 0, P4_COERCR0);
>> + AX_WRITE(&ax_local->ax_spi, 0, P4_COERCR1);
>> + }
>> +
>> + if (ax_local->checksum & AX_TX_CHECKSUM) {
>> + AX_WRITE(&ax_local->ax_spi, COETCR0_DEFAULT, P4_COETCR0);
>> + AX_WRITE(&ax_local->ax_spi, COETCR1_TXPPPE, P4_COETCR1);
>> + } else {
>> + AX_WRITE(&ax_local->ax_spi, 0, P4_COETCR0);
>> + AX_WRITE(&ax_local->ax_spi, 0, P4_COETCR1);
>> + }
>> +}
>> +
>> +static void ax88796c_get_drvinfo(struct net_device *ndev,
>> + struct ethtool_drvinfo *info)
>> +{
>> + /* Inherit standard device info */
>> + strncpy(info->driver, DRV_NAME, sizeof(info->driver));
>> + strncpy(info->version, DRV_VERSION, sizeof(info->version));
>> +}
>> +
>> +static u32 ax88796c_get_link(struct net_device *ndev)
>> +{
>> + u32 link;
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + link = mii_link_ok(&ax_local->mii);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> + up(&ax_local->spi_lock);
>> +
>> + return link;
>> +
>> +
>
> Empty lines.
Fixed.
>> +}
>> +
>> +static u32 ax88796c_get_msglevel(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + return ax_local->msg_enable;
>> +}
>> +
>> +static void ax88796c_set_msglevel(struct net_device *ndev, u32 level)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + ax_local->msg_enable = level;
>> +}
>> +
>> +
>
> One line break.
Fixed.
>> +static int
>> +ax88796c_get_link_ksettings(struct net_device *ndev,
>> + struct ethtool_link_ksettings *cmd)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + mii_ethtool_get_link_ksettings(&ax_local->mii, cmd);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> + up(&ax_local->spi_lock);
>> +
>> + return 0;
>> +}
>> +
>> +static int
>> +ax88796c_set_link_ksettings(struct net_device *ndev,
>> + const struct ethtool_link_ksettings *cmd)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + mii_ethtool_set_link_ksettings(&ax_local->mii, cmd);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> + up(&ax_local->spi_lock);
>> + return 0;
>> +
>
> Line before return, not after.
>
Fixed.
>> +}
>> +
>> +static int ax88796c_nway_reset(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + int ret;
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + ret = mii_nway_restart(&ax_local->mii);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> + up(&ax_local->spi_lock);
>> + return ret;
>> +}
>> +
>> +static u32 ax88796c_ethtool_getmsglevel(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + return ax_local->msg_enable;
>> +}
>> +
>> +static void ax88796c_ethtool_setmsglevel(struct net_device *ndev, u32 level)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + ax_local->msg_enable = level;
>> +}
>> +
>> +struct ethtool_ops ax88796c_ethtool_ops = {
>> + .get_drvinfo = ax88796c_get_drvinfo,
>> + .get_link = ax88796c_get_link,
>> + .get_msglevel = ax88796c_get_msglevel,
>> + .set_msglevel = ax88796c_set_msglevel,
>> + .get_link_ksettings = ax88796c_get_link_ksettings,
>> + .set_link_ksettings = ax88796c_set_link_ksettings,
>> + .nway_reset = ax88796c_nway_reset,
>> + .get_msglevel = ax88796c_ethtool_getmsglevel,
>> + .set_msglevel = ax88796c_ethtool_setmsglevel,
>> +};
>> +
>> +int ax88796c_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + int ret;
>> + u8 power;
>> +
>> + down(&ax_local->spi_lock);
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + ret = generic_mii_ioctl(&ax_local->mii, if_mii(ifr), cmd, NULL);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> + up(&ax_local->spi_lock);
>> +
>> + return ret;
>> +}
>> +
>> diff --git a/drivers/net/ethernet/asix/ax88796c_ioctl.h b/drivers/net/ethernet/asix/ax88796c_ioctl.h
>> new file mode 100644
>> index 000000000000..bafd573bd813
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/ax88796c_ioctl.h
>> @@ -0,0 +1,21 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2010 ASIX Electronics Corporation
>> + *
>> + * ASIX AX88796C SPI Fast Ethernet Linux driver
>> + */
>> +
>> +#ifndef _AX88796C_IOCTL_H
>> +#define _AX88796C_IOCTL_H
>> +
>> +extern struct ethtool_ops ax88796c_ethtool_ops;
>> +
>> +u8 ax88796c_check_power(struct ax88796c_device *ax_local);
>> +u8 ax88796c_check_power_and_wake(struct ax88796c_device *ax_local);
>> +void ax88796c_set_power_saving(struct ax88796c_device *ax_local, u8 ps_level);
>> +int ax88796c_mdio_read(struct net_device *dev, int phy_id, int loc);
>> +void ax88796c_mdio_write(struct net_device *dev, int phy_id, int loc, int val);
>> +void ax88796c_set_csums(struct ax88796c_device *ax_local);
>> +int ax88796c_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
>> +
>> +#endif
>> diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c
>> new file mode 100644
>> index 000000000000..c28cfb931319
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/ax88796c_main.c
>> @@ -0,0 +1,1373 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2010 ASIX Electronics Corporation
>> + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
>> + *
>> + * ASIX AX88796C SPI Fast Ethernet Linux driver
>> + */
>> +
>> +#include "ax88796c_main.h"
>> +#include "ax88796c_ioctl.h"
>> +
>> +static int comp;
>> +static int ps_level = AX_PS_D0;
>> +static int msg_enable = NETIF_MSG_PROBE |
>> + NETIF_MSG_LINK |
>> + /* NETIF_MSG_TIMER | */
>> + NETIF_MSG_RX_ERR |
>> + NETIF_MSG_TX_ERR |
>> + /* NETIF_MSG_TX_QUEUED | */
>> + /* NETIF_MSG_INTR | */
>> + /* NETIF_MSG_TX_DONE | */
>> + /* NETIF_MSG_RX_STATUS | */
>> + /* NETIF_MSG_PKTDATA | */
>> + /* NETIF_MSG_HW | */
>> + NETIF_MSG_WOL;
>> +
>> +module_param(comp, int, 0);
>> +MODULE_PARM_DESC(comp, "0=Non-Compression Mode, 1=Compression Mode");
>> +
>> +module_param(ps_level, int, 0);
>> +MODULE_PARM_DESC(ps_level,
>> + "Power Saving Level (0:disable 1:level 1 2:level 2)");
>> +
>> +module_param(msg_enable, int, 0);
>> +MODULE_PARM_DESC(msg_enable, "Message mask (see linux/netdevice.h for bitmap)");
>> +
>> +static char *macaddr;
>> +module_param(macaddr, charp, 0);
>> +MODULE_PARM_DESC(macaddr, "MAC address");
>
> I think MAC address as param is not accepted in mainline...
>
$ git grep MODULE_PARM_DESC\(macaddr -- drivers/net | wc -l
6
>> +
>
>> +MODULE_AUTHOR("ASIX");
>> +MODULE_DESCRIPTION("ASIX AX88796C SPI Ethernet driver");
>> +MODULE_LICENSE("GPL");
>
> These three usually go to the end of file.
>
Fixed.
>> +
>> +static void ax88796c_dump_regs(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + u8 i, j;
>> +
>> + netdev_info(ndev,
>> + " Page0 Page1 Page2 Page3 "
>> + "Page4 Page5 Page6 Page7\n");
>> + for (i = 0; i < 0x20; i += 2) {
>> + netdev_info(ndev, "0x%02x ", i);
>> + for (j = 0; j < 8; j++) {
>> + netdev_info(ndev, "0x%04x ",
>> + AX_READ(&ax_local->ax_spi, j * 0x20 + i));
>> + }
>> + netdev_info(ndev, "\n");
>> + }
>> + netdev_info(ndev, "\n");
>> +}
>> +
>> +static void ax88796c_dump_phy_regs(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + int i;
>> +
>> + netdev_info(ndev, "Dump PHY registers:\n");
>> + for (i = 0; i < 6; i++) {
>> + netdev_info(ndev, " MR%d = 0x%04x\n", i,
>> + ax88796c_mdio_read(ax_local->ndev,
>> + ax_local->mii.phy_id, i));
>> + }
>> +}
>> +
>> +static void ax88796c_watchdog(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + u16 phy_status;
>> + unsigned long time_to_chk = AX88796C_WATCHDOG_PERIOD;
>> +
>> + if (ax88796c_check_power(ax_local)) {
>> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
>> + return;
>> + }
>> +
>> + ax88796c_set_power_saving(ax_local, AX_PS_D0);
>> +
>> + phy_status = AX_READ(&ax_local->ax_spi, P0_PSCR);
>> + if (phy_status & PSCR_PHYLINK) {
>> +
>> + ax_local->w_state = ax_nop;
>> + time_to_chk = 0;
>> +
>> + } else if (!(phy_status & PSCR_PHYCOFF)) {
>> + /* The ethernet cable has been plugged */
>> + if (ax_local->w_state == chk_cable) {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Cable connected\n");
>> +
>> + ax_local->w_state = chk_link;
>> + ax_local->w_ticks = 0;
>> + } else {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Check media status\n");
>> +
>> + if (++ax_local->w_ticks == AX88796C_WATCHDOG_RESTART) {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Restart autoneg\n");
>> + ax88796c_mdio_write(ndev,
>> + ax_local->mii.phy_id, MII_BMCR,
>> + (BMCR_SPEED100 | BMCR_ANENABLE |
>> + BMCR_ANRESTART));
>> +
>> + if (netif_msg_hw(ax_local))
>> + ax88796c_dump_phy_regs(ax_local);
>> + ax_local->w_ticks = 0;
>> + }
>> + }
>> + } else {
>> + if (netif_msg_timer(ax_local))
>> + netdev_info(ndev, "Check cable status\n");
>> +
>> + ax_local->w_state = chk_cable;
>> + }
>> +
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + if (time_to_chk)
>> + mod_timer(&ax_local->watchdog, jiffies + time_to_chk);
>> +}
>> +
>> +static void ax88796c_watchdog_timer(struct timer_list *t)
>> +{
>> + struct ax88796c_device *ax_local = from_timer(ax_local, t, watchdog);
>> + //struct net_device *ndev = ax_local->ndev;
>
> Clean up.
>
Done.
>> +
>> + set_bit(EVENT_WATCHDOG, &ax_local->flags);
>> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
>> +}
>> +
>> +static int ax88796c_soft_reset(struct ax88796c_device *ax_local)
>> +{
>> + unsigned long start;
>> + u16 temp;
>> +
>> + AX_WRITE(&ax_local->ax_spi, PSR_RESET, P0_PSR);
>> + AX_WRITE(&ax_local->ax_spi, PSR_RESET_CLR, P0_PSR);
>> +
>> + start = jiffies;
>> + while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
>> + if (time_after(jiffies, start + (160 * HZ / 1000))) {
>> + dev_err(&ax_local->spi->dev,
>> + "timeout waiting for reset completion\n");
>> + return -1;
>> + }
>> + }
>> +
>> + temp = AX_READ(&ax_local->ax_spi, P4_SPICR);
>> + if (ax_local->capabilities & AX_CAP_COMP) {
>> + AX_WRITE(&ax_local->ax_spi,
>> + (temp | SPICR_RCEN | SPICR_QCEN), P4_SPICR);
>> + ax_local->ax_spi.comp = 1;
>> + } else {
>> + AX_WRITE(&ax_local->ax_spi,
>> + (temp & ~(SPICR_RCEN | SPICR_QCEN)), P4_SPICR);
>> + ax_local->ax_spi.comp = 0;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int ax88796c_reload_eeprom(struct ax88796c_device *ax_local)
>> +{
>> + unsigned long start;
>> +
>> + AX_WRITE(&ax_local->ax_spi, EECR_RELOAD, P3_EECR);
>> +
>> + start = jiffies;
>> + while (!(AX_READ(&ax_local->ax_spi, P0_PSR) & PSR_DEV_READY)) {
>> + if (time_after(jiffies, start + (2 * HZ / 100))) {
>> + dev_err(&ax_local->spi->dev,
>> + "timeout waiting for reload eeprom\n");
>> + return -1;
>> + }
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static void ax88796c_set_hw_multicast(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u16 rx_ctl = RXCR_AB;
>> + int mc_count = netdev_mc_count(ndev);
>> +
>> + memset(ax_local->multi_filter, 0, AX_MCAST_FILTER_SIZE);
>> +
>> + if (ndev->flags & IFF_PROMISC) {
>> + rx_ctl |= RXCR_PRO;
>> +
>> + } else if (ndev->flags & IFF_ALLMULTI
>> + || mc_count > AX_MAX_MCAST) {
>> + rx_ctl |= RXCR_AMALL;
>> +
>> + } else if (mc_count == 0) {
>> + /* just broadcast and directed */
>> + } else {
>> + u32 crc_bits;
>> + int i;
>> + struct netdev_hw_addr *ha;
>> + netdev_for_each_mc_addr(ha, ndev) {
>> + crc_bits = ether_crc(ETH_ALEN, ha->addr);
>> + ax_local->multi_filter[crc_bits >> 29] |=
>> + (1 << ((crc_bits >> 26) & 7));
>> + }
>> +
>> + for (i = 0; i < 4; i++) {
>> + AX_WRITE(&ax_local->ax_spi,
>> + ((ax_local->multi_filter[i*2+1] << 8) |
>> + ax_local->multi_filter[i*2]), P3_MFAR(i));
>> +
>> + }
>> + }
>> +
>> + AX_WRITE(&ax_local->ax_spi, rx_ctl, P2_RXCR);
>> +
>
> No need for empty line.
>
Fixed.
>> +}
>> +
>> +#if 0
>
> Please comment why it is commented out.
>
Always has been (-; This is how it came from the vendor I missed it when
I focused on making things work. I will investigate it and either
uncomment or remove it.
>> +static void ax88796c_set_multicast(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> +
>> + set_bit(EVENT_SET_MULTI, &ax_local->flags);
>> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
>> +}
>> +#endif
>> +
>> +static void ax88796c_set_mac_addr(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> +
>> + AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[4] << 8) |
>> + (u16)ndev->dev_addr[5]), P3_MACASR0);
>> + AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[2] << 8) |
>> + (u16)ndev->dev_addr[3]), P3_MACASR1);
>> + AX_WRITE(&ax_local->ax_spi, ((u16)(ndev->dev_addr[0] << 8) |
>> + (u16)ndev->dev_addr[1]), P3_MACASR2);
>> +}
>> +
>> +static int ax88796c_set_mac_address(struct net_device *ndev, void *p)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + struct sockaddr *addr = p;
>> +
>> + if (!is_valid_ether_addr(addr->sa_data))
>> + return -EADDRNOTAVAIL;
>> +
>> + memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len);
>> +
>> + down(&ax_local->spi_lock);
>> +
>> + ax88796c_set_mac_addr(ndev);
>> +
>> + up(&ax_local->spi_lock);
>> +
>> + return 0;
>> +}
>> +
>> +static int ax88796c_load_mac_addr(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u16 temp;
>> +
>> + /* Read the MAC address from AX88796C */
>> + temp = AX_READ(&ax_local->ax_spi, P3_MACASR0);
>> + ndev->dev_addr[5] = (u8)temp;
>> + ndev->dev_addr[4] = (u8)(temp >> 8);
>> +
>> + temp = AX_READ(&ax_local->ax_spi, P3_MACASR1);
>> + ndev->dev_addr[3] = (u8)temp;
>> + ndev->dev_addr[2] = (u8)(temp >> 8);
>> +
>> + temp = AX_READ(&ax_local->ax_spi, P3_MACASR2);
>> + ndev->dev_addr[1] = (u8)temp;
>> + ndev->dev_addr[0] = (u8)(temp >> 8);
>> +
>> + /* Supported for no EEPROM */
>> + if (!is_valid_ether_addr(ndev->dev_addr)) {
>> + if (macaddr && mac_pton(macaddr, ndev->dev_addr))
>> + return 0;
>> +
>> + if (netif_msg_probe(ax_local))
>> + dev_info(&ax_local->spi->dev, "Use random MAC address\n");
>> +
>> + random_ether_addr(ndev->dev_addr);
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static void ax88796c_proc_tx_hdr(struct tx_pkt_info *info, u8 ip_summed)
>> +{
>> + u16 pkt_len_bar = (~info->pkt_len & TX_HDR_SOP_PKTLENBAR);
>> +
>> + /* Prepare SOP header */
>> + info->sop.flags_len = info->pkt_len |
>> + (ip_summed == CHECKSUM_NONE ? TX_HDR_SOP_DICF : 0);
>> +
>> + info->sop.seq_lenbar = ((info->seq_num << 11) & TX_HDR_SOP_SEQNUM)
>> + | pkt_len_bar;
>> + cpu_to_be16s(&info->sop.flags_len);
>> + cpu_to_be16s(&info->sop.seq_lenbar);
>> +
>> + /* Prepare Segment header */
>> + info->seg.flags_seqnum_seglen = TX_HDR_SEG_FS | TX_HDR_SEG_LS
>> + | info->pkt_len;
>> +
>> + info->seg.eo_so_seglenbar = pkt_len_bar;
>> +
>> + cpu_to_be16s(&info->seg.flags_seqnum_seglen);
>> + cpu_to_be16s(&info->seg.eo_so_seglenbar);
>> +
>> + /* Prepare EOP header */
>> + info->eop.seq_len = ((info->seq_num << 11) &
>> + TX_HDR_EOP_SEQNUM) | info->pkt_len;
>> + info->eop.seqbar_lenbar = ((~info->seq_num << 11) &
>> + TX_HDR_EOP_SEQNUMBAR) | pkt_len_bar;
>> +
>> + cpu_to_be16s(&info->eop.seq_len);
>> + cpu_to_be16s(&info->eop.seqbar_lenbar);
>> +}
>> +
>> +static int
>> +ax88796c_check_free_pages(struct ax88796c_device *ax_local, u8 need_pages)
>> +{
>> + u8 free_pages;
>> + u16 tmp;
>> +
>> + free_pages = AX_READ(&ax_local->ax_spi, P0_TFBFCR) & TX_FREEBUF_MASK;
>> + if (free_pages < need_pages) {
>> + /* schedule free page interrupt */
>> + tmp = AX_READ(&ax_local->ax_spi, P0_TFBFCR)
>> + & TFBFCR_SCHE_FREE_PAGE;
>> + AX_WRITE(&ax_local->ax_spi, tmp | TFBFCR_TX_PAGE_SET |
>> + TFBFCR_SET_FREE_PAGE(need_pages),
>> + P0_TFBFCR);
>> + return -ENOMEM;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static struct sk_buff *
>> +ax88796c_tx_fixup(struct net_device *ndev, struct sk_buff_head *q)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + struct sk_buff *skb, *tx_skb;
>> + struct tx_pkt_info *info;
>> + struct skb_data *entry;
>> + int headroom;
>> + int tailroom;
>> + u8 need_pages;
>> + u16 tol_len, pkt_len;
>> + u8 padlen, seq_num;
>> + u8 spi_len = ax_local->ax_spi.comp ? 1 : 4;
>> +
>> + if (skb_queue_empty(q))
>> + return NULL;
>> +
>> + skb = skb_peek(q);
>> + pkt_len = skb->len;
>> + need_pages = (pkt_len + TX_OVERHEAD + 127) >> 7;
>> + if (ax88796c_check_free_pages(ax_local, need_pages) != 0)
>> + return NULL;
>> +
>> + headroom = skb_headroom(skb);
>> + tailroom = skb_tailroom(skb);
>> + padlen = ((pkt_len + 3) & 0x7FC) - pkt_len;
>> + tol_len = ((pkt_len + 3) & 0x7FC) +
>> + TX_OVERHEAD + TX_EOP_SIZE + spi_len;
>> + seq_num = ++ax_local->seq_num & 0x1F;
>> +
>> + info = (struct tx_pkt_info *) skb->cb;
>> + info->pkt_len = pkt_len;
>> +
>> + if ((!skb_cloned(skb)) &&
>> + (headroom >= (TX_OVERHEAD + spi_len)) &&
>> + (tailroom >= (padlen + TX_EOP_SIZE))) {
>> +
>> + info->seq_num = seq_num;
>> + ax88796c_proc_tx_hdr(info, skb->ip_summed);
>> +
>> + /* SOP and SEG header */
>> + memcpy(skb_push(skb, TX_OVERHEAD), &info->sop, TX_OVERHEAD);
>> +
>> + /* Write SPI TXQ header */
>> + memcpy(skb_push(skb, spi_len), tx_cmd_buf, spi_len);
>> +
>> + /* Make 32-bit aligment */
>> + skb_put(skb, padlen);
>> +
>> + /* EOP header */
>> + memcpy(skb_put(skb, TX_EOP_SIZE), &info->eop, TX_EOP_SIZE);
>> +
>> + tx_skb = skb;
>> + skb_unlink(skb, q);
>> +
>> + } else {
>> +
>> + tx_skb = alloc_skb(tol_len, GFP_KERNEL);
>> + if (!tx_skb)
>> + return NULL;
>> +
>> + /* Write SPI TXQ header */
>> + memcpy(skb_put(tx_skb, spi_len), tx_cmd_buf, spi_len);
>> +
>> + info->seq_num = seq_num;
>> + ax88796c_proc_tx_hdr(info, skb->ip_summed);
>> +
>> + /* SOP and SEG header */
>> + memcpy(skb_put(tx_skb, TX_OVERHEAD),
>> + &info->sop, TX_OVERHEAD);
>> +
>> + /* Packet */
>> + memcpy(skb_put(tx_skb, ((pkt_len + 3) & 0xFFFC)),
>> + skb->data, pkt_len);
>> +
>> + /* EOP header */
>> + memcpy(skb_put(tx_skb, TX_EOP_SIZE),
>> + &info->eop, TX_EOP_SIZE);
>> +
>> + skb_unlink(skb, q);
>> + dev_kfree_skb(skb);
>> + }
>> +
>> + entry = (struct skb_data *) tx_skb->cb;
>> + memset(entry, 0, sizeof(*entry));
>> + entry->len = pkt_len;
>> +
>> + if (netif_msg_pktdata(ax_local)) {
>> + int loop;
>> + netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",
>> + pkt_len, tx_skb->len, seq_num);
>> +
>> + netdev_info(ndev, " Dump SPI Header:\n ");
>> + for (loop = 0; loop < 4; loop++)
>> + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
>> +
>> + netdev_info(ndev, "\n");
>> +
>> + netdev_info(ndev, " Dump TX SOP:\n ");
>> + for (loop = 0; loop < TX_OVERHEAD; loop++)
>> + netdev_info(ndev, "%02x ", *(tx_skb->data + 4 + loop));
>> +
>> + netdev_info(ndev, "\n");
>> +
>> + netdev_info(ndev, " Dump TX packet:");
>> + for (loop = TX_OVERHEAD + 4;
>> + loop < (tx_skb->len - TX_EOP_SIZE); loop++) {
>> + if (((loop + 8) % 16) == 0)
>> + netdev_info(ndev, "\n ");
>> + netdev_info(ndev, "%02x ", *(tx_skb->data + loop));
>> + }
>> + netdev_info(ndev, "\n");
>> +
>> + netdev_info(ndev, " Dump TX EOP:\n %02x %02x %02x %02x\n",
>> + *(tx_skb->data + tx_skb->len - 4),
>> + *(tx_skb->data + tx_skb->len - 3),
>> + *(tx_skb->data + tx_skb->len - 2),
>> + *(tx_skb->data + tx_skb->len - 1));
>> + }
>> +
>> + return tx_skb;
>> +}
>> +
>> +static int ax88796c_hard_xmit(struct ax88796c_device *ax_local)
>> +{
>> + struct sk_buff *tx_skb;
>> + struct skb_data *entry;
>> +
>> + tx_skb = ax88796c_tx_fixup(ax_local->ndev, &ax_local->tx_wait_q);
>> +
>> + if (!tx_skb)
>> + return 0;
>> +
>> + entry = (struct skb_data *)tx_skb->cb;
>> +
>> + AX_WRITE(&ax_local->ax_spi,
>> + (TSNR_TXB_START | TSNR_PKT_CNT(1)), P0_TSNR);
>> +
>> + axspi_write_txq(&ax_local->ax_spi, tx_skb->data, tx_skb->len);
>> +
>> + if (((AX_READ(&ax_local->ax_spi, P0_TSNR) & TXNR_TXB_IDLE) == 0) ||
>> + ((ISR_TXERR & AX_READ(&ax_local->ax_spi, P0_ISR)) != 0)) {
>> +
>> + /* Ack tx error int */
>> + AX_WRITE(&ax_local->ax_spi, ISR_TXERR, P0_ISR);
>> +
>> + ax_local->stats.tx_dropped++;
>> +
>> + if (netif_msg_tx_err(ax_local))
>> + netdev_err(ax_local->ndev,
>> + "TX FIFO error, re-initialize the TX bridge\n");
>> +
>> + /* Reinitial tx bridge */
>> + AX_WRITE(&ax_local->ax_spi, TXNR_TXB_REINIT |
>> + AX_READ(&ax_local->ax_spi, P0_TSNR), P0_TSNR);
>> + ax_local->seq_num = 0;
>> + } else {
>> + ax_local->stats.tx_packets++;
>> + ax_local->stats.tx_bytes += entry->len;
>> + }
>> +
>> + entry->state = tx_done;
>> + dev_kfree_skb(tx_skb);
>> +
>> + return 1;
>> +}
>> +
>> +static int
>> +ax88796c_start_xmit(struct sk_buff *skb, struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> +
>> + skb_queue_tail(&ax_local->tx_wait_q, skb);
>> + if (skb_queue_len(&ax_local->tx_wait_q) > TX_QUEUE_HIGH_WATER) {
>> + if (netif_msg_tx_queued(ax_local))
>> + netdev_err(ndev, "Too much TX packets in queue %d\n",
>> + skb_queue_len(&ax_local->tx_wait_q));
>> +
>> + netif_stop_queue(ndev);
>> + }
>> +
>> + set_bit(EVENT_TX, &ax_local->flags);
>> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
>> +
>> + return NETDEV_TX_OK;
>> +
>> +}
>> +
>> +
>> +static inline void
>> +ax88796c_skb_return(struct ax88796c_device *ax_local, struct sk_buff *skb,
>> + struct rx_header *rxhdr)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + int status;
>> +
>> + do {
>> + if (!(ax_local->checksum & AX_RX_CHECKSUM))
>> + break;
>> +
>> + /* checksum error bit is set */
>> + if ((rxhdr->flags & RX_HDR3_L3_ERR) ||
>> + (rxhdr->flags & RX_HDR3_L4_ERR))
>> + break;
>> +
>> + if ((rxhdr->flags & RX_HDR3_L4_TYPE_TCP) ||
>> + (rxhdr->flags & RX_HDR3_L4_TYPE_UDP)) {
>> + skb->ip_summed = CHECKSUM_UNNECESSARY;
>> + }
>> + } while (0);
>> +
>> + ax_local->stats.rx_packets++;
>> + ax_local->stats.rx_bytes += skb->len;
>> + skb->dev = ndev;
>> +
>> + skb->truesize = skb->len + sizeof(struct sk_buff);
>> + skb->protocol = eth_type_trans(skb, ax_local->ndev);
>> +
>> + if (netif_msg_rx_status(ax_local))
>> + netdev_info(ndev, "< rx, len %zu, type 0x%x\n",
>> + skb->len + sizeof(struct ethhdr), skb->protocol);
>> +
>> + status = netif_rx(skb);
>> + if (status != NET_RX_SUCCESS && netif_msg_rx_err(ax_local))
>> + netdev_info(ndev, "netif_rx status %d\n", status);
>> +}
>> +
>> +static void dump_packet(struct net_device *ndev, const char *msg, int len, const char *data)
>> +{
>
> Too long lines.
>
Fixed.
>> + netdev_printk(KERN_DEBUG, ndev, DRV_NAME ": %s - packet len:%d\n", msg, len);
>> + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
>> + data, len, true);
>> +}
>> +
>> +static void
>> +ax88796c_rx_fixup(struct ax88796c_device *ax_local, struct sk_buff *rx_skb)
>> +{
>> + struct rx_header *rxhdr = (struct rx_header *) rx_skb->data;
>> + struct net_device *ndev = ax_local->ndev;
>> + u16 len;
>> +
>> + be16_to_cpus(&rxhdr->flags_len);
>> + be16_to_cpus(&rxhdr->seq_lenbar);
>> + be16_to_cpus(&rxhdr->flags);
>> +
>> + if ((((short)rxhdr->flags_len) & RX_HDR1_PKT_LEN) !=
>> + (~((short)rxhdr->seq_lenbar) & 0x7FF)) {
>> + if (netif_msg_rx_err(ax_local)) {
>> + int i;
>> + netdev_err(ndev, "Header error\n");
>> + //netdev_err(ndev, "Dump received frame\n");
>> + /* for (i = 0; i < rx_skb->len; i++) { */
>> + /* netdev_err(ndev, "%02x ", */
>> + /* *(rx_skb->data + i)); */
>> + /* if (((i + 1) % 16) == 0) */
>> + /* netdev_err(ndev, "\n"); */
>> + /* } */
>> + dump_packet(ndev, __func__, rx_skb->len, rx_skb->data);
>> + }
>> + ax_local->stats.rx_frame_errors++;
>> + kfree_skb(rx_skb);
>> + return;
>> + }
>> +
>> + if ((rxhdr->flags_len & RX_HDR1_MII_ERR) ||
>> + (rxhdr->flags_len & RX_HDR1_CRC_ERR)) {
>> + if (netif_msg_rx_err(ax_local))
>> + netdev_err(ndev, "CRC or MII error\n");
>> +
>> + ax_local->stats.rx_crc_errors++;
>> + kfree_skb(rx_skb);
>> + return;
>> + }
>> +
>> + len = rxhdr->flags_len & RX_HDR1_PKT_LEN;
>> + if (netif_msg_pktdata(ax_local)) {
>> + int loop;
>> + netdev_info(ndev, "RX data, total len %d, packet len %d\n",
>> + rx_skb->len, len);
>> +
>> + netdev_info(ndev, " Dump RX packet header:\n ");
>> + for (loop = 0; loop < sizeof(*rxhdr); loop++)
>> + netdev_info(ndev, "%02x ", *(rx_skb->data + loop));
>> +
>> + netdev_info(ndev, "\n Dump RX packet:");
>> + for (loop = 0; loop < len; loop++) {
>> + if ((loop % 16) == 0)
>> + netdev_info(ndev, "\n ");
>> + netdev_info(ndev, "%02x ",
>> + *(rx_skb->data + loop + sizeof(*rxhdr)));
>> + }
>> + netdev_info(ndev, "\n");
>> + }
>> +
>> + skb_pull(rx_skb, sizeof(*rxhdr));
>> + __pskb_trim(rx_skb, len);
>> +
>> + return ax88796c_skb_return(ax_local, rx_skb, rxhdr);
>> +}
>> +
>> +static int ax88796c_receive(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + struct sk_buff *skb;
>> + struct skb_data *entry;
>> + u16 w_count, pkt_len;
>> + u8 pkt_cnt;
>> +
>> + /* check rx packet and total word count */
>> + AX_WRITE(&ax_local->ax_spi, AX_READ(&ax_local->ax_spi, P0_RTWCR)
>> + | RTWCR_RX_LATCH, P0_RTWCR);
>> +
>> + pkt_cnt = AX_READ(&ax_local->ax_spi, P0_RXBCR2) & RXBCR2_PKT_MASK;
>> + if (!pkt_cnt)
>> + return 0;
>> +
>> + pkt_len = AX_READ(&ax_local->ax_spi, P0_RCPHR) & 0x7FF;
>> +
>> + w_count = ((pkt_len + 6 + 3) & 0xFFFC) >> 1;
>> +
>> + skb = alloc_skb((w_count * 2), GFP_KERNEL);
>> + if (!skb) {
>> + if (netif_msg_rx_err(ax_local))
>> + netdev_err(ndev,
>> + "Couldn't allocate a sk_buff of size %d\n",
>> + w_count * 2);
>> +
>> + AX_WRITE(&ax_local->ax_spi, RXBCR1_RXB_DISCARD, P0_RXBCR1);
>> + return 0;
>> + }
>> + entry = (struct skb_data *) skb->cb;
>> +
>> + AX_WRITE(&ax_local->ax_spi, RXBCR1_RXB_START | w_count, P0_RXBCR1);
>> +
>> + axspi_read_rxq(&ax_local->ax_spi,
>> + skb_put(skb, w_count * 2), skb->len);
>> +
>> + /* Check if rx bridge is idle */
>> + if ((AX_READ(&ax_local->ax_spi, P0_RXBCR2) & RXBCR2_RXB_IDLE) == 0) {
>> +
>> + if (netif_msg_rx_err(ax_local))
>> + netdev_err(ndev, "Rx Bridge is not idle\n");
>> + AX_WRITE(&ax_local->ax_spi, RXBCR2_RXB_REINIT, P0_RXBCR2);
>> +
>> + entry->state = rx_err;
>> +
>> + } else {
>> +
>> + entry->state = rx_done;
>> + }
>> +
>> + AX_WRITE(&ax_local->ax_spi, ISR_RXPKT, P0_ISR);
>> +
>> + ax88796c_rx_fixup(ax_local, skb);
>> +
>> + return 1;
>> +}
>> +
>> +static void ax88796c_check_media(struct ax88796c_device *ax_local)
>> +{
>> + struct net_device *ndev = ax_local->ndev;
>> + u16 bmsr, bmcr;
>> +
>> + if (netif_msg_hw(ax_local))
>> + ax88796c_dump_phy_regs(ax_local);
>> +
>> + bmsr = ax88796c_mdio_read(ndev,
>> + ax_local->mii.phy_id, MII_BMSR);
>> +
>> + if (!(bmsr & BMSR_LSTATUS) && netif_carrier_ok(ndev)) {
>> +
>> + netif_carrier_off(ndev);
>> + if (netif_msg_link(ax_local))
>> + netdev_info(ndev, "link down\n");
>> +
>> + ax_local->w_state = chk_cable;
>> + mod_timer(&ax_local->watchdog,
>> + jiffies + AX88796C_WATCHDOG_PERIOD);
>> +
>> + } else if ((bmsr & BMSR_LSTATUS) &&
>> + !netif_carrier_ok(ndev)) {
>> + bmcr = ax88796c_mdio_read(ndev,
>> + ax_local->mii.phy_id, MII_BMCR);
>> + if (netif_msg_link(ax_local))
>> + netdev_info(ndev, "link up, %sMbps, %s-duplex\n",
>> + (bmcr & BMCR_SPEED100) ? "100" : "10",
>> + (bmcr & BMCR_FULLDPLX) ? "full" : "half");
>> +
>> + netif_carrier_on(ndev);
>> + }
>> +
>> + return;
>> +}
>> +
>> +static int ax88796c_process_isr(struct ax88796c_device *ax_local)
>> +{
>> + u16 isr;
>> + u8 done = 0;
>> + struct net_device *ndev = ax_local->ndev;
>> +
>> + isr = AX_READ(&ax_local->ax_spi, P0_ISR);
>> + AX_WRITE(&ax_local->ax_spi, isr, P0_ISR);
>> +
>> + if (netif_msg_intr(ax_local))
>> + netdev_info(ndev, " ISR 0x%04x\n", isr);
>> +
>> + if (isr & ISR_TXERR) {
>> + if (netif_msg_intr(ax_local))
>> + netdev_info(ndev, " TXERR interrupt\n");
>> + AX_WRITE(&ax_local->ax_spi, TXNR_TXB_REINIT, P0_TSNR);
>> + ax_local->seq_num = 0x1f;
>> + }
>> +
>> + if (isr & ISR_TXPAGES) {
>> +
>> + if (netif_msg_intr(ax_local))
>> + netdev_info(ndev, " TXPAGES interrupt\n");
>> +
>> + set_bit(EVENT_TX, &ax_local->flags);
>> + }
>> +
>> + if (isr & ISR_LINK) {
>> +
>> + if (netif_msg_intr(ax_local))
>> + netdev_info(ndev, " Link change interrupt\n");
>> +
>> + ax88796c_check_media(ax_local);
>> + }
>> +
>> + if (isr & ISR_RXPKT) {
>> +
>> + if (netif_msg_intr(ax_local))
>> + netdev_info(ndev, " RX interrupt\n");
>> +
>> + done = ax88796c_receive(ax_local->ndev);
>> + }
>> +
>> + return done;
>> +}
>> +
>> +static irqreturn_t ax88796c_interrupt(int irq, void *dev_instance)
>> +{
>> + struct net_device *ndev = dev_instance;
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> +
>> + if (ndev == NULL) {
>> + pr_err("irq %d for unknown device.\n", irq);
>> + return IRQ_RETVAL(0);
>> + }
>> +
>> + disable_irq_nosync(irq);
>> +
>> + if (netif_msg_intr(ax_local))
>> + netdev_info(ndev, "Interrupt occurred\n");
>> +
>> + set_bit(EVENT_INTR, &ax_local->flags);
>> + queue_work(ax_local->ax_work_queue, &ax_local->ax_work);
>> +
>> + return IRQ_HANDLED;
>> +}
>> +
>> +
>
> Only one line
>
Fixed.
>> +static void ax88796c_work(struct work_struct *work)
>> +{
>> + struct ax88796c_device *ax_local =
>> + container_of(work, struct ax88796c_device, ax_work);
>> + u8 power = 0;
>> +
>> + down(&ax_local->spi_lock);
>> +
>> + if (test_bit(EVENT_WATCHDOG, &ax_local->flags)) {
>> +
>> + ax88796c_watchdog(ax_local);
>> +
>> + clear_bit(EVENT_WATCHDOG, &ax_local->flags);
>> + }
>> +
>> + if (test_bit(EVENT_SET_MULTI, &ax_local->flags)) {
>> +
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + ax88796c_set_hw_multicast(ax_local->ndev);
>> + clear_bit(EVENT_SET_MULTI, &ax_local->flags);
>> + }
>> +
>> + if (test_bit(EVENT_INTR, &ax_local->flags)) {
>> +
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
>> +
>> + while (1) {
>> + if (!ax88796c_process_isr(ax_local))
>> + break;
>> + }
>> +
>> + clear_bit(EVENT_INTR, &ax_local->flags);
>> +
>> + AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
>> +
>> + enable_irq(ax_local->ndev->irq);
>> + }
>> +
>> + if (test_bit(EVENT_TX, &ax_local->flags)) {
>> +
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + while (skb_queue_len(&ax_local->tx_wait_q)) {
>> + if (!ax88796c_hard_xmit(ax_local))
>> + break;
>> + }
>> +
>> + clear_bit(EVENT_TX, &ax_local->flags);
>> +
>> + if (netif_queue_stopped(ax_local->ndev) &&
>> + (skb_queue_len(&ax_local->tx_wait_q) < TX_QUEUE_LOW_WATER))
>> + netif_wake_queue(ax_local->ndev);
>> + }
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + up(&ax_local->spi_lock);
>> +}
>> +
>> +static struct net_device_stats *ax88796c_get_stats(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + return &ax_local->stats;
>> +}
>> +
>> +void ax88796c_phy_init(struct ax88796c_device *ax_local)
>> +{
>> + u16 advertise = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
>> +
>> + /* Setup LED mode */
>> + AX_WRITE(&ax_local->ax_spi,
>> + (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |
>> + LCR_LED1_100MODE), P2_LCR0);
>> + AX_WRITE(&ax_local->ax_spi,
>> + (AX_READ(&ax_local->ax_spi, P2_LCR1) & LCR_LED2_MASK) |
>> + LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);
>> +
>> + /* Enable PHY auto-polling */
>> + AX_WRITE(&ax_local->ax_spi,
>> + POOLCR_PHYID(ax_local->mii.phy_id) | POOLCR_POLL_EN |
>> + POOLCR_POLL_FLOWCTRL | POOLCR_POLL_BMCR, P2_POOLCR);
>> +
>> + ax88796c_mdio_write(ax_local->ndev,
>> + ax_local->mii.phy_id, MII_ADVERTISE, advertise);
>> +
>> + ax88796c_mdio_write(ax_local->ndev, ax_local->mii.phy_id, MII_BMCR,
>> + BMCR_SPEED100 | BMCR_ANENABLE | BMCR_ANRESTART);
>> +}
>> +
>> +static int
>> +ax88796c_open(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + int ret;
>> + u8 power;
>> + unsigned long irq_flag = IRQF_SHARED;
>> +
>> + netif_carrier_off(ax_local->ndev);
>> +
>> + down(&ax_local->spi_lock);
>> +
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + ret = ax88796c_soft_reset(ax_local);
>> + if (ret < 0) {
>> + return -ENODEV;
>> + }
>> +
>> + ret = request_irq(ndev->irq, ax88796c_interrupt,
>> + irq_flag, ndev->name, ndev);
>> + if (ret) {
>> + netdev_err(ndev, "unable to get IRQ %d (errno=%d).\n",
>> + ndev->irq, ret);
>> + return -ENXIO;
>> + }
>> +
>> + ax_local->seq_num = 0x1f;
>> +
>> + ax88796c_set_mac_addr(ndev);
>> + ax88796c_set_csums(ax_local);
>> +
>> + /* Disable stuffing packet */
>> + AX_WRITE(&ax_local->ax_spi,
>> + AX_READ(&ax_local->ax_spi, P1_RXBSPCR)
>> + & ~RXBSPCR_STUF_ENABLE, P1_RXBSPCR);
>> +
>> + /* Enable RX packet process */
>> + AX_WRITE(&ax_local->ax_spi, RPPER_RXEN, P1_RPPER);
>> +
>> + AX_WRITE(&ax_local->ax_spi, AX_READ(&ax_local->ax_spi, P0_FER)
>> + | FER_RXEN | FER_TXEN | FER_BSWAP | FER_IRQ_PULL, P0_FER);
>> +
>> + ax88796c_phy_init(ax_local);
>> +
>> + netif_start_queue(ndev);
>> +
>> + AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
>> +
>> + if (netif_msg_hw(ax_local)) {
>> + netdev_info(ndev,
>> + "Dump all MAC registers after initialization:\n");
>> + ax88796c_dump_regs(ax_local);
>> + ax88796c_dump_phy_regs(ax_local);
>> + }
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + spi_message_init(&ax_local->ax_spi.rx_msg);
>> +
>> + up(&ax_local->spi_lock);
>> +
>> + timer_setup(&ax_local->watchdog, ax88796c_watchdog_timer, 0);
>> + /* init_timer(&ax_local->watchdog); */
>> + /* ax_local->watchdog.function = &ax88796c_watchdog_timer; */
>> + /* ax_local->watchdog.data = (unsigned long) ndev; */
>
> I guess it's a development code.
>
Removed. This was an old timer/watchdog API.
>> + ax_local->watchdog.expires = jiffies + AX88796C_WATCHDOG_PERIOD;
>> + ax_local->w_state = chk_cable;
>> + ax_local->w_ticks = 0;
>> +
>> + add_timer(&ax_local->watchdog);
>> +
>> + return 0;
>> +}
>> +
>> +static void ax88796c_free_skb_queue(struct sk_buff_head *q)
>> +{
>> + struct sk_buff *skb;
>> +
>> + while (q->qlen) {
>> + skb = skb_dequeue(q);
>> + kfree_skb(skb);
>> + }
>> +}
>> +
>> +static int
>> +ax88796c_close(struct net_device *ndev)
>> +{
>> + struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
>> + u8 power;
>> +
>> + netif_stop_queue(ndev);
>> +
>> + del_timer_sync(&ax_local->watchdog);
>> +
>> + free_irq(ndev->irq, ndev);
>> +
>> + down(&ax_local->spi_lock);
>> +
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
>> + ax88796c_free_skb_queue(&ax_local->tx_wait_q);
>> +
>> + ax88796c_soft_reset(ax_local);
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + up(&ax_local->spi_lock);
>> +
>> + return 0;
>> +}
>> +
>> +static const struct net_device_ops ax88796c_netdev_ops = {
>> + .ndo_open = ax88796c_open,
>> + .ndo_stop = ax88796c_close,
>> + .ndo_start_xmit = ax88796c_start_xmit,
>> + .ndo_get_stats = ax88796c_get_stats,
>> + /* .ndo_set_multicast_list = ax88796c_set_multicast, */
>
> Still need a comment.
>
Will do.
>> + .ndo_do_ioctl = ax88796c_ioctl,
>> + .ndo_set_mac_address = ax88796c_set_mac_address,
>> +};
>> +
>> +
>> +static int ax88796c_hard_reset(struct ax88796c_device *ax_local)
>> +{
>> + struct device *dev = (struct device*)&ax_local->spi->dev;
>> + struct gpio_desc *reset_gpio;
>> +
>> + /* reset info */
>> + reset_gpio = gpiod_get(dev, "reset", 0);
>> + if (IS_ERR(reset_gpio)) {
>> + dev_err(dev, "Could not get 'reset' GPIO: %ld", PTR_ERR(reset_gpio));
>> + return PTR_ERR(reset_gpio);
>> + }
>> +
>> + /* set reset */
>> + gpiod_direction_output(reset_gpio, 1);
>> + msleep(100);
>> + gpiod_direction_output(reset_gpio, 0);
>> + gpiod_put(reset_gpio);
>> + msleep(10);
>> +
>> + return 0;
>> +}
>> +
>> +static int ax88796c_probe(struct spi_device *spi)
>> +{
>> + struct net_device *ndev;
>> + struct ax88796c_device *ax_local;
>> + int ret;
>> + u16 temp;
>> +
>> + ndev = devm_alloc_etherdev(&spi->dev, sizeof(*ax_local));
>> + if (!ndev) {
>> + dev_err(&spi->dev, "AX88796C SPI: Could not allocate ethernet device\n");
>> + return -ENOMEM;
>> + }
>> +
>> + ax_local = to_ax88796c_device(ndev);
>> + memset(ax_local, 0, sizeof(*ax_local));
>> +
>> + dev_set_drvdata(&spi->dev, ax_local);
>> + ax_local->spi = spi;
>> + ax_local->ax_spi.spi = spi;
>> +
>> + ndev->irq = spi->irq;
>> +
>> + ax_local->msg_enable = msg_enable;
>
> One space after '='.
>
Fixed.
>> + if (ps_level > AX_PS_D2 || ps_level < 0)
>> + ax_local->ps_level = 0;
>> + else
>> + ax_local->ps_level = ps_level;
>> +
>> + ax_local->capabilities |= comp ? AX_CAP_COMP : 0;
>> +
>> + if (netif_msg_probe(ax_local)) {
>> + dev_info(&spi->dev, "AX88796C-SPI Configuration:\n");
>> + dev_info(&spi->dev, " Compression : %s\n",
>> + ax_local->capabilities & AX_CAP_COMP ? "ON" : "OFF");
>> + dev_info(&spi->dev, " Power Saving Level: %d\n",
>> + ax_local->ps_level);
>> + }
>> +
>> + ndev->netdev_ops = &ax88796c_netdev_ops;
>> + ndev->ethtool_ops = &ax88796c_ethtool_ops;
>
> No spaces before '='.
>
Fixed.
>> +
>> + ax_local->ndev = ndev;
>
> Set all priv-storing-pointers in one place, so next to dev_set_drvdata()
> unless it is chosen by probe() flow on purpose.
Done.
>> +
>> + /* Initialize MII structure */
>> + ax_local->mii.dev = ndev;
>> + ax_local->mii.mdio_read = ax88796c_mdio_read;
>> + ax_local->mii.mdio_write = ax88796c_mdio_write;
>> + ax_local->mii.phy_id_mask = 0x3f;
>> + ax_local->mii.reg_num_mask = 0x1f;
>> + ax_local->mii.phy_id = 0x10;
>> +
>> + /* ax88796c gpio reset */
>> + ax88796c_hard_reset(ax_local);
>> +
>> + /* Reset AX88796C */
>> + ret = ax88796c_soft_reset(ax_local);
>> + if (ret < 0) {
>> + return -ENODEV;
>> + }
>
> No need for {}.
>
Fixed
>> +
>> + /* Check board revision */
>> + temp = AX_READ(&ax_local->ax_spi, P2_CRIR);
>> + if ((temp & 0xF) != 0x0) {
>> + dev_err(&spi->dev, "spi read failed: %d\n", temp);
>> + return -ENODEV;
>> + }
>> +
>> + temp = AX_READ(&ax_local->ax_spi, P0_BOR);
>> + if (temp == 0x1234) {
>> + ax_local->plat_endian = PLAT_LITTLE_ENDIAN;
>> + } else {
>> + AX_WRITE(&ax_local->ax_spi, 0xFFFF, P0_BOR);
>> + ax_local->plat_endian = PLAT_BIG_ENDIAN;
>> + }
>> +
>> + if (netif_msg_hw(ax_local)) {
>> + dev_info(&spi->dev,
>> + "Dump all MAC registers before initialization:\n");
>> + ax88796c_dump_regs(ax_local);
>> + ax88796c_dump_phy_regs(ax_local);
>> + }
>> +
>> + /*Reload EEPROM*/
>> + ax88796c_reload_eeprom(ax_local);
>> +
>> + ax88796c_load_mac_addr(ndev);
>> +
>> + if (netif_msg_probe(ax_local))
>> + dev_info(&spi->dev,
>> + "irq %d, MAC addr "
>> + "%02X:%02X:%02X:%02X:%02X:%02X\n",
>> + ndev->irq,
>> + ndev->dev_addr[0], ndev->dev_addr[1],
>> + ndev->dev_addr[2], ndev->dev_addr[3],
>> + ndev->dev_addr[4], ndev->dev_addr[5]);
>> +
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + INIT_WORK(&ax_local->ax_work, ax88796c_work);
>> +
>> + ax_local->ax_work_queue =
>> + create_singlethread_workqueue("ax88796c_work");
>> +
>> + sema_init(&ax_local->spi_lock, 1);
>> +
>> + skb_queue_head_init(&ax_local->tx_wait_q);
>> +
>> + ndev->features |= NETIF_F_HW_CSUM;
>> + ax_local->checksum = AX_RX_CHECKSUM | AX_TX_CHECKSUM;
>> + ndev->hard_header_len += (TX_OVERHEAD + 4);
>> +
>> + ret = register_netdev(ndev);
>> + if (!ret) {
>> + if (netif_msg_probe(ax_local))
>> + netdev_info(ndev, "%s %s registered\n",
>> + dev_driver_string(&spi->dev),
>> + dev_name(&spi->dev));
>> + return ret;
>> + }
>
> That's unusual flow - exit on success early. Follow the kernel pattern
> of "return 0" on success and jumps to common error handling like:
>
> ret = register_netdev(ndev)
> if (ret)
> // handle error: maybe dev_err and goto
>
> if (netif_msg_probe())
> netdev_info();
>
> return 0;
>
Done.
>> +
>> + dev_err(&spi->dev, "failed to register a network device\n");
>> + destroy_workqueue(ax_local->ax_work_queue);
>> +
>> + return ret;
>> +}
>> +
>> +static int
>> +ax88796c_suspend(struct spi_device *spi, pm_message_t mesg)
>> +{
>> + struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
>> + struct net_device *ndev = ax_local->ndev;
>> + u8 power;
>> +
>> + if (!ndev || !netif_running(ndev))
>> + return 0;
>
> !ndev cannot happen (device should not be suspended before end of
> probe). If it can, there is a bug which you should not silently ignore.
>
Removed.
>> +
>> + netif_device_detach(ndev);
>> +
>> + netif_stop_queue(ndev);
>> +
>> + down(&ax_local->spi_lock);
>> +
>> + power = ax88796c_check_power_and_wake(ax_local);
>> +
>> + AX_WRITE(&ax_local->ax_spi, IMR_MASKALL, P0_IMR);
>> + ax88796c_free_skb_queue(&ax_local->tx_wait_q);
>> +
>> + if (ax_local->wol) {
>> +
>> + AX_WRITE(&ax_local->ax_spi, 0, P5_WFTR);
>> +
>> + if (ax_local->wol & WFCR_LINKCH) { /* Link change */
>> +
>> + /* Disable wol power saving in link change mode */
>> + AX_WRITE(&ax_local->ax_spi,
>> + (AX_READ(&ax_local->ax_spi, P0_PSCR)
>> + & ~PSCR_WOLPS), P0_PSCR);
>> +
>> + if (netif_msg_wol(ax_local))
>> + netdev_info(ndev,
>> + "Enable link change wakeup\n");
>> +
>> + AX_WRITE(&ax_local->ax_spi, WFTR_8192MS, P5_WFTR);
>> + }
>> + if (ax_local->wol & WFCR_MAGICP) { /* Magic packet */
>> + if (netif_msg_wol(ax_local))
>> + netdev_info(ndev,
>> + "Enable magic packet wakeup\n");
>> + }
>> +
>> + AX_WRITE(&ax_local->ax_spi,
>> + ax_local->wol | WFCR_WAKEUP | WFCR_PMEEN, P0_WFCR);
>> + }
>> +
>> + if (power)
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + up(&ax_local->spi_lock);
>> +
>> + return 0;
>> +}
>> +
>> +static int
>> +ax88796c_resume(struct spi_device *spi)
>> +{
>> + struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
>> + struct net_device *ndev = ax_local->ndev;
>> + u16 pme;
>> +
>> + down(&ax_local->spi_lock);
>> +
>> + /* Wakeup AX88796C first */
>> + ax88796c_check_power_and_wake(ax_local);
>> + msleep(200);
>> +
>> + pme = AX_READ(&ax_local->ax_spi, P0_WFCR);
>> + if (ax_local->wol && ~(pme & WFCR_WAITEVENT)) {
>> +
>> + if (pme & WFCR_LINKCHS) {
>> + if (netif_msg_wol(ax_local))
>> + netdev_info(ndev,
>> + "Wakeuped from link change.\n");
>> + } else if (pme & WFCR_MAGICPS) {
>> + if (netif_msg_wol(ax_local))
>> + netdev_info(ndev,
>> + "Wakeuped from magic packet.\n");
>> + }
>> +
>> + AX_WRITE(&ax_local->ax_spi, WFCR_CLRWAKE, P0_WFCR);
>> + }
>> +
>> + netif_device_attach(ndev);
>> +
>> + /* Initialize all the local variables*/
>> + ax88796c_soft_reset(ax_local);
>> +
>> + ax_local->seq_num = 0x1f;
>> +
>> + ax88796c_set_mac_addr(ndev);
>> + ax88796c_set_csums(ax_local);
>> +
>> + /* Disable stuffing packet */
>> + AX_WRITE(&ax_local->ax_spi,
>> + AX_READ(&ax_local->ax_spi, P1_RXBSPCR)
>> + & ~RXBSPCR_STUF_ENABLE, P1_RXBSPCR);
>> +
>> + /* Enable RX packet process */
>> + AX_WRITE(&ax_local->ax_spi, RPPER_RXEN, P1_RPPER);
>> +
>> + AX_WRITE(&ax_local->ax_spi,
>> + AX_READ(&ax_local->ax_spi, P0_FER)
>> + | FER_RXEN | FER_TXEN | FER_BSWAP, P0_FER);
>> +
>> + ax88796c_phy_init(ax_local);
>> +
>> + AX_WRITE(&ax_local->ax_spi, IMR_DEFAULT, P0_IMR);
>> +
>> + if (netif_msg_hw(ax_local)) {
>> + netdev_info(ndev,
>> + "Dump all MAC registers after initialization:\n");
>> + ax88796c_dump_regs(ax_local);
>> + ax88796c_dump_phy_regs(ax_local);
>> + }
>> +
>> + ax88796c_set_power_saving(ax_local, ax_local->ps_level);
>> +
>> + netif_start_queue(ndev);
>> +
>> + up(&ax_local->spi_lock);
>> +
>> + return 0;
>> +}
>> +
>> +static int ax88796c_remove(struct spi_device *spi)
>> +{
>> + struct ax88796c_device *ax_local = dev_get_drvdata(&spi->dev);
>> + struct net_device *ndev = ax_local->ndev;
>> +
>> + if (netif_msg_probe(ax_local))
>> + netdev_info(ndev, "removing network device %s %s\n",
>> + dev_driver_string(&spi->dev),
>> + dev_name(&spi->dev));
>> +
>> + destroy_workqueue(ax_local->ax_work_queue);
>> +
>> + unregister_netdev(ndev);
>> +
>> + if (netif_msg_probe(ax_local))
>> + dev_info(&spi->dev, "device removed\n");
>> +
>> + return 0;
>> +}
>> +
>> +#ifdef CONFIG_USE_OF
>
> #ifdef should not be needed.
>
Removed.
>> +static const struct of_device_id ax88796c_dt_ids[] = {
>> + { .compatible = "asix,ax88796c" },
>> + {},
>> +};
>> +MODULE_DEVICE_TABLE(of, ax88796c_dt_ids);
>> +#endif
>> +
>> +static const struct spi_device_id asix_id[] = {
>> + { "ax88796c", 0 },
>> + { }
>> +};
>> +MODULE_DEVICE_TABLE(spi, asix_id);
>> +
>> +static struct spi_driver ax88796c_spi_driver = {
>> + .driver = {
>> + .name = DRV_NAME,
>> + .owner = THIS_MODULE,
>
> No need for owner.
>
Removed
>> +#ifdef CONFIG_USE_OF
>> + .of_match_table = of_match_ptr(ax88796c_dt_ids),
>> +#endif
>
> No need for ifdef.
>
Removed
>> + },
>> + .probe = ax88796c_probe,
>> + .remove = ax88796c_remove,
>> +// .suspend = ax88796c_suspend,
>> +// .resume = ax88796c_resume,
>
> ?
My bad. This is an old PM api that no longer exists. I commented it out
at first and forgot it. I've converted it to the new API.
>> + .id_table = asix_id,
>> +};
>> +
>> +static __init int ax88796c_spi_init(void)
>> +{
>> + pr_info("Register AX88796C SPI Ethernet Driver.\n");
>
> No, no printing of driver inits. It will bother everyone in the world.
>
> This all should be just module driver, no init/exit.
>
Removed.
>> + return spi_register_driver(&ax88796c_spi_driver);
>> +}
>> +
>> +static __exit void ax88796c_spi_exit(void)
>> +{
>> + spi_unregister_driver(&ax88796c_spi_driver);
>> +}
>> +
>> +module_init(ax88796c_spi_init);
>> +module_exit(ax88796c_spi_exit);
>> diff --git a/drivers/net/ethernet/asix/ax88796c_main.h b/drivers/net/ethernet/asix/ax88796c_main.h
>> new file mode 100644
>> index 000000000000..6c61766b1788
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/ax88796c_main.h
>> @@ -0,0 +1,596 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2010 ASIX Electronics Corporation
>> + * Copyright (c) 2020 Samsung Electronics
>> + *
>> + * ASIX AX88796C SPI Fast Ethernet Linux driver
>> + */
>> +
>> +#ifndef _AX88796C_MAIN_H
>> +#define _AX88796C_MAIN_H
>> +
>> +#define pr_fmt(fmt) "ax88796c: " fmt
>> +
>> +/* INCLUDE FILE DECLARATIONS */
>> +#ifdef CONFIG_USE_OF
>
> No ifdef.
>
Removed
>> +#include <linux/of.h>
>> +#endif
>> +#include <linux/crc32.h>
>> +#include <linux/etherdevice.h>
>> +#include <linux/ethtool.h>
>> +#include <linux/gpio/consumer.h>
>> +#include <linux/init.h>
>> +#include <linux/io.h>
>> +#include <linux/kmod.h>
>> +#include <linux/mii.h>
>> +#include <linux/module.h>
>> +#include <linux/netdevice.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/sched.h>
>> +#include <linux/spi/spi.h>
>> +#include <linux/timer.h>
>> +#include <linux/uaccess.h>
>> +#include <linux/usb.h>
>> +#include <linux/version.h>
>> +#include <linux/workqueue.h>
>
> All of these should be removed except the headers used directly in this
> header.
>
This is "private" header file included in all ax88796c_*.c files and
these are headers required in them. It seems more conveninet to have
them all listed in one place. What is the reason to do otherwise?
>> +
>> +#include <asm/dma.h>
>> +
>> +#include "ax88796c_spi.h"
>> +
>> +/* NAMING CONSTANT AND TYPE DECLARATIONS */
>> +/* These identify the driver base version and may not be removed. */
>> +#define DRV_NAME "ax88796c"
>> +#define ADP_NAME "ASIX AX88796C SPI Ethernet Adapter"
>> +#define DRV_VERSION "1.2.0"
>> +
>> +#define TX_QUEUE_HIGH_WATER 45 /* Tx queue high water mark */
>> +#define TX_QUEUE_LOW_WATER 20 /* Tx queue low water mark */
>> +
>> +#define AX88796C_WATCHDOG_PERIOD (1 * HZ)
>> +#define AX88796C_WATCHDOG_RESTART 7
>> +
>> +#define TX_OVERHEAD 8
>> +#define TX_EOP_SIZE 4
>> +
>> +#define AX_MCAST_FILTER_SIZE 8
>> +#define AX_MAX_MCAST 64
>> +#define AX_MAX_CLK 80000000
>> +#define TX_HDR_SOP_DICF 0x8000
>> +#define TX_HDR_SOP_CPHI 0x4000
>> +#define TX_HDR_SOP_INT 0x2000
>> +#define TX_HDR_SOP_MDEQ 0x1000
>> +#define TX_HDR_SOP_PKTLEN 0x07FF
>> +#define TX_HDR_SOP_SEQNUM 0xF800
>> +#define TX_HDR_SOP_PKTLENBAR 0x07FF
>> +
>> +#define TX_HDR_SEG_FS 0x8000
>> +#define TX_HDR_SEG_LS 0x4000
>> +#define TX_HDR_SEG_SEGNUM 0x3800
>> +#define TX_HDR_SEG_SEGLEN 0x0700
>> +#define TX_HDR_SEG_EOFST 0xC000
>> +#define TX_HDR_SEG_SOFST 0x3800
>> +#define TX_HDR_SEG_SEGLENBAR 0x07FF
>> +
>> +#define TX_HDR_EOP_SEQNUM 0xF800
>> +#define TX_HDR_EOP_PKTLEN 0x07FF
>> +#define TX_HDR_EOP_SEQNUMBAR 0xF800
>> +#define TX_HDR_EOP_PKTLENBAR 0x07FF
>> +
>> +/* Rx header fields mask */
>> +#define RX_HDR1_MCBC 0x8000
>> +#define RX_HDR1_STUFF_PKT 0x4000
>> +#define RX_HDR1_MII_ERR 0x2000
>> +#define RX_HDR1_CRC_ERR 0x1000
>> +#define RX_HDR1_PKT_LEN 0x07FF
>> +
>> +#define RX_HDR2_SEQ_NUM 0xF800
>> +#define RX_HDR2_PKT_LEN_BAR 0x7FFF
>> +
>> +#define RX_HDR3_PE 0x8000
>> +#define RX_HDR3_L4_TYPE_TCP 0x1000
>> +#define RX_HDR3_L4_TYPE_UDP 0x0400
>> +#define RX_HDR3_L3_ERR 0x0200
>> +#define RX_HDR3_L4_ERR 0x0100
>> +#define RX_HDR3_PRIORITY(x) ((x) << 4)
>> +#define RX_HDR3_STRIP 0x0008
>> +#define RX_HDR3_VLAN_ID 0x0007
>> +
>> +#define AX_RX_CHECKSUM 1
>> +#define AX_TX_CHECKSUM 2
>> +
>> +enum watchdog_state {
>> + chk_link = 0,
>> + chk_cable,
>> + ax_nop,
>> +};
>> +
>> +struct ax88796c_device {
>> +
>> + struct resource *addr_res; /* resources found */
>> + struct resource *addr_req; /* resources requested */
>> + struct resource *irq_res;
>> +
>> + struct spi_device *spi;
>> + struct net_device *ndev;
>> + struct mii_if_info mii;
>> + struct net_device_stats stats;
>> +
>> + struct timer_list watchdog;
>> + enum watchdog_state w_state;
>> + size_t w_ticks;
>> +
>> + struct work_struct ax_work;
>> + struct workqueue_struct *ax_work_queue;
>> + struct tasklet_struct bh;
>> +
>> + struct semaphore spi_lock;
>> +
>> + struct sk_buff_head tx_wait_q;
>> +
>> + struct axspi_data ax_spi;
>> +
>> + int msg_enable;
>> +
>> + u16 seq_num;
>> +
>> + u16 wol;
>> +
>> + u8 checksum;
>> +
>> + u8 multi_filter[AX_MCAST_FILTER_SIZE];
>> +
>> + unsigned long capabilities;
>> + #define AX_CAP_DMA 1
>> + #define AX_CAP_COMP 2
>> + #define AX_CAP_BIDIR 4
>> +
>> + u8 plat_endian;
>> + #define PLAT_LITTLE_ENDIAN 0
>> + #define PLAT_BIG_ENDIAN 1
>> +
>> + unsigned long flags;
>> + #define EVENT_INTR 1
>> + #define EVENT_TX 2
>> + #define EVENT_SET_MULTI 4
>> + #define EVENT_WATCHDOG 8
>> +
>> + u8 ps_level;
>> + #define AX_PS_D0 0
>> + #define AX_PS_D1 1
>> + #define AX_PS_D2 2
>> +
>> +
>> +};
>> +
>> +#define to_ax88796c_device(ndev) ((struct ax88796c_device *)netdev_priv(ndev))
>> +
>> +enum skb_state {
>> + illegal = 0,
>> + tx_done,
>> + rx_done,
>> + rx_err,
>> +};
>> +
>> +struct skb_data;
>> +
>> +struct skb_data {
>> + enum skb_state state;
>> + struct net_device *ndev;
>> + struct sk_buff *skb;
>> + size_t len;
>> + dma_addr_t phy_addr;
>> +};
>> +
>> +/* A88796C register definition */
>> + /* Definition of PAGE0 */
>> +#define P0_PSR (0x00)
>> + #define PSR_DEV_READY (1 << 7)
>> + #define PSR_RESET (0 << 15)
>> + #define PSR_RESET_CLR (1 << 15)
>> +#define P0_BOR (0x02)
>> +#define P0_FER (0x04)
>> + #define FER_IPALM (1 << 0)
>> + #define FER_DCRC (1 << 1)
>> + #define FER_RH3M (1 << 2)
>> + #define FER_HEADERSWAP (1 << 7)
>> + #define FER_WSWAP (1 << 8)
>> + #define FER_BSWAP (1 << 9)
>> + #define FER_INTHI (1 << 10)
>> + #define FER_INTLO (0 << 10)
>> + #define FER_IRQ_PULL (1 << 11)
>> + #define FER_RXEN (1 << 14)
>> + #define FER_TXEN (1 << 15)
>> +#define P0_ISR (0x06)
>> + #define ISR_RXPKT (1 << 0)
>> + #define ISR_MDQ (1 << 4)
>> + #define ISR_TXT (1 << 5)
>> + #define ISR_TXPAGES (1 << 6)
>> + #define ISR_TXERR (1 << 8)
>> + #define ISR_LINK (1 << 9)
>> +#define P0_IMR (0x08)
>> + #define IMR_RXPKT (1 << 0)
>> + #define IMR_MDQ (1 << 4)
>> + #define IMR_TXT (1 << 5)
>> + #define IMR_TXPAGES (1 << 6)
>> + #define IMR_TXERR (1 << 8)
>> + #define IMR_LINK (1 << 9)
>> + #define IMR_MASKALL (0xFFFF)
>> + #define IMR_DEFAULT (IMR_TXERR)
>> +#define P0_WFCR (0x0A)
>> + #define WFCR_PMEIND (1 << 0) /* PME indication */
>> + #define WFCR_PMETYPE (1 << 1) /* PME I/O type */
>> + #define WFCR_PMEPOL (1 << 2) /* PME polarity */
>> + #define WFCR_PMERST (1 << 3) /* Reset PME */
>> + #define WFCR_SLEEP (1 << 4) /* Enable sleep mode */
>> + #define WFCR_WAKEUP (1 << 5) /* Enable wakeup mode */
>> + #define WFCR_WAITEVENT (1 << 6) /* Reserved */
>> + #define WFCR_CLRWAKE (1 << 7) /* Clear wakeup */
>> + #define WFCR_LINKCH (1 << 8) /* Enable link change */
>> + #define WFCR_MAGICP (1 << 9) /* Enable magic packet */
>> + #define WFCR_WAKEF (1 << 10) /* Enable wakeup frame */
>> + #define WFCR_PMEEN (1 << 11) /* Enable PME pin */
>> + #define WFCR_LINKCHS (1 << 12) /* Link change status */
>> + #define WFCR_MAGICPS (1 << 13) /* Magic packet status */
>> + #define WFCR_WAKEFS (1 << 14) /* Wakeup frame status */
>> + #define WFCR_PMES (1 << 15) /* PME pin status */
>> +#define P0_PSCR (0x0C)
>> + #define PSCR_PS_MASK (0xFFF0)
>> + #define PSCR_PS_D0 (0)
>> + #define PSCR_PS_D1 (1 << 0)
>> + #define PSCR_PS_D2 (1 << 1)
>> + #define PSCR_FPS (1 << 3) /* Enable fiber mode PS */
>> + #define PSCR_SWPS (1 << 4) /* Enable software */
>> + /* PS control */
>> + #define PSCR_WOLPS (1 << 5) /* Enable WOL PS */
>> + #define PSCR_SWWOL (1 << 6) /* Enable software select */
>> + /* WOL PS */
>> + #define PSCR_PHYOSC (1 << 7) /* Internal PHY OSC control */
>> + #define PSCR_FOFEF (1 << 8) /* Force PHY generate FEF */
>> + #define PSCR_FOF (1 << 9) /* Force PHY in fiber mode */
>> + #define PSCR_PHYPD (1 << 10) /* PHY power down. */
>> + /* Active high */
>> + #define PSCR_PHYRST (1 << 11) /* PHY reset signal. */
>> + /* Active low */
>> + #define PSCR_PHYCSIL (1 << 12) /* PHY cable energy detect */
>> + #define PSCR_PHYCOFF (1 << 13) /* PHY cable off */
>> + #define PSCR_PHYLINK (1 << 14) /* PHY link status */
>> + #define PSCR_EEPOK (1 << 15) /* EEPROM load complete */
>> +#define P0_MACCR (0x0E)
>> + #define MACCR_RXFC_ENABLE (1 << 3)
>> + #define MACCR_RXFC_MASK 0xFFF7
>> + #define MACCR_TXFC_ENABLE (1 << 4)
>> + #define MACCR_TXFC_MASK 0xFFEF
>> + #define MACCR_PF (1 << 7)
>> + #define MACCR_PMM_BITS 8
>> + #define MACCR_PMM_MASK (0x1F00)
>> + #define MACCR_PMM_RESET (1 << 8)
>> + #define MACCR_PMM_WAIT (2 << 8)
>> + #define MACCR_PMM_READY (3 << 8)
>> + #define MACCR_PMM_D1 (4 << 8)
>> + #define MACCR_PMM_D2 (5 << 8)
>> + #define MACCR_PMM_WAKE (7 << 8)
>> + #define MACCR_PMM_D1_WAKE (8 << 8)
>> + #define MACCR_PMM_D2_WAKE (9 << 8)
>> + #define MACCR_PMM_SLEEP (10 << 8)
>> + #define MACCR_PMM_PHY_RESET (11 << 8)
>> + #define MACCR_PMM_SOFT_D1 (16 << 8)
>> + #define MACCR_PMM_SOFT_D2 (17 << 8)
>> +#define P0_TFBFCR (0x10)
>> + #define TFBFCR_SCHE_FREE_PAGE 0xE07F
>> + #define TFBFCR_FREE_PAGE_BITS 0x07
>> + #define TFBFCR_FREE_PAGE_LATCH (1 << 6)
>> + #define TFBFCR_SET_FREE_PAGE(x) ((x & 0x3F) << TFBFCR_FREE_PAGE_BITS)
>> + #define TFBFCR_TX_PAGE_SET (1 << 13)
>> + #define TFBFCR_MANU_ENTX (1 << 15)
>> + #define TX_FREEBUF_MASK 0x003F
>> + #define TX_DPTSTART 0x4000
>> +
>> +#define P0_TSNR (0x12)
>> + #define TXNR_TXB_ERR (1 << 5)
>> + #define TXNR_TXB_IDLE (1 << 6)
>> + #define TSNR_PKT_CNT(x) (((x) & 0x3F) << 8)
>> + #define TXNR_TXB_REINIT (1 << 14)
>> + #define TSNR_TXB_START (1 << 15)
>> +#define P0_RTDPR (0x14)
>> +#define P0_RXBCR1 (0x16)
>> + #define RXBCR1_RXB_DISCARD (1 << 14)
>> + #define RXBCR1_RXB_START (1 << 15)
>> +#define P0_RXBCR2 (0x18)
>> + #define RXBCR2_PKT_MASK (0xFF)
>> + #define RXBCR2_RXPC_MASK (0x7F)
>> + #define RXBCR2_RXB_READY (1 << 13)
>> + #define RXBCR2_RXB_IDLE (1 << 14)
>> + #define RXBCR2_RXB_REINIT (1 << 15)
>> +#define P0_RTWCR (0x1A)
>> + #define RTWCR_RXWC_MASK (0x3FFF)
>> + #define RTWCR_RX_LATCH (1 << 15)
>> +#define P0_RCPHR (0x1C)
>> +
>> + /* Definition of PAGE1 */
>> +#define P1_RPPER (0x22)
>> + #define RPPER_RXEN (1 << 0)
>> +#define P1_MRCR (0x28)
>> +#define P1_MDR (0x2A)
>> +#define P1_RMPR (0x2C)
>> +#define P1_TMPR (0x2E)
>> +#define P1_RXBSPCR (0x30)
>> + #define RXBSPCR_STUF_WORD_CNT(x) (((x) & 0x7000) >> 12)
>> + #define RXBSPCR_STUF_ENABLE (1 << 15)
>> +#define P1_MCR (0x32)
>> + #define MCR_SBP (1 << 8)
>> + #define MCR_SM (1 << 9)
>> + #define MCR_CRCENLAN (1 << 11)
>> + #define MCR_STP (1 << 12)
>> + /* Definition of PAGE2 */
>> +#define P2_CIR (0x42)
>> +#define P2_POOLCR (0x44)
>> + #define POOLCR_POLL_EN (1 << 0)
>> + #define POOLCR_POLL_FLOWCTRL (1 << 1)
>> + #define POOLCR_POLL_BMCR (1 << 2)
>> + #define POOLCR_PHYID(x) ((x) << 8)
>> +#define P2_PHYSR (0x46)
>> +#define P2_MDIODR (0x48)
>> +#define P2_MDIOCR (0x4A)
>> + #define MDIOCR_RADDR(x) ((x) & 0x1F)
>> + #define MDIOCR_FADDR(x) (((x) & 0x1F) << 8)
>> + #define MDIOCR_VALID (1 << 13)
>> + #define MDIOCR_READ (1 << 14)
>> + #define MDIOCR_WRITE (1 << 15)
>> +#define P2_LCR0 (0x4C)
>> + #define LCR_LED0_EN (1 << 0)
>> + #define LCR_LED0_100MODE (1 << 1)
>> + #define LCR_LED0_DUPLEX (1 << 2)
>> + #define LCR_LED0_LINK (1 << 3)
>> + #define LCR_LED0_ACT (1 << 4)
>> + #define LCR_LED0_COL (1 << 5)
>> + #define LCR_LED0_10MODE (1 << 6)
>> + #define LCR_LED0_DUPCOL (1 << 7)
>> + #define LCR_LED1_EN (1 << 8)
>> + #define LCR_LED1_100MODE (1 << 9)
>> + #define LCR_LED1_DUPLEX (1 << 10)
>> + #define LCR_LED1_LINK (1 << 11)
>> + #define LCR_LED1_ACT (1 << 12)
>> + #define LCR_LED1_COL (1 << 13)
>> + #define LCR_LED1_10MODE (1 << 14)
>> + #define LCR_LED1_DUPCOL (1 << 15)
>> +#define P2_LCR1 (0x4E)
>> + #define LCR_LED2_MASK (0xFF00)
>> + #define LCR_LED2_EN (1 << 0)
>> + #define LCR_LED2_100MODE (1 << 1)
>> + #define LCR_LED2_DUPLEX (1 << 2)
>> + #define LCR_LED2_LINK (1 << 3)
>> + #define LCR_LED2_ACT (1 << 4)
>> + #define LCR_LED2_COL (1 << 5)
>> + #define LCR_LED2_10MODE (1 << 6)
>> + #define LCR_LED2_DUPCOL (1 << 7)
>> +#define P2_IPGCR (0x50)
>> +#define P2_CRIR (0x52)
>> +#define P2_FLHWCR (0x54)
>> +#define P2_RXCR (0x56)
>> + #define RXCR_PRO (1 << 0)
>> + #define RXCR_AMALL (1 << 1)
>> + #define RXCR_SEP (1 << 2)
>> + #define RXCR_AB (1 << 3)
>> + #define RXCR_AM (1 << 4)
>> + #define RXCR_AP (1 << 5)
>> + #define RXCR_ARP (1 << 6)
>> +#define P2_JLCR (0x58)
>> +#define P2_MPLR (0x5C)
>> +
>> + /* Definition of PAGE3 */
>> +#define P3_MACASR0 (0x62)
>> + #define P3_MACASR(x) (P3_MACASR0 + 2*x)
>> + #define MACASR_LOWBYTE_MASK 0x00FF
>> + #define MACASR_HIGH_BITS 0x08
>> +#define P3_MACASR1 (0x64)
>> +#define P3_MACASR2 (0x66)
>> +#define P3_MFAR01 (0x68)
>> +#define P3_MFAR_BASE (0x68)
>> + #define P3_MFAR(x) (P3_MFAR_BASE + 2*x)
>> +
>> +#define P3_MFAR23 (0x6A)
>> +#define P3_MFAR45 (0x6C)
>> +#define P3_MFAR67 (0x6E)
>> +#define P3_VID0FR (0x70)
>> +#define P3_VID1FR (0x72)
>> +#define P3_EECSR (0x74)
>> +#define P3_EEDR (0x76)
>> +#define P3_EECR (0x78)
>> + #define EECR_ADDR_MASK (0x00FF)
>> + #define EECR_READ_ACT (1 << 8)
>> + #define EECR_WRITE_ACT (1 << 9)
>> + #define EECR_WRITE_DISABLE (1 << 10)
>> + #define EECR_WRITE_ENABLE (1 << 11)
>> + #define EECR_EE_READY (1 << 13)
>> + #define EECR_RELOAD (1 << 14)
>> + #define EECR_RESET (1 << 15)
>> +#define P3_TPCR (0x7A)
>> + #define TPCR_PATT_MASK (0xFF)
>> + #define TPCR_RAND_PKT_EN (1 << 14)
>> + #define TPCR_FIXED_PKT_EN (1 << 15)
>> +#define P3_TPLR (0x7C)
>> + /* Definition of PAGE4 */
>> +#define P4_SPICR (0x8A)
>> + #define SPICR_RCEN (1 << 0)
>> + #define SPICR_QCEN (1 << 1)
>> + #define SPICR_RBRE (1 << 3)
>> + #define SPICR_PMM (1 << 4)
>> + #define SPICR_LOOPBACK (1 << 8)
>> + #define SPICR_CORE_RES_CLR (1 << 10)
>> + #define SPICR_SPI_RES_CLR (1 << 11)
>> +#define P4_SPIISMR (0x8C)
>> +
>> +#define P4_COERCR0 (0x92)
>> + #define COERCR0_RXIPCE (1 << 0)
>> + #define COERCR0_RXIPVE (1 << 1)
>> + #define COERCR0_RXV6PE (1 << 2)
>> + #define COERCR0_RXTCPE (1 << 3)
>> + #define COERCR0_RXUDPE (1 << 4)
>> + #define COERCR0_RXICMP (1 << 5)
>> + #define COERCR0_RXIGMP (1 << 6)
>> + #define COERCR0_RXICV6 (1 << 7)
>> +
>> + #define COERCR0_RXTCPV6 (1 << 8)
>> + #define COERCR0_RXUDPV6 (1 << 9)
>> + #define COERCR0_RXICMV6 (1 << 10)
>> + #define COERCR0_RXIGMV6 (1 << 11)
>> + #define COERCR0_RXICV6V6 (1 << 12)
>> +
>> + #define COERCR0_DEFAULT (COERCR0_RXIPCE | COERCR0_RXV6PE | \
>> + COERCR0_RXTCPE | COERCR0_RXUDPE | \
>> + COERCR0_RXTCPV6 | COERCR0_RXUDPV6)
>> +#define P4_COERCR1 (0x94)
>> + #define COERCR1_IPCEDP (1 << 0)
>> + #define COERCR1_IPVEDP (1 << 1)
>> + #define COERCR1_V6VEDP (1 << 2)
>> + #define COERCR1_TCPEDP (1 << 3)
>> + #define COERCR1_UDPEDP (1 << 4)
>> + #define COERCR1_ICMPDP (1 << 5)
>> + #define COERCR1_IGMPDP (1 << 6)
>> + #define COERCR1_ICV6DP (1 << 7)
>> + #define COERCR1_RX64TE (1 << 8)
>> + #define COERCR1_RXPPPE (1 << 9)
>> + #define COERCR1_TCP6DP (1 << 10)
>> + #define COERCR1_UDP6DP (1 << 11)
>> + #define COERCR1_IC6DP (1 << 12)
>> + #define COERCR1_IG6DP (1 << 13)
>> + #define COERCR1_ICV66DP (1 << 14)
>> + #define COERCR1_RPCE (1 << 15)
>> +
>> + #define COERCR1_DEFAULT (COERCR1_RXPPPE)
>> +#define P4_COETCR0 (0x96)
>> + #define COETCR0_TXIP (1 << 0)
>> + #define COETCR0_TXTCP (1 << 1)
>> + #define COETCR0_TXUDP (1 << 2)
>> + #define COETCR0_TXICMP (1 << 3)
>> + #define COETCR0_TXIGMP (1 << 4)
>> + #define COETCR0_TXICV6 (1 << 5)
>> + #define COETCR0_TXTCPV6 (1 << 8)
>> + #define COETCR0_TXUDPV6 (1 << 9)
>> + #define COETCR0_TXICMV6 (1 << 10)
>> + #define COETCR0_TXIGMV6 (1 << 11)
>> + #define COETCR0_TXICV6V6 (1 << 12)
>> +
>> + #define COETCR0_DEFAULT (COETCR0_TXIP | COETCR0_TXTCP | \
>> + COETCR0_TXUDP | COETCR0_TXTCPV6 | \
>> + COETCR0_TXUDPV6)
>> +#define P4_COETCR1 (0x98)
>> + #define COETCR1_TX64TE (1 << 0)
>> + #define COETCR1_TXPPPE (1 << 1)
>> +
>> +#define P4_COECEDR (0x9A)
>> +#define P4_L2CECR (0x9C)
>> +
>> + /* Definition of PAGE5 */
>> +#define P5_WFTR (0xA2)
>> + #define WFTR_2MS (0x01)
>> + #define WFTR_4MS (0x02)
>> + #define WFTR_8MS (0x03)
>> + #define WFTR_16MS (0x04)
>> + #define WFTR_32MS (0x05)
>> + #define WFTR_64MS (0x06)
>> + #define WFTR_128MS (0x07)
>> + #define WFTR_256MS (0x08)
>> + #define WFTR_512MS (0x09)
>> + #define WFTR_1024MS (0x0A)
>> + #define WFTR_2048MS (0x0B)
>> + #define WFTR_4096MS (0x0C)
>> + #define WFTR_8192MS (0x0D)
>> + #define WFTR_16384MS (0x0E)
>> + #define WFTR_32768MS (0x0F)
>> +#define P5_WFCCR (0xA4)
>> +#define P5_WFCR03 (0xA6)
>> + #define WFCR03_F0_EN (1 << 0)
>> + #define WFCR03_F1_EN (1 << 4)
>> + #define WFCR03_F2_EN (1 << 8)
>> + #define WFCR03_F3_EN (1 << 12)
>> +#define P5_WFCR47 (0xA8)
>> + #define WFCR47_F4_EN (1 << 0)
>> + #define WFCR47_F5_EN (1 << 4)
>> + #define WFCR47_F6_EN (1 << 8)
>> + #define WFCR47_F7_EN (1 << 12)
>> +#define P5_WF0BMR0 (0xAA)
>> +#define P5_WF0BMR1 (0xAC)
>> +#define P5_WF0CR (0xAE)
>> +#define P5_WF0OBR (0xB0)
>> +#define P5_WF1BMR0 (0xB2)
>> +#define P5_WF1BMR1 (0xB4)
>> +#define P5_WF1CR (0xB6)
>> +#define P5_WF1OBR (0xB8)
>> +#define P5_WF2BMR0 (0xBA)
>> +#define P5_WF2BMR1 (0xBC)
>> +
>> + /* Definition of PAGE6 */
>> +#define P6_WF2CR (0xC2)
>> +#define P6_WF2OBR (0xC4)
>> +#define P6_WF3BMR0 (0xC6)
>> +#define P6_WF3BMR1 (0xC8)
>> +#define P6_WF3CR (0xCA)
>> +#define P6_WF3OBR (0xCC)
>> +#define P6_WF4BMR0 (0xCE)
>> +#define P6_WF4BMR1 (0xD0)
>> +#define P6_WF4CR (0xD2)
>> +#define P6_WF4OBR (0xD4)
>> +#define P6_WF5BMR0 (0xD6)
>> +#define P6_WF5BMR1 (0xD8)
>> +#define P6_WF5CR (0xDA)
>> +#define P6_WF5OBR (0xDC)
>> +
>> +/* Definition of PAGE7 */
>> +#define P7_WF6BMR0 (0xE2)
>> +#define P7_WF6BMR1 (0xE4)
>> +#define P7_WF6CR (0xE6)
>> +#define P7_WF6OBR (0xE8)
>> +#define P7_WF7BMR0 (0xEA)
>> +#define P7_WF7BMR1 (0xEC)
>> +#define P7_WF7CR (0xEE)
>> +#define P7_WF7OBR (0xF0)
>> +#define P7_WFR01 (0xF2)
>> +#define P7_WFR23 (0xF4)
>> +#define P7_WFR45 (0xF6)
>> +#define P7_WFR67 (0xF8)
>> +#define P7_WFPC0 (0xFA)
>> +#define P7_WFPC1 (0xFC)
>> +
>> +
>> +/* Tx headers structure */
>> +struct tx_sop_header {
>> + /* bit 15-11: flags, bit 10-0: packet length */
>> + u16 flags_len;
>> + /* bit 15-11: sequence number, bit 11-0: packet length bar */
>> + u16 seq_lenbar;
>> +} __packed;
>> +
>> +struct tx_segment_header {
>> + /* bit 15-14: flags, bit 13-11: segment number */
>> + /* bit 10-0: segment length */
>> + u16 flags_seqnum_seglen;
>> + /* bit 15-14: end offset, bit 13-11: start offset */
>> + /* bit 10-0: segment length bar */
>> + u16 eo_so_seglenbar;
>> +} __packed;
>> +
>> +struct tx_eop_header {
>> + /* bit 15-11: sequence number, bit 10-0: packet length */
>> + u16 seq_len;
>> + /* bit 15-11: sequence number bar, bit 10-0: packet length bar */
>> + u16 seqbar_lenbar;
>> +} __packed;
>> +
>> +struct tx_pkt_info {
>> + struct tx_sop_header sop;
>> + struct tx_segment_header seg;
>> + struct tx_eop_header eop;
>> + u16 pkt_len;
>> + u16 seq_num;
>> +} __packed;
>> +
>> +/* Rx headers structure */
>> +struct rx_header {
>> + u16 flags_len;
>> + u16 seq_lenbar;
>> + u16 flags;
>> +} __packed;
>> +
>> +#endif /* #ifndef _AX88796C_MAIN_H */
>> diff --git a/drivers/net/ethernet/asix/ax88796c_spi.c b/drivers/net/ethernet/asix/ax88796c_spi.c
>> new file mode 100644
>> index 000000000000..5304eb33aad2
>> --- /dev/null
>> +++ b/drivers/net/ethernet/asix/ax88796c_spi.c
>> @@ -0,0 +1,103 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2010 ASIX Electronics Corporation
>> + *
>> + * ASIX AX88796C SPI Fast Ethernet Linux driver
>> + */
>> +
>> +#include "ax88796c_main.h"
>> +#include "ax88796c_spi.h"
>> +
>> +/* driver bus management functions */
>> +void axspi_wakeup(struct axspi_data *ax_spi)
>> +{
>> + u8 tx_buf;
>> + int ret;
>> +
>> + tx_buf = AX_SPICMD_EXIT_PWD; /* OP */
>> + ret = spi_write(ax_spi->spi, &tx_buf, 1);
>> + if (ret)
>> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
>> +}
>> +
>> +void axspi_read_status(struct axspi_data *ax_spi, struct spi_status *status)
>> +{
>> + u8 tx_buf;
>> + int ret;
>> +
>> + /* OP */
>> + tx_buf = AX_SPICMD_READ_STATUS;
>> + ret = spi_write_then_read(ax_spi->spi, &tx_buf, 1, (u8 *)&status, 3);
>> + if (ret)
>> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
>> + else
>> + le16_to_cpus(&status->isr);
>> +}
>> +
>> +int axspi_read_rxq(struct axspi_data *ax_spi, void *data, int len)
>> +{
>> + struct spi_transfer *xfer = ax_spi->spi_rx_xfer;
>> + int ret;
>> +
>> + memcpy(ax_spi->cmd_buf, rx_cmd_buf, 5);
>> +
>> + xfer->tx_buf = ax_spi->cmd_buf;
>> + xfer->rx_buf = NULL;
>> + xfer->len = ax_spi->comp ? 2 : 5;
>> + xfer->bits_per_word = 8;
>> + spi_message_add_tail(xfer, &ax_spi->rx_msg);
>> +
>> + xfer++;
>> + xfer->rx_buf = data;
>> + xfer->tx_buf = NULL;
>> + xfer->len = len;
>> + xfer->bits_per_word = 8;
>> + spi_message_add_tail(xfer, &ax_spi->rx_msg);
>> + ret = spi_sync(ax_spi->spi, &ax_spi->rx_msg);
>> + if (ret)
>> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
>> +
>> + return ret;
>> +}
>> +
>> +int axspi_write_txq(struct axspi_data *ax_spi, void *data, int len)
>> +{
>> + return spi_write(ax_spi->spi, data, len);
>> +}
>> +
>> +u16 axspi_read_reg(struct axspi_data *ax_spi, u8 reg)
>> +{
>> + u8 tx_buf[4];
>> + u16 rx_buf = 0;
>> + int ret;
>> + int len = ax_spi->comp ? 3 : 4;
>> +
>> + tx_buf[0] = 0x03; /* OP code read register */
>> + tx_buf[1] = reg; /* register address */
>> + tx_buf[2] = 0xFF; /* dumy cycle */
>> + tx_buf[3] = 0xFF; /* dumy cycle */
>> + ret = spi_write_then_read(ax_spi->spi, tx_buf, len, (u8 *)&rx_buf, 2);
>> + if (ret)
>> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
>> + else
>> + le16_to_cpus(&rx_buf);
>> +
>> + return rx_buf;
>> +}
>> +
>> +void axspi_write_reg(struct axspi_data *ax_spi, u8 reg, u16 value)
>> +{
>> + u8 tx_buf[4];
>> + int ret;
>> +
>> + tx_buf[0] = AX_SPICMD_WRITE_REG; /* OP code read register */
>> + tx_buf[1] = reg; /* register address */
>> + tx_buf[2] = value;
>> + tx_buf[3] = value >> 8;
>> +
>> + ret = spi_write(ax_spi->spi, tx_buf, 4);
>> + if (ret)
>> + dev_err(&ax_spi->spi->dev, "%s() failed: ret = %d\n", __func__, ret);
>> +
>
> Run the checkpatch string and fix almost all issues (except ones you
> disagree).
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 483 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread* RE: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-26 14:59 ` Lukasz Stelmach
@ 2020-08-26 15:06 ` David Laight
-1 siblings, 0 replies; 57+ messages in thread
From: David Laight @ 2020-08-26 15:06 UTC (permalink / raw)
To: 'Lukasz Stelmach', Krzysztof Kozlowski
Cc: David S. Miller, Jakub Kicinski, Kukjin Kim, Rob Herring,
Russell King, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
m.szyprowski@samsung.com, b.zolnierkie@samsung.com
From: Lukasz Stelmach
> Sent: 26 August 2020 15:59
>
> It was <2020-08-25 wto 20:44>, when Krzysztof Kozlowski wrote:
> > On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> >> ASIX AX88796[1] is a versatile ethernet adapter chip, that can be
> >> connected to a CPU with a 8/16-bit bus or with an SPI. This driver
> >> supports SPI connection.
...
> >> +++ b/drivers/net/ethernet/asix/Kconfig
> >> @@ -0,0 +1,20 @@
> >> +#
> >> +# Asix network device configuration
> >> +#
> >> +
> >> +config NET_VENDOR_ASIX
> >> + bool "Asix devices"
> >> + depends on SPI
> >> + help
> >> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
> >
> > Looks like too long, did it pass checkpatch?
>
> Yes? Let me try again. Yes, this one passed, but I missed a few other
> problems. Thank you.
>
> >> +
> >> +if NET_VENDOR_ASIX
> >> +
> >> +config SPI_AX88796C
> >> + tristate "Asix AX88796C-SPI support"
> >> + depends on SPI
> >> + depends on GPIOLIB
> >> + help
> >> + Say Y here if you intend to attach a Asix AX88796C as SPI mode
> >> +
> >> +endif # NET_VENDOR_ASIX
There are plenty of other ethernet devices made by ASIX (eg USB ones)
that have nothing at all to do with this driver.
So those questions are too broad.
The first one should probable be for ASIX SPI network devices.
(I can't imagine SPI being fast enough to be useful for ethernet...)
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
^ permalink raw reply [flat|nested] 57+ messages in thread
* RE: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-26 15:06 ` David Laight
0 siblings, 0 replies; 57+ messages in thread
From: David Laight @ 2020-08-26 15:06 UTC (permalink / raw)
To: 'Lukasz Stelmach', Krzysztof Kozlowski
Cc: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
b.zolnierkie@samsung.com, netdev@vger.kernel.org, Russell King,
Rob Herring, linux-kernel@vger.kernel.org, Kukjin Kim,
Jakub Kicinski, David S. Miller,
linux-arm-kernel@lists.infradead.org, m.szyprowski@samsung.com
From: Lukasz Stelmach
> Sent: 26 August 2020 15:59
>
> It was <2020-08-25 wto 20:44>, when Krzysztof Kozlowski wrote:
> > On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> >> ASIX AX88796[1] is a versatile ethernet adapter chip, that can be
> >> connected to a CPU with a 8/16-bit bus or with an SPI. This driver
> >> supports SPI connection.
...
> >> +++ b/drivers/net/ethernet/asix/Kconfig
> >> @@ -0,0 +1,20 @@
> >> +#
> >> +# Asix network device configuration
> >> +#
> >> +
> >> +config NET_VENDOR_ASIX
> >> + bool "Asix devices"
> >> + depends on SPI
> >> + help
> >> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
> >
> > Looks like too long, did it pass checkpatch?
>
> Yes? Let me try again. Yes, this one passed, but I missed a few other
> problems. Thank you.
>
> >> +
> >> +if NET_VENDOR_ASIX
> >> +
> >> +config SPI_AX88796C
> >> + tristate "Asix AX88796C-SPI support"
> >> + depends on SPI
> >> + depends on GPIOLIB
> >> + help
> >> + Say Y here if you intend to attach a Asix AX88796C as SPI mode
> >> +
> >> +endif # NET_VENDOR_ASIX
There are plenty of other ethernet devices made by ASIX (eg USB ones)
that have nothing at all to do with this driver.
So those questions are too broad.
The first one should probable be for ASIX SPI network devices.
(I can't imagine SPI being fast enough to be useful for ethernet...)
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-26 15:06 ` David Laight
@ 2020-08-26 16:07 ` Andrew Lunn
-1 siblings, 0 replies; 57+ messages in thread
From: Andrew Lunn @ 2020-08-26 16:07 UTC (permalink / raw)
To: David Laight
Cc: 'Lukasz Stelmach', Krzysztof Kozlowski, David S. Miller,
Jakub Kicinski, Kukjin Kim, Rob Herring, Russell King,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
m.szyprowski@samsung.com, b.zolnierkie@samsung.com
> (I can't imagine SPI being fast enough to be useful for ethernet...)
There are plenty of IoT things which only need a few kbit/s.
A VoIP phone can probably get by with 128Kbps, which a 50Mbps SPI bus
has no problem to provide, etc.
Andrew
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-26 16:07 ` Andrew Lunn
0 siblings, 0 replies; 57+ messages in thread
From: Andrew Lunn @ 2020-08-26 16:07 UTC (permalink / raw)
To: David Laight
Cc: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
b.zolnierkie@samsung.com, netdev@vger.kernel.org,
'Lukasz Stelmach', Russell King, Krzysztof Kozlowski,
linux-kernel@vger.kernel.org, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller,
linux-arm-kernel@lists.infradead.org, m.szyprowski@samsung.com
> (I can't imagine SPI being fast enough to be useful for ethernet...)
There are plenty of IoT things which only need a few kbit/s.
A VoIP phone can probably get by with 128Kbps, which a 50Mbps SPI bus
has no problem to provide, etc.
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-26 15:06 ` David Laight
@ 2020-09-07 18:06 ` Lukasz Stelmach
-1 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-09-07 18:06 UTC (permalink / raw)
To: David Laight
Cc: Krzysztof Kozlowski, David S. Miller, Jakub Kicinski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
m.szyprowski@samsung.com, b.zolnierkie@samsung.com
[-- Attachment #1: Type: text/plain, Size: 1909 bytes --]
It was <2020-08-26 śro 15:06>, when David Laight wrote:
> From: Lukasz Stelmach
>> Sent: 26 August 2020 15:59
>>
>> It was <2020-08-25 wto 20:44>, when Krzysztof Kozlowski wrote:
>> > On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
>> >> ASIX AX88796[1] is a versatile ethernet adapter chip, that can be
>> >> connected to a CPU with a 8/16-bit bus or with an SPI. This driver
>> >> supports SPI connection.
> ...
>> >> +++ b/drivers/net/ethernet/asix/Kconfig
>> >> @@ -0,0 +1,20 @@
>> >> +#
>> >> +# Asix network device configuration
>> >> +#
>> >> +
>> >> +config NET_VENDOR_ASIX
>> >> + bool "Asix devices"
>> >> + depends on SPI
>> >> + help
>> >> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
>> >
>> > Looks like too long, did it pass checkpatch?
>>
>> Yes? Let me try again. Yes, this one passed, but I missed a few other
>> problems. Thank you.
>>
>> >> +
>> >> +if NET_VENDOR_ASIX
>> >> +
>> >> +config SPI_AX88796C
>> >> + tristate "Asix AX88796C-SPI support"
>> >> + depends on SPI
>> >> + depends on GPIOLIB
>> >> + help
>> >> + Say Y here if you intend to attach a Asix AX88796C as SPI mode
>> >> +
>> >> +endif # NET_VENDOR_ASIX
>
> There are plenty of other ethernet devices made by ASIX (eg USB ones)
> that have nothing at all to do with this driver.
> So those questions are too broad.
>
> The first one should probable be for ASIX SPI network devices.
>
On the other hand there is only one ASIX SPI network device and there
are four other Non-PCI AX88* chips (and that is all I know about them).
> (I can't imagine SPI being fast enough to be useful for ethernet...)
Not for a file server, sure. It handles clock up to 40MHz and it's meant
for systems that cannot handle more than a few MB/s anyway.
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-09-07 18:06 ` Lukasz Stelmach
0 siblings, 0 replies; 57+ messages in thread
From: Lukasz Stelmach @ 2020-09-07 18:06 UTC (permalink / raw)
To: David Laight
Cc: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
b.zolnierkie@samsung.com, netdev@vger.kernel.org, Russell King,
Krzysztof Kozlowski, linux-kernel@vger.kernel.org, Rob Herring,
Kukjin Kim, Jakub Kicinski, David S. Miller,
linux-arm-kernel@lists.infradead.org, m.szyprowski@samsung.com
[-- Attachment #1.1: Type: text/plain, Size: 1909 bytes --]
It was <2020-08-26 śro 15:06>, when David Laight wrote:
> From: Lukasz Stelmach
>> Sent: 26 August 2020 15:59
>>
>> It was <2020-08-25 wto 20:44>, when Krzysztof Kozlowski wrote:
>> > On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
>> >> ASIX AX88796[1] is a versatile ethernet adapter chip, that can be
>> >> connected to a CPU with a 8/16-bit bus or with an SPI. This driver
>> >> supports SPI connection.
> ...
>> >> +++ b/drivers/net/ethernet/asix/Kconfig
>> >> @@ -0,0 +1,20 @@
>> >> +#
>> >> +# Asix network device configuration
>> >> +#
>> >> +
>> >> +config NET_VENDOR_ASIX
>> >> + bool "Asix devices"
>> >> + depends on SPI
>> >> + help
>> >> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
>> >
>> > Looks like too long, did it pass checkpatch?
>>
>> Yes? Let me try again. Yes, this one passed, but I missed a few other
>> problems. Thank you.
>>
>> >> +
>> >> +if NET_VENDOR_ASIX
>> >> +
>> >> +config SPI_AX88796C
>> >> + tristate "Asix AX88796C-SPI support"
>> >> + depends on SPI
>> >> + depends on GPIOLIB
>> >> + help
>> >> + Say Y here if you intend to attach a Asix AX88796C as SPI mode
>> >> +
>> >> +endif # NET_VENDOR_ASIX
>
> There are plenty of other ethernet devices made by ASIX (eg USB ones)
> that have nothing at all to do with this driver.
> So those questions are too broad.
>
> The first one should probable be for ASIX SPI network devices.
>
On the other hand there is only one ASIX SPI network device and there
are four other Non-PCI AX88* chips (and that is all I know about them).
> (I can't imagine SPI being fast enough to be useful for ethernet...)
Not for a file server, sure. It handles clock up to 40MHz and it's meant
for systems that cannot handle more than a few MB/s anyway.
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-26 14:59 ` Lukasz Stelmach
@ 2020-08-26 16:02 ` Andrew Lunn
-1 siblings, 0 replies; 57+ messages in thread
From: Andrew Lunn @ 2020-08-26 16:02 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: Krzysztof Kozlowski, David S. Miller, Jakub Kicinski, Kukjin Kim,
Rob Herring, Russell King, linux-arm-kernel, linux-kernel,
linux-samsung-soc, netdev, devicetree, m.szyprowski, b.zolnierkie
> >> +module_param(comp, int, 0);
> >> +MODULE_PARM_DESC(comp, "0=Non-Compression Mode, 1=Compression Mode");
> >> +
> >> +module_param(ps_level, int, 0);
> >> +MODULE_PARM_DESC(ps_level,
> >> + "Power Saving Level (0:disable 1:level 1 2:level 2)");
> >> +
> >> +module_param(msg_enable, int, 0);
> >> +MODULE_PARM_DESC(msg_enable, "Message mask (see linux/netdevice.h for bitmap)");
> >> +
> >> +static char *macaddr;
> >> +module_param(macaddr, charp, 0);
> >> +MODULE_PARM_DESC(macaddr, "MAC address");
> >
> > I think MAC address as param is not accepted in mainline...
> >
>
> $ git grep MODULE_PARM_DESC\(macaddr -- drivers/net | wc -l
> 6
Yes, they exist. But still it is considered back practice, don't do
it, use device tree for MAC addresses.
Andrew
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-26 16:02 ` Andrew Lunn
0 siblings, 0 replies; 57+ messages in thread
From: Andrew Lunn @ 2020-08-26 16:02 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Krzysztof Kozlowski, linux-kernel, Rob Herring, Kukjin Kim,
Jakub Kicinski, David S. Miller, linux-arm-kernel, m.szyprowski
> >> +module_param(comp, int, 0);
> >> +MODULE_PARM_DESC(comp, "0=Non-Compression Mode, 1=Compression Mode");
> >> +
> >> +module_param(ps_level, int, 0);
> >> +MODULE_PARM_DESC(ps_level,
> >> + "Power Saving Level (0:disable 1:level 1 2:level 2)");
> >> +
> >> +module_param(msg_enable, int, 0);
> >> +MODULE_PARM_DESC(msg_enable, "Message mask (see linux/netdevice.h for bitmap)");
> >> +
> >> +static char *macaddr;
> >> +module_param(macaddr, charp, 0);
> >> +MODULE_PARM_DESC(macaddr, "MAC address");
> >
> > I think MAC address as param is not accepted in mainline...
> >
>
> $ git grep MODULE_PARM_DESC\(macaddr -- drivers/net | wc -l
> 6
Yes, they exist. But still it is considered back practice, don't do
it, use device tree for MAC addresses.
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-26 14:59 ` Lukasz Stelmach
@ 2020-08-26 16:45 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 57+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-26 16:45 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: David S. Miller, Jakub Kicinski, Kukjin Kim, Rob Herring,
Russell King, linux-arm-kernel, linux-kernel, linux-samsung-soc,
netdev, devicetree, m.szyprowski, b.zolnierkie
On Wed, Aug 26, 2020 at 04:59:09PM +0200, Lukasz Stelmach wrote:
> It was <2020-08-25 wto 20:44>, when Krzysztof Kozlowski wrote:
> > On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> >> ASIX AX88796[1] is a versatile ethernet adapter chip, that can be
> >> connected to a CPU with a 8/16-bit bus or with an SPI. This driver
> >> supports SPI connection.
> >>
> >> The driver has been ported from the vendor kernel for ARTIK5[2]
> >> boards. Several changes were made to adapt it to the current kernel
> >> which include:
> >>
> >> + updated DT configuration,
> >> + clock configuration moved to DT,
> >> + new timer, ethtool and gpio APIs
> >> + dev_* instead of pr_* and custom printk() wrappers.
> >>
> >> [1] https://protect2.fireeye.com/v1/url?k=074e9e9d-5a9dc212-074f15d2-0cc47a31ce52-0f896a3d08738907&q=1&e=bcaebfa2-4f00-46b6-a35d-096f39710f47&u=https%3A%2F%2Fwww.asix.com.tw%2Fproducts.php%3Fop%3DpItemdetail%26PItemID%3D104%3B65%3B86%26PLine%3D65
> >> [2] https://protect2.fireeye.com/v1/url?k=553869ec-08eb3563-5539e2a3-0cc47a31ce52-fc42424019c6fd8f&q=1&e=bcaebfa2-4f00-46b6-a35d-096f39710f47&u=https%3A%2F%2Fgit.tizen.org%2Fcgit%2Fprofile%2Fcommon%2Fplatform%2Fkernel%2Flinux-3.10-artik%2F
> >>
> >> The other ax88796 driver is for NE2000 compatible AX88796L chip. These
> >> chips are not compatible. Hence, two separate drivers are required.
> >
> > Hi,
> >
> > Thanks for the driver, nice work. Few comments below.
> >
>
> Thank you. I fixed most problems and asked some question where I didn't
> understand.
>
> >>
> >> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> >> ---
> >> drivers/net/ethernet/Kconfig | 1 +
> >> drivers/net/ethernet/Makefile | 1 +
> >> drivers/net/ethernet/asix/Kconfig | 20 +
> >> drivers/net/ethernet/asix/Makefile | 6 +
> >> drivers/net/ethernet/asix/ax88796c_ioctl.c | 293 +++++
> >> drivers/net/ethernet/asix/ax88796c_ioctl.h | 21 +
> >> drivers/net/ethernet/asix/ax88796c_main.c | 1373 ++++++++++++++++++++
> >> drivers/net/ethernet/asix/ax88796c_main.h | 596 +++++++++
> >> drivers/net/ethernet/asix/ax88796c_spi.c | 103 ++
> >> drivers/net/ethernet/asix/ax88796c_spi.h | 67 +
> >> 10 files changed, 2481 insertions(+)
> >> create mode 100644 drivers/net/ethernet/asix/Kconfig
> >> create mode 100644 drivers/net/ethernet/asix/Makefile
> >> create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.c
> >> create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.h
> >> create mode 100644 drivers/net/ethernet/asix/ax88796c_main.c
> >> create mode 100644 drivers/net/ethernet/asix/ax88796c_main.h
> >> create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.c
> >> create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.h
> >>
> >> diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
> >> index de50e8b9e656..f3b218e45ea5 100644
> >> --- a/drivers/net/ethernet/Kconfig
> >> +++ b/drivers/net/ethernet/Kconfig
> >> @@ -32,6 +32,7 @@ source "drivers/net/ethernet/apm/Kconfig"
> >> source "drivers/net/ethernet/apple/Kconfig"
> >> source "drivers/net/ethernet/aquantia/Kconfig"
> >> source "drivers/net/ethernet/arc/Kconfig"
> >> +source "drivers/net/ethernet/asix/Kconfig"
> >> source "drivers/net/ethernet/atheros/Kconfig"
> >> source "drivers/net/ethernet/aurora/Kconfig"
> >> source "drivers/net/ethernet/broadcom/Kconfig"
> >> diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
> >> index f8f38dcb5f8a..9eb368d93607 100644
> >> --- a/drivers/net/ethernet/Makefile
> >> +++ b/drivers/net/ethernet/Makefile
> >> @@ -18,6 +18,7 @@ obj-$(CONFIG_NET_XGENE) += apm/
> >> obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
> >> obj-$(CONFIG_NET_VENDOR_AQUANTIA) += aquantia/
> >> obj-$(CONFIG_NET_VENDOR_ARC) += arc/
> >> +obj-$(CONFIG_NET_VENDOR_ASIX) += asix/
> >> obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
> >> obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/
> >> obj-$(CONFIG_NET_VENDOR_CADENCE) += cadence/
> >> diff --git a/drivers/net/ethernet/asix/Kconfig b/drivers/net/ethernet/asix/Kconfig
> >> new file mode 100644
> >> index 000000000000..4b127a4a659a
> >> --- /dev/null
> >> +++ b/drivers/net/ethernet/asix/Kconfig
> >> @@ -0,0 +1,20 @@
> >> +#
> >> +# Asix network device configuration
> >> +#
> >> +
> >> +config NET_VENDOR_ASIX
> >> + bool "Asix devices"
> >> + depends on SPI
> >> + help
> >> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
> >
> > Looks like too long, did it pass checkpatch?
>
> Yes? Let me try again. Yes, this one passed, but I missed a few other
> problems. Thank you.
I noticed that now the limit is 100 when improves readability, so this
one is good.
(...)
> >> +
> >> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
> >
> > Looks here like pointer to const. Unless it is because of
> > AX_READ_STATUS() which cannot take const?
>
> It can. I changed other stuff in ax88796c_spi.[hc] to const too.
>
> >> +{
> >
> > Please put file-scope definitions first, so this should go to the end.
>
> I don't understand.
Functions and variables which (file scope) are static go to the
beginning of file. Ones visible externally (non static), go after them.
(...)
> >> +
> >> + AX_WRITE(&ax_local->ax_spi, rx_ctl, P2_RXCR);
> >> +
> >
> > No need for empty line.
> >
>
> Fixed.
>
> >> +}
> >> +
> >> +#if 0
> >
> > Please comment why it is commented out.
> >
>
> Always has been (-; This is how it came from the vendor I missed it when
> I focused on making things work. I will investigate it and either
> uncomment or remove it.
Then just remove it.
(...)
> >> +#include <linux/of.h>
> >> +#endif
> >> +#include <linux/crc32.h>
> >> +#include <linux/etherdevice.h>
> >> +#include <linux/ethtool.h>
> >> +#include <linux/gpio/consumer.h>
> >> +#include <linux/init.h>
> >> +#include <linux/io.h>
> >> +#include <linux/kmod.h>
> >> +#include <linux/mii.h>
> >> +#include <linux/module.h>
> >> +#include <linux/netdevice.h>
> >> +#include <linux/platform_device.h>
> >> +#include <linux/sched.h>
> >> +#include <linux/spi/spi.h>
> >> +#include <linux/timer.h>
> >> +#include <linux/uaccess.h>
> >> +#include <linux/usb.h>
> >> +#include <linux/version.h>
> >> +#include <linux/workqueue.h>
> >
> > All of these should be removed except the headers used directly in this
> > header.
> >
>
> This is "private" header file included in all ax88796c_*.c files and
> these are headers required in them. It seems more conveninet to have
> them all listed in one place. What is the reason to do otherwise?
Because:
1. The header is included in other files (more than one) so each other
compilation unit will include all these headers, while not all of them
need. This has a performance penalty during preprocessing.
2. You will loose the track which headers are needed, which are not. We
tend to keep it local, which means each compilation unit includes stuff
it needs. This helps removing obsolete includes later.
3. Otherwise you could make one header, including all headers of Linux,
and then include this one header in each of C files. One to rule them
all.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-26 16:45 ` Krzysztof Kozlowski
0 siblings, 0 replies; 57+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-26 16:45 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Rob Herring, linux-kernel, Kukjin Kim, Jakub Kicinski,
David S. Miller, linux-arm-kernel, m.szyprowski
On Wed, Aug 26, 2020 at 04:59:09PM +0200, Lukasz Stelmach wrote:
> It was <2020-08-25 wto 20:44>, when Krzysztof Kozlowski wrote:
> > On Tue, Aug 25, 2020 at 07:03:09PM +0200, Łukasz Stelmach wrote:
> >> ASIX AX88796[1] is a versatile ethernet adapter chip, that can be
> >> connected to a CPU with a 8/16-bit bus or with an SPI. This driver
> >> supports SPI connection.
> >>
> >> The driver has been ported from the vendor kernel for ARTIK5[2]
> >> boards. Several changes were made to adapt it to the current kernel
> >> which include:
> >>
> >> + updated DT configuration,
> >> + clock configuration moved to DT,
> >> + new timer, ethtool and gpio APIs
> >> + dev_* instead of pr_* and custom printk() wrappers.
> >>
> >> [1] https://protect2.fireeye.com/v1/url?k=074e9e9d-5a9dc212-074f15d2-0cc47a31ce52-0f896a3d08738907&q=1&e=bcaebfa2-4f00-46b6-a35d-096f39710f47&u=https%3A%2F%2Fwww.asix.com.tw%2Fproducts.php%3Fop%3DpItemdetail%26PItemID%3D104%3B65%3B86%26PLine%3D65
> >> [2] https://protect2.fireeye.com/v1/url?k=553869ec-08eb3563-5539e2a3-0cc47a31ce52-fc42424019c6fd8f&q=1&e=bcaebfa2-4f00-46b6-a35d-096f39710f47&u=https%3A%2F%2Fgit.tizen.org%2Fcgit%2Fprofile%2Fcommon%2Fplatform%2Fkernel%2Flinux-3.10-artik%2F
> >>
> >> The other ax88796 driver is for NE2000 compatible AX88796L chip. These
> >> chips are not compatible. Hence, two separate drivers are required.
> >
> > Hi,
> >
> > Thanks for the driver, nice work. Few comments below.
> >
>
> Thank you. I fixed most problems and asked some question where I didn't
> understand.
>
> >>
> >> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> >> ---
> >> drivers/net/ethernet/Kconfig | 1 +
> >> drivers/net/ethernet/Makefile | 1 +
> >> drivers/net/ethernet/asix/Kconfig | 20 +
> >> drivers/net/ethernet/asix/Makefile | 6 +
> >> drivers/net/ethernet/asix/ax88796c_ioctl.c | 293 +++++
> >> drivers/net/ethernet/asix/ax88796c_ioctl.h | 21 +
> >> drivers/net/ethernet/asix/ax88796c_main.c | 1373 ++++++++++++++++++++
> >> drivers/net/ethernet/asix/ax88796c_main.h | 596 +++++++++
> >> drivers/net/ethernet/asix/ax88796c_spi.c | 103 ++
> >> drivers/net/ethernet/asix/ax88796c_spi.h | 67 +
> >> 10 files changed, 2481 insertions(+)
> >> create mode 100644 drivers/net/ethernet/asix/Kconfig
> >> create mode 100644 drivers/net/ethernet/asix/Makefile
> >> create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.c
> >> create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.h
> >> create mode 100644 drivers/net/ethernet/asix/ax88796c_main.c
> >> create mode 100644 drivers/net/ethernet/asix/ax88796c_main.h
> >> create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.c
> >> create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.h
> >>
> >> diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
> >> index de50e8b9e656..f3b218e45ea5 100644
> >> --- a/drivers/net/ethernet/Kconfig
> >> +++ b/drivers/net/ethernet/Kconfig
> >> @@ -32,6 +32,7 @@ source "drivers/net/ethernet/apm/Kconfig"
> >> source "drivers/net/ethernet/apple/Kconfig"
> >> source "drivers/net/ethernet/aquantia/Kconfig"
> >> source "drivers/net/ethernet/arc/Kconfig"
> >> +source "drivers/net/ethernet/asix/Kconfig"
> >> source "drivers/net/ethernet/atheros/Kconfig"
> >> source "drivers/net/ethernet/aurora/Kconfig"
> >> source "drivers/net/ethernet/broadcom/Kconfig"
> >> diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
> >> index f8f38dcb5f8a..9eb368d93607 100644
> >> --- a/drivers/net/ethernet/Makefile
> >> +++ b/drivers/net/ethernet/Makefile
> >> @@ -18,6 +18,7 @@ obj-$(CONFIG_NET_XGENE) += apm/
> >> obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
> >> obj-$(CONFIG_NET_VENDOR_AQUANTIA) += aquantia/
> >> obj-$(CONFIG_NET_VENDOR_ARC) += arc/
> >> +obj-$(CONFIG_NET_VENDOR_ASIX) += asix/
> >> obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
> >> obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/
> >> obj-$(CONFIG_NET_VENDOR_CADENCE) += cadence/
> >> diff --git a/drivers/net/ethernet/asix/Kconfig b/drivers/net/ethernet/asix/Kconfig
> >> new file mode 100644
> >> index 000000000000..4b127a4a659a
> >> --- /dev/null
> >> +++ b/drivers/net/ethernet/asix/Kconfig
> >> @@ -0,0 +1,20 @@
> >> +#
> >> +# Asix network device configuration
> >> +#
> >> +
> >> +config NET_VENDOR_ASIX
> >> + bool "Asix devices"
> >> + depends on SPI
> >> + help
> >> + If you have a network (Ethernet) interface based on a chip from ASIX, say Y
> >
> > Looks like too long, did it pass checkpatch?
>
> Yes? Let me try again. Yes, this one passed, but I missed a few other
> problems. Thank you.
I noticed that now the limit is 100 when improves readability, so this
one is good.
(...)
> >> +
> >> +u8 ax88796c_check_power(struct ax88796c_device *ax_local)
> >
> > Looks here like pointer to const. Unless it is because of
> > AX_READ_STATUS() which cannot take const?
>
> It can. I changed other stuff in ax88796c_spi.[hc] to const too.
>
> >> +{
> >
> > Please put file-scope definitions first, so this should go to the end.
>
> I don't understand.
Functions and variables which (file scope) are static go to the
beginning of file. Ones visible externally (non static), go after them.
(...)
> >> +
> >> + AX_WRITE(&ax_local->ax_spi, rx_ctl, P2_RXCR);
> >> +
> >
> > No need for empty line.
> >
>
> Fixed.
>
> >> +}
> >> +
> >> +#if 0
> >
> > Please comment why it is commented out.
> >
>
> Always has been (-; This is how it came from the vendor I missed it when
> I focused on making things work. I will investigate it and either
> uncomment or remove it.
Then just remove it.
(...)
> >> +#include <linux/of.h>
> >> +#endif
> >> +#include <linux/crc32.h>
> >> +#include <linux/etherdevice.h>
> >> +#include <linux/ethtool.h>
> >> +#include <linux/gpio/consumer.h>
> >> +#include <linux/init.h>
> >> +#include <linux/io.h>
> >> +#include <linux/kmod.h>
> >> +#include <linux/mii.h>
> >> +#include <linux/module.h>
> >> +#include <linux/netdevice.h>
> >> +#include <linux/platform_device.h>
> >> +#include <linux/sched.h>
> >> +#include <linux/spi/spi.h>
> >> +#include <linux/timer.h>
> >> +#include <linux/uaccess.h>
> >> +#include <linux/usb.h>
> >> +#include <linux/version.h>
> >> +#include <linux/workqueue.h>
> >
> > All of these should be removed except the headers used directly in this
> > header.
> >
>
> This is "private" header file included in all ax88796c_*.c files and
> these are headers required in them. It seems more conveninet to have
> them all listed in one place. What is the reason to do otherwise?
Because:
1. The header is included in other files (more than one) so each other
compilation unit will include all these headers, while not all of them
need. This has a performance penalty during preprocessing.
2. You will loose the track which headers are needed, which are not. We
tend to keep it local, which means each compilation unit includes stuff
it needs. This helps removing obsolete includes later.
3. Otherwise you could make one header, including all headers of Linux,
and then include this one header in each of C files. One to rule them
all.
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-26 16:45 ` Krzysztof Kozlowski
@ 2020-08-26 16:52 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 57+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-26 16:52 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: David S. Miller, Jakub Kicinski, Kukjin Kim, Rob Herring,
Russell King, linux-arm-kernel, linux-kernel, linux-samsung-soc,
netdev, devicetree, m.szyprowski, b.zolnierkie
On Wed, Aug 26, 2020 at 06:45:33PM +0200, Krzysztof Kozlowski wrote:
> On Wed, Aug 26, 2020 at 04:59:09PM +0200, Lukasz Stelmach wrote:
> >> +#include <linux/of.h>
> > >> +#endif
> > >> +#include <linux/crc32.h>
> > >> +#include <linux/etherdevice.h>
> > >> +#include <linux/ethtool.h>
> > >> +#include <linux/gpio/consumer.h>
> > >> +#include <linux/init.h>
> > >> +#include <linux/io.h>
> > >> +#include <linux/kmod.h>
> > >> +#include <linux/mii.h>
> > >> +#include <linux/module.h>
> > >> +#include <linux/netdevice.h>
> > >> +#include <linux/platform_device.h>
> > >> +#include <linux/sched.h>
> > >> +#include <linux/spi/spi.h>
> > >> +#include <linux/timer.h>
> > >> +#include <linux/uaccess.h>
> > >> +#include <linux/usb.h>
> > >> +#include <linux/version.h>
> > >> +#include <linux/workqueue.h>
> > >
> > > All of these should be removed except the headers used directly in this
> > > header.
> > >
> >
> > This is "private" header file included in all ax88796c_*.c files and
> > these are headers required in them. It seems more conveninet to have
> > them all listed in one place. What is the reason to do otherwise?
>
> Because:
> 1. The header is included in other files (more than one) so each other
> compilation unit will include all these headers, while not all of them
> need. This has a performance penalty during preprocessing.
>
> 2. You will loose the track which headers are needed, which are not. We
> tend to keep it local, which means each compilation unit includes stuff
> it needs. This helps removing obsolete includes later.
>
> 3. Otherwise you could make one header, including all headers of Linux,
> and then include this one header in each of C files. One to rule them
> all.
... and I got one more:
4. Drivers sometimes get reused, extended or they parts got reused. If
a header includes more stuff, it simply will pollute all other units
trying to reuse it... making the re-usage difficult. This is less likely
reason, I mean, quite imaginary for this particular driver.
I don't expect pieces of this driver to be reused... but who knows. Many
times in the past in the kernel there was a huge work rewriting headers
in many files, because something was including something else and we
wanted to decouple these things. Therefore following the pattern -
include stuff you explicitly use - helps in every case.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-26 16:52 ` Krzysztof Kozlowski
0 siblings, 0 replies; 57+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-26 16:52 UTC (permalink / raw)
To: Lukasz Stelmach
Cc: devicetree, linux-samsung-soc, b.zolnierkie, netdev, Russell King,
Rob Herring, linux-kernel, Kukjin Kim, Jakub Kicinski,
David S. Miller, linux-arm-kernel, m.szyprowski
On Wed, Aug 26, 2020 at 06:45:33PM +0200, Krzysztof Kozlowski wrote:
> On Wed, Aug 26, 2020 at 04:59:09PM +0200, Lukasz Stelmach wrote:
> >> +#include <linux/of.h>
> > >> +#endif
> > >> +#include <linux/crc32.h>
> > >> +#include <linux/etherdevice.h>
> > >> +#include <linux/ethtool.h>
> > >> +#include <linux/gpio/consumer.h>
> > >> +#include <linux/init.h>
> > >> +#include <linux/io.h>
> > >> +#include <linux/kmod.h>
> > >> +#include <linux/mii.h>
> > >> +#include <linux/module.h>
> > >> +#include <linux/netdevice.h>
> > >> +#include <linux/platform_device.h>
> > >> +#include <linux/sched.h>
> > >> +#include <linux/spi/spi.h>
> > >> +#include <linux/timer.h>
> > >> +#include <linux/uaccess.h>
> > >> +#include <linux/usb.h>
> > >> +#include <linux/version.h>
> > >> +#include <linux/workqueue.h>
> > >
> > > All of these should be removed except the headers used directly in this
> > > header.
> > >
> >
> > This is "private" header file included in all ax88796c_*.c files and
> > these are headers required in them. It seems more conveninet to have
> > them all listed in one place. What is the reason to do otherwise?
>
> Because:
> 1. The header is included in other files (more than one) so each other
> compilation unit will include all these headers, while not all of them
> need. This has a performance penalty during preprocessing.
>
> 2. You will loose the track which headers are needed, which are not. We
> tend to keep it local, which means each compilation unit includes stuff
> it needs. This helps removing obsolete includes later.
>
> 3. Otherwise you could make one header, including all headers of Linux,
> and then include this one header in each of C files. One to rule them
> all.
... and I got one more:
4. Drivers sometimes get reused, extended or they parts got reused. If
a header includes more stuff, it simply will pollute all other units
trying to reuse it... making the re-usage difficult. This is less likely
reason, I mean, quite imaginary for this particular driver.
I don't expect pieces of this driver to be reused... but who knows. Many
times in the past in the kernel there was a huge work rewriting headers
in many files, because something was including something else and we
wanted to decouple these things. Therefore following the pattern -
include stuff you explicitly use - helps in every case.
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
2020-08-25 17:03 ` Łukasz Stelmach
(?)
@ 2020-08-25 20:49 ` kernel test robot
-1 siblings, 0 replies; 57+ messages in thread
From: kernel test robot @ 2020-08-25 20:49 UTC (permalink / raw)
To: Łukasz Stelmach, David S. Miller, Jakub Kicinski,
Krzysztof Kozlowski, Kukjin Kim, Rob Herring, Russell King,
linux-arm-kernel, linux-kernel, linux-samsung-soc
Cc: kbuild-all, netdev
[-- Attachment #1: Type: text/plain, Size: 14691 bytes --]
Hi "Łukasz,
I love your patch! Perhaps something to improve:
[auto build test WARNING on arm/for-next]
[also build test WARNING on net-next/master net/master linus/master sparc-next/master v5.9-rc2 next-20200825]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/ukasz-Stelmach/net-ax88796c-ASIX-AX88796C-SPI-Ethernet-Adapter-Driver/20200826-010937
base: git://git.armlinux.org.uk/~rmk/linux-arm.git for-next
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
In file included from arch/m68k/include/asm/io_mm.h:25,
from arch/m68k/include/asm/io.h:8,
from include/linux/scatterlist.h:9,
from include/linux/dma-mapping.h:11,
from include/linux/skbuff.h:31,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_main.c:9:
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsb':
arch/m68k/include/asm/raw_io.h:83:7: warning: variable '__w' set but not used [-Wunused-but-set-variable]
83 | ({u8 __w, __v = (b); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:430:3: note: in expansion of macro 'rom_out_8'
430 | rom_out_8(port, *buf++);
| ^~~~~~~~~
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsw':
arch/m68k/include/asm/raw_io.h:86:8: warning: variable '__w' set but not used [-Wunused-but-set-variable]
86 | ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:448:3: note: in expansion of macro 'rom_out_be16'
448 | rom_out_be16(port, *buf++);
| ^~~~~~~~~~~~
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsw_swapw':
arch/m68k/include/asm/raw_io.h:90:8: warning: variable '__w' set but not used [-Wunused-but-set-variable]
90 | ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:466:3: note: in expansion of macro 'rom_out_le16'
466 | rom_out_le16(port, *buf++);
| ^~~~~~~~~~~~
In file included from include/linux/kernel.h:11,
from include/linux/skbuff.h:13,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_main.c:9:
include/linux/scatterlist.h: In function 'sg_set_buf':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/linux/compiler.h:78:42: note: in definition of macro 'unlikely'
78 | # define unlikely(x) __builtin_expect(!!(x), 0)
| ^
include/linux/scatterlist.h:143:2: note: in expansion of macro 'BUG_ON'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~
include/linux/scatterlist.h:143:10: note: in expansion of macro 'virt_addr_valid'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~~~~~~~~~~
In file included from arch/m68k/include/asm/bug.h:32,
from include/linux/bug.h:5,
from include/linux/thread_info.h:12,
from include/asm-generic/preempt.h:5,
from ./arch/m68k/include/generated/asm/preempt.h:1,
from include/linux/preempt.h:78,
from include/linux/spinlock.h:51,
from include/linux/seqlock.h:36,
from include/linux/time.h:6,
from include/linux/skbuff.h:15,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_main.c:9:
include/linux/dma-mapping.h: In function 'dma_map_resource':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/asm-generic/bug.h:144:27: note: in definition of macro 'WARN_ON_ONCE'
144 | int __ret_warn_once = !!(condition); \
| ^~~~~~~~~
arch/m68k/include/asm/page_mm.h:170:25: note: in expansion of macro 'virt_addr_valid'
170 | #define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn))
| ^~~~~~~~~~~~~~~
include/linux/dma-mapping.h:352:19: note: in expansion of macro 'pfn_valid'
352 | if (WARN_ON_ONCE(pfn_valid(PHYS_PFN(phys_addr))))
| ^~~~~~~~~
drivers/net/ethernet/asix/ax88796c_main.c: In function 'ax88796c_rx_fixup':
drivers/net/ethernet/asix/ax88796c_main.c:604:8: warning: unused variable 'i' [-Wunused-variable]
604 | int i;
| ^
drivers/net/ethernet/asix/ax88796c_main.c: At top level:
>> drivers/net/ethernet/asix/ax88796c_main.c:887:6: warning: no previous prototype for 'ax88796c_phy_init' [-Wmissing-prototypes]
887 | void ax88796c_phy_init(struct ax88796c_device *ax_local)
| ^~~~~~~~~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_main.c:1242:1: warning: 'ax88796c_resume' defined but not used [-Wunused-function]
1242 | ax88796c_resume(struct spi_device *spi)
| ^~~~~~~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_main.c:1186:1: warning: 'ax88796c_suspend' defined but not used [-Wunused-function]
1186 | ax88796c_suspend(struct spi_device *spi, pm_message_t mesg)
| ^~~~~~~~~~~~~~~~
In file included from drivers/net/ethernet/asix/ax88796c_main.h:39,
from drivers/net/ethernet/asix/ax88796c_main.c:9:
drivers/net/ethernet/asix/ax88796c_spi.h:22:17: warning: 'rx_cmd_buf' defined but not used [-Wunused-const-variable=]
22 | static const u8 rx_cmd_buf[5] = {AX_SPICMD_READ_RXQ, 0xFF, 0xFF, 0xFF, 0xFF};
| ^~~~~~~~~~
--
In file included from arch/m68k/include/asm/io_mm.h:25,
from arch/m68k/include/asm/io.h:8,
from include/linux/scatterlist.h:9,
from include/linux/dma-mapping.h:11,
from include/linux/skbuff.h:31,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_ioctl.c:9:
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsb':
arch/m68k/include/asm/raw_io.h:83:7: warning: variable '__w' set but not used [-Wunused-but-set-variable]
83 | ({u8 __w, __v = (b); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:430:3: note: in expansion of macro 'rom_out_8'
430 | rom_out_8(port, *buf++);
| ^~~~~~~~~
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsw':
arch/m68k/include/asm/raw_io.h:86:8: warning: variable '__w' set but not used [-Wunused-but-set-variable]
86 | ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:448:3: note: in expansion of macro 'rom_out_be16'
448 | rom_out_be16(port, *buf++);
| ^~~~~~~~~~~~
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsw_swapw':
arch/m68k/include/asm/raw_io.h:90:8: warning: variable '__w' set but not used [-Wunused-but-set-variable]
90 | ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:466:3: note: in expansion of macro 'rom_out_le16'
466 | rom_out_le16(port, *buf++);
| ^~~~~~~~~~~~
In file included from include/linux/kernel.h:11,
from include/linux/skbuff.h:13,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_ioctl.c:9:
include/linux/scatterlist.h: In function 'sg_set_buf':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/linux/compiler.h:78:42: note: in definition of macro 'unlikely'
78 | # define unlikely(x) __builtin_expect(!!(x), 0)
| ^
include/linux/scatterlist.h:143:2: note: in expansion of macro 'BUG_ON'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~
include/linux/scatterlist.h:143:10: note: in expansion of macro 'virt_addr_valid'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~~~~~~~~~~
In file included from arch/m68k/include/asm/bug.h:32,
from include/linux/bug.h:5,
from include/linux/thread_info.h:12,
from include/asm-generic/preempt.h:5,
from ./arch/m68k/include/generated/asm/preempt.h:1,
from include/linux/preempt.h:78,
from include/linux/spinlock.h:51,
from include/linux/seqlock.h:36,
from include/linux/time.h:6,
from include/linux/skbuff.h:15,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_ioctl.c:9:
include/linux/dma-mapping.h: In function 'dma_map_resource':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/asm-generic/bug.h:144:27: note: in definition of macro 'WARN_ON_ONCE'
144 | int __ret_warn_once = !!(condition); \
| ^~~~~~~~~
arch/m68k/include/asm/page_mm.h:170:25: note: in expansion of macro 'virt_addr_valid'
170 | #define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn))
| ^~~~~~~~~~~~~~~
include/linux/dma-mapping.h:352:19: note: in expansion of macro 'pfn_valid'
352 | if (WARN_ON_ONCE(pfn_valid(PHYS_PFN(phys_addr))))
| ^~~~~~~~~
drivers/net/ethernet/asix/ax88796c_ioctl.c: At top level:
>> drivers/net/ethernet/asix/ax88796c_ioctl.c:272:19: warning: initialized field overwritten [-Woverride-init]
272 | .get_msglevel = ax88796c_ethtool_getmsglevel,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_ioctl.c:272:19: note: (near initialization for 'ax88796c_ethtool_ops.get_msglevel')
drivers/net/ethernet/asix/ax88796c_ioctl.c:273:19: warning: initialized field overwritten [-Woverride-init]
273 | .set_msglevel = ax88796c_ethtool_setmsglevel,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_ioctl.c:273:19: note: (near initialization for 'ax88796c_ethtool_ops.set_msglevel')
In file included from drivers/net/ethernet/asix/ax88796c_main.h:39,
from drivers/net/ethernet/asix/ax88796c_ioctl.c:9:
drivers/net/ethernet/asix/ax88796c_spi.h:23:17: warning: 'tx_cmd_buf' defined but not used [-Wunused-const-variable=]
23 | static const u8 tx_cmd_buf[4] = {AX_SPICMD_WRITE_TXQ, 0xFF, 0xFF, 0xFF};
| ^~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_spi.h:22:17: warning: 'rx_cmd_buf' defined but not used [-Wunused-const-variable=]
22 | static const u8 rx_cmd_buf[5] = {AX_SPICMD_READ_RXQ, 0xFF, 0xFF, 0xFF, 0xFF};
| ^~~~~~~~~~
# https://github.com/0day-ci/linux/commit/3309776d77d5d4854894d39683ef649eceda5e7d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review ukasz-Stelmach/net-ax88796c-ASIX-AX88796C-SPI-Ethernet-Adapter-Driver/20200826-010937
git checkout 3309776d77d5d4854894d39683ef649eceda5e7d
vim +/ax88796c_phy_init +887 drivers/net/ethernet/asix/ax88796c_main.c
886
> 887 void ax88796c_phy_init(struct ax88796c_device *ax_local)
888 {
889 u16 advertise = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
890
891 /* Setup LED mode */
892 AX_WRITE(&ax_local->ax_spi,
893 (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |
894 LCR_LED1_100MODE), P2_LCR0);
895 AX_WRITE(&ax_local->ax_spi,
896 (AX_READ(&ax_local->ax_spi, P2_LCR1) & LCR_LED2_MASK) |
897 LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);
898
899 /* Enable PHY auto-polling */
900 AX_WRITE(&ax_local->ax_spi,
901 POOLCR_PHYID(ax_local->mii.phy_id) | POOLCR_POLL_EN |
902 POOLCR_POLL_FLOWCTRL | POOLCR_POLL_BMCR, P2_POOLCR);
903
904 ax88796c_mdio_write(ax_local->ndev,
905 ax_local->mii.phy_id, MII_ADVERTISE, advertise);
906
907 ax88796c_mdio_write(ax_local->ndev, ax_local->mii.phy_id, MII_BMCR,
908 BMCR_SPEED100 | BMCR_ANENABLE | BMCR_ANRESTART);
909 }
910
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 57251 bytes --]
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-25 20:49 ` kernel test robot
0 siblings, 0 replies; 57+ messages in thread
From: kernel test robot @ 2020-08-25 20:49 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 14943 bytes --]
Hi "Łukasz,
I love your patch! Perhaps something to improve:
[auto build test WARNING on arm/for-next]
[also build test WARNING on net-next/master net/master linus/master sparc-next/master v5.9-rc2 next-20200825]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/ukasz-Stelmach/net-ax88796c-ASIX-AX88796C-SPI-Ethernet-Adapter-Driver/20200826-010937
base: git://git.armlinux.org.uk/~rmk/linux-arm.git for-next
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
In file included from arch/m68k/include/asm/io_mm.h:25,
from arch/m68k/include/asm/io.h:8,
from include/linux/scatterlist.h:9,
from include/linux/dma-mapping.h:11,
from include/linux/skbuff.h:31,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_main.c:9:
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsb':
arch/m68k/include/asm/raw_io.h:83:7: warning: variable '__w' set but not used [-Wunused-but-set-variable]
83 | ({u8 __w, __v = (b); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:430:3: note: in expansion of macro 'rom_out_8'
430 | rom_out_8(port, *buf++);
| ^~~~~~~~~
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsw':
arch/m68k/include/asm/raw_io.h:86:8: warning: variable '__w' set but not used [-Wunused-but-set-variable]
86 | ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:448:3: note: in expansion of macro 'rom_out_be16'
448 | rom_out_be16(port, *buf++);
| ^~~~~~~~~~~~
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsw_swapw':
arch/m68k/include/asm/raw_io.h:90:8: warning: variable '__w' set but not used [-Wunused-but-set-variable]
90 | ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:466:3: note: in expansion of macro 'rom_out_le16'
466 | rom_out_le16(port, *buf++);
| ^~~~~~~~~~~~
In file included from include/linux/kernel.h:11,
from include/linux/skbuff.h:13,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_main.c:9:
include/linux/scatterlist.h: In function 'sg_set_buf':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/linux/compiler.h:78:42: note: in definition of macro 'unlikely'
78 | # define unlikely(x) __builtin_expect(!!(x), 0)
| ^
include/linux/scatterlist.h:143:2: note: in expansion of macro 'BUG_ON'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~
include/linux/scatterlist.h:143:10: note: in expansion of macro 'virt_addr_valid'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~~~~~~~~~~
In file included from arch/m68k/include/asm/bug.h:32,
from include/linux/bug.h:5,
from include/linux/thread_info.h:12,
from include/asm-generic/preempt.h:5,
from ./arch/m68k/include/generated/asm/preempt.h:1,
from include/linux/preempt.h:78,
from include/linux/spinlock.h:51,
from include/linux/seqlock.h:36,
from include/linux/time.h:6,
from include/linux/skbuff.h:15,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_main.c:9:
include/linux/dma-mapping.h: In function 'dma_map_resource':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/asm-generic/bug.h:144:27: note: in definition of macro 'WARN_ON_ONCE'
144 | int __ret_warn_once = !!(condition); \
| ^~~~~~~~~
arch/m68k/include/asm/page_mm.h:170:25: note: in expansion of macro 'virt_addr_valid'
170 | #define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn))
| ^~~~~~~~~~~~~~~
include/linux/dma-mapping.h:352:19: note: in expansion of macro 'pfn_valid'
352 | if (WARN_ON_ONCE(pfn_valid(PHYS_PFN(phys_addr))))
| ^~~~~~~~~
drivers/net/ethernet/asix/ax88796c_main.c: In function 'ax88796c_rx_fixup':
drivers/net/ethernet/asix/ax88796c_main.c:604:8: warning: unused variable 'i' [-Wunused-variable]
604 | int i;
| ^
drivers/net/ethernet/asix/ax88796c_main.c: At top level:
>> drivers/net/ethernet/asix/ax88796c_main.c:887:6: warning: no previous prototype for 'ax88796c_phy_init' [-Wmissing-prototypes]
887 | void ax88796c_phy_init(struct ax88796c_device *ax_local)
| ^~~~~~~~~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_main.c:1242:1: warning: 'ax88796c_resume' defined but not used [-Wunused-function]
1242 | ax88796c_resume(struct spi_device *spi)
| ^~~~~~~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_main.c:1186:1: warning: 'ax88796c_suspend' defined but not used [-Wunused-function]
1186 | ax88796c_suspend(struct spi_device *spi, pm_message_t mesg)
| ^~~~~~~~~~~~~~~~
In file included from drivers/net/ethernet/asix/ax88796c_main.h:39,
from drivers/net/ethernet/asix/ax88796c_main.c:9:
drivers/net/ethernet/asix/ax88796c_spi.h:22:17: warning: 'rx_cmd_buf' defined but not used [-Wunused-const-variable=]
22 | static const u8 rx_cmd_buf[5] = {AX_SPICMD_READ_RXQ, 0xFF, 0xFF, 0xFF, 0xFF};
| ^~~~~~~~~~
--
In file included from arch/m68k/include/asm/io_mm.h:25,
from arch/m68k/include/asm/io.h:8,
from include/linux/scatterlist.h:9,
from include/linux/dma-mapping.h:11,
from include/linux/skbuff.h:31,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_ioctl.c:9:
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsb':
arch/m68k/include/asm/raw_io.h:83:7: warning: variable '__w' set but not used [-Wunused-but-set-variable]
83 | ({u8 __w, __v = (b); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:430:3: note: in expansion of macro 'rom_out_8'
430 | rom_out_8(port, *buf++);
| ^~~~~~~~~
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsw':
arch/m68k/include/asm/raw_io.h:86:8: warning: variable '__w' set but not used [-Wunused-but-set-variable]
86 | ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:448:3: note: in expansion of macro 'rom_out_be16'
448 | rom_out_be16(port, *buf++);
| ^~~~~~~~~~~~
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsw_swapw':
arch/m68k/include/asm/raw_io.h:90:8: warning: variable '__w' set but not used [-Wunused-but-set-variable]
90 | ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:466:3: note: in expansion of macro 'rom_out_le16'
466 | rom_out_le16(port, *buf++);
| ^~~~~~~~~~~~
In file included from include/linux/kernel.h:11,
from include/linux/skbuff.h:13,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_ioctl.c:9:
include/linux/scatterlist.h: In function 'sg_set_buf':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/linux/compiler.h:78:42: note: in definition of macro 'unlikely'
78 | # define unlikely(x) __builtin_expect(!!(x), 0)
| ^
include/linux/scatterlist.h:143:2: note: in expansion of macro 'BUG_ON'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~
include/linux/scatterlist.h:143:10: note: in expansion of macro 'virt_addr_valid'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~~~~~~~~~~
In file included from arch/m68k/include/asm/bug.h:32,
from include/linux/bug.h:5,
from include/linux/thread_info.h:12,
from include/asm-generic/preempt.h:5,
from ./arch/m68k/include/generated/asm/preempt.h:1,
from include/linux/preempt.h:78,
from include/linux/spinlock.h:51,
from include/linux/seqlock.h:36,
from include/linux/time.h:6,
from include/linux/skbuff.h:15,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_ioctl.c:9:
include/linux/dma-mapping.h: In function 'dma_map_resource':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/asm-generic/bug.h:144:27: note: in definition of macro 'WARN_ON_ONCE'
144 | int __ret_warn_once = !!(condition); \
| ^~~~~~~~~
arch/m68k/include/asm/page_mm.h:170:25: note: in expansion of macro 'virt_addr_valid'
170 | #define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn))
| ^~~~~~~~~~~~~~~
include/linux/dma-mapping.h:352:19: note: in expansion of macro 'pfn_valid'
352 | if (WARN_ON_ONCE(pfn_valid(PHYS_PFN(phys_addr))))
| ^~~~~~~~~
drivers/net/ethernet/asix/ax88796c_ioctl.c: At top level:
>> drivers/net/ethernet/asix/ax88796c_ioctl.c:272:19: warning: initialized field overwritten [-Woverride-init]
272 | .get_msglevel = ax88796c_ethtool_getmsglevel,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_ioctl.c:272:19: note: (near initialization for 'ax88796c_ethtool_ops.get_msglevel')
drivers/net/ethernet/asix/ax88796c_ioctl.c:273:19: warning: initialized field overwritten [-Woverride-init]
273 | .set_msglevel = ax88796c_ethtool_setmsglevel,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_ioctl.c:273:19: note: (near initialization for 'ax88796c_ethtool_ops.set_msglevel')
In file included from drivers/net/ethernet/asix/ax88796c_main.h:39,
from drivers/net/ethernet/asix/ax88796c_ioctl.c:9:
drivers/net/ethernet/asix/ax88796c_spi.h:23:17: warning: 'tx_cmd_buf' defined but not used [-Wunused-const-variable=]
23 | static const u8 tx_cmd_buf[4] = {AX_SPICMD_WRITE_TXQ, 0xFF, 0xFF, 0xFF};
| ^~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_spi.h:22:17: warning: 'rx_cmd_buf' defined but not used [-Wunused-const-variable=]
22 | static const u8 rx_cmd_buf[5] = {AX_SPICMD_READ_RXQ, 0xFF, 0xFF, 0xFF, 0xFF};
| ^~~~~~~~~~
# https://github.com/0day-ci/linux/commit/3309776d77d5d4854894d39683ef649eceda5e7d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review ukasz-Stelmach/net-ax88796c-ASIX-AX88796C-SPI-Ethernet-Adapter-Driver/20200826-010937
git checkout 3309776d77d5d4854894d39683ef649eceda5e7d
vim +/ax88796c_phy_init +887 drivers/net/ethernet/asix/ax88796c_main.c
886
> 887 void ax88796c_phy_init(struct ax88796c_device *ax_local)
888 {
889 u16 advertise = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
890
891 /* Setup LED mode */
892 AX_WRITE(&ax_local->ax_spi,
893 (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |
894 LCR_LED1_100MODE), P2_LCR0);
895 AX_WRITE(&ax_local->ax_spi,
896 (AX_READ(&ax_local->ax_spi, P2_LCR1) & LCR_LED2_MASK) |
897 LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);
898
899 /* Enable PHY auto-polling */
900 AX_WRITE(&ax_local->ax_spi,
901 POOLCR_PHYID(ax_local->mii.phy_id) | POOLCR_POLL_EN |
902 POOLCR_POLL_FLOWCTRL | POOLCR_POLL_BMCR, P2_POOLCR);
903
904 ax88796c_mdio_write(ax_local->ndev,
905 ax_local->mii.phy_id, MII_ADVERTISE, advertise);
906
907 ax88796c_mdio_write(ax_local->ndev, ax_local->mii.phy_id, MII_BMCR,
908 BMCR_SPEED100 | BMCR_ANENABLE | BMCR_ANRESTART);
909 }
910
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 57251 bytes --]
^ permalink raw reply [flat|nested] 57+ messages in thread* Re: [PATCH 1/3] net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver
@ 2020-08-25 20:49 ` kernel test robot
0 siblings, 0 replies; 57+ messages in thread
From: kernel test robot @ 2020-08-25 20:49 UTC (permalink / raw)
To: Łukasz Stelmach, David S. Miller, Jakub Kicinski,
Krzysztof Kozlowski, Kukjin Kim, Rob Herring, Russell King,
linux-arm-kernel, linux-kernel, linux-samsung-soc
Cc: netdev, kbuild-all
[-- Attachment #1: Type: text/plain, Size: 14691 bytes --]
Hi "Łukasz,
I love your patch! Perhaps something to improve:
[auto build test WARNING on arm/for-next]
[also build test WARNING on net-next/master net/master linus/master sparc-next/master v5.9-rc2 next-20200825]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/ukasz-Stelmach/net-ax88796c-ASIX-AX88796C-SPI-Ethernet-Adapter-Driver/20200826-010937
base: git://git.armlinux.org.uk/~rmk/linux-arm.git for-next
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
In file included from arch/m68k/include/asm/io_mm.h:25,
from arch/m68k/include/asm/io.h:8,
from include/linux/scatterlist.h:9,
from include/linux/dma-mapping.h:11,
from include/linux/skbuff.h:31,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_main.c:9:
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsb':
arch/m68k/include/asm/raw_io.h:83:7: warning: variable '__w' set but not used [-Wunused-but-set-variable]
83 | ({u8 __w, __v = (b); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:430:3: note: in expansion of macro 'rom_out_8'
430 | rom_out_8(port, *buf++);
| ^~~~~~~~~
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsw':
arch/m68k/include/asm/raw_io.h:86:8: warning: variable '__w' set but not used [-Wunused-but-set-variable]
86 | ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:448:3: note: in expansion of macro 'rom_out_be16'
448 | rom_out_be16(port, *buf++);
| ^~~~~~~~~~~~
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsw_swapw':
arch/m68k/include/asm/raw_io.h:90:8: warning: variable '__w' set but not used [-Wunused-but-set-variable]
90 | ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:466:3: note: in expansion of macro 'rom_out_le16'
466 | rom_out_le16(port, *buf++);
| ^~~~~~~~~~~~
In file included from include/linux/kernel.h:11,
from include/linux/skbuff.h:13,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_main.c:9:
include/linux/scatterlist.h: In function 'sg_set_buf':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/linux/compiler.h:78:42: note: in definition of macro 'unlikely'
78 | # define unlikely(x) __builtin_expect(!!(x), 0)
| ^
include/linux/scatterlist.h:143:2: note: in expansion of macro 'BUG_ON'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~
include/linux/scatterlist.h:143:10: note: in expansion of macro 'virt_addr_valid'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~~~~~~~~~~
In file included from arch/m68k/include/asm/bug.h:32,
from include/linux/bug.h:5,
from include/linux/thread_info.h:12,
from include/asm-generic/preempt.h:5,
from ./arch/m68k/include/generated/asm/preempt.h:1,
from include/linux/preempt.h:78,
from include/linux/spinlock.h:51,
from include/linux/seqlock.h:36,
from include/linux/time.h:6,
from include/linux/skbuff.h:15,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_main.c:9:
include/linux/dma-mapping.h: In function 'dma_map_resource':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/asm-generic/bug.h:144:27: note: in definition of macro 'WARN_ON_ONCE'
144 | int __ret_warn_once = !!(condition); \
| ^~~~~~~~~
arch/m68k/include/asm/page_mm.h:170:25: note: in expansion of macro 'virt_addr_valid'
170 | #define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn))
| ^~~~~~~~~~~~~~~
include/linux/dma-mapping.h:352:19: note: in expansion of macro 'pfn_valid'
352 | if (WARN_ON_ONCE(pfn_valid(PHYS_PFN(phys_addr))))
| ^~~~~~~~~
drivers/net/ethernet/asix/ax88796c_main.c: In function 'ax88796c_rx_fixup':
drivers/net/ethernet/asix/ax88796c_main.c:604:8: warning: unused variable 'i' [-Wunused-variable]
604 | int i;
| ^
drivers/net/ethernet/asix/ax88796c_main.c: At top level:
>> drivers/net/ethernet/asix/ax88796c_main.c:887:6: warning: no previous prototype for 'ax88796c_phy_init' [-Wmissing-prototypes]
887 | void ax88796c_phy_init(struct ax88796c_device *ax_local)
| ^~~~~~~~~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_main.c:1242:1: warning: 'ax88796c_resume' defined but not used [-Wunused-function]
1242 | ax88796c_resume(struct spi_device *spi)
| ^~~~~~~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_main.c:1186:1: warning: 'ax88796c_suspend' defined but not used [-Wunused-function]
1186 | ax88796c_suspend(struct spi_device *spi, pm_message_t mesg)
| ^~~~~~~~~~~~~~~~
In file included from drivers/net/ethernet/asix/ax88796c_main.h:39,
from drivers/net/ethernet/asix/ax88796c_main.c:9:
drivers/net/ethernet/asix/ax88796c_spi.h:22:17: warning: 'rx_cmd_buf' defined but not used [-Wunused-const-variable=]
22 | static const u8 rx_cmd_buf[5] = {AX_SPICMD_READ_RXQ, 0xFF, 0xFF, 0xFF, 0xFF};
| ^~~~~~~~~~
--
In file included from arch/m68k/include/asm/io_mm.h:25,
from arch/m68k/include/asm/io.h:8,
from include/linux/scatterlist.h:9,
from include/linux/dma-mapping.h:11,
from include/linux/skbuff.h:31,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_ioctl.c:9:
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsb':
arch/m68k/include/asm/raw_io.h:83:7: warning: variable '__w' set but not used [-Wunused-but-set-variable]
83 | ({u8 __w, __v = (b); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:430:3: note: in expansion of macro 'rom_out_8'
430 | rom_out_8(port, *buf++);
| ^~~~~~~~~
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsw':
arch/m68k/include/asm/raw_io.h:86:8: warning: variable '__w' set but not used [-Wunused-but-set-variable]
86 | ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:448:3: note: in expansion of macro 'rom_out_be16'
448 | rom_out_be16(port, *buf++);
| ^~~~~~~~~~~~
arch/m68k/include/asm/raw_io.h: In function 'raw_rom_outsw_swapw':
arch/m68k/include/asm/raw_io.h:90:8: warning: variable '__w' set but not used [-Wunused-but-set-variable]
90 | ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
| ^~~
arch/m68k/include/asm/raw_io.h:466:3: note: in expansion of macro 'rom_out_le16'
466 | rom_out_le16(port, *buf++);
| ^~~~~~~~~~~~
In file included from include/linux/kernel.h:11,
from include/linux/skbuff.h:13,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_ioctl.c:9:
include/linux/scatterlist.h: In function 'sg_set_buf':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/linux/compiler.h:78:42: note: in definition of macro 'unlikely'
78 | # define unlikely(x) __builtin_expect(!!(x), 0)
| ^
include/linux/scatterlist.h:143:2: note: in expansion of macro 'BUG_ON'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~
include/linux/scatterlist.h:143:10: note: in expansion of macro 'virt_addr_valid'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~~~~~~~~~~
In file included from arch/m68k/include/asm/bug.h:32,
from include/linux/bug.h:5,
from include/linux/thread_info.h:12,
from include/asm-generic/preempt.h:5,
from ./arch/m68k/include/generated/asm/preempt.h:1,
from include/linux/preempt.h:78,
from include/linux/spinlock.h:51,
from include/linux/seqlock.h:36,
from include/linux/time.h:6,
from include/linux/skbuff.h:15,
from include/linux/if_ether.h:19,
from include/linux/etherdevice.h:20,
from drivers/net/ethernet/asix/ax88796c_main.h:19,
from drivers/net/ethernet/asix/ax88796c_ioctl.c:9:
include/linux/dma-mapping.h: In function 'dma_map_resource':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/asm-generic/bug.h:144:27: note: in definition of macro 'WARN_ON_ONCE'
144 | int __ret_warn_once = !!(condition); \
| ^~~~~~~~~
arch/m68k/include/asm/page_mm.h:170:25: note: in expansion of macro 'virt_addr_valid'
170 | #define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn))
| ^~~~~~~~~~~~~~~
include/linux/dma-mapping.h:352:19: note: in expansion of macro 'pfn_valid'
352 | if (WARN_ON_ONCE(pfn_valid(PHYS_PFN(phys_addr))))
| ^~~~~~~~~
drivers/net/ethernet/asix/ax88796c_ioctl.c: At top level:
>> drivers/net/ethernet/asix/ax88796c_ioctl.c:272:19: warning: initialized field overwritten [-Woverride-init]
272 | .get_msglevel = ax88796c_ethtool_getmsglevel,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_ioctl.c:272:19: note: (near initialization for 'ax88796c_ethtool_ops.get_msglevel')
drivers/net/ethernet/asix/ax88796c_ioctl.c:273:19: warning: initialized field overwritten [-Woverride-init]
273 | .set_msglevel = ax88796c_ethtool_setmsglevel,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_ioctl.c:273:19: note: (near initialization for 'ax88796c_ethtool_ops.set_msglevel')
In file included from drivers/net/ethernet/asix/ax88796c_main.h:39,
from drivers/net/ethernet/asix/ax88796c_ioctl.c:9:
drivers/net/ethernet/asix/ax88796c_spi.h:23:17: warning: 'tx_cmd_buf' defined but not used [-Wunused-const-variable=]
23 | static const u8 tx_cmd_buf[4] = {AX_SPICMD_WRITE_TXQ, 0xFF, 0xFF, 0xFF};
| ^~~~~~~~~~
drivers/net/ethernet/asix/ax88796c_spi.h:22:17: warning: 'rx_cmd_buf' defined but not used [-Wunused-const-variable=]
22 | static const u8 rx_cmd_buf[5] = {AX_SPICMD_READ_RXQ, 0xFF, 0xFF, 0xFF, 0xFF};
| ^~~~~~~~~~
# https://github.com/0day-ci/linux/commit/3309776d77d5d4854894d39683ef649eceda5e7d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review ukasz-Stelmach/net-ax88796c-ASIX-AX88796C-SPI-Ethernet-Adapter-Driver/20200826-010937
git checkout 3309776d77d5d4854894d39683ef649eceda5e7d
vim +/ax88796c_phy_init +887 drivers/net/ethernet/asix/ax88796c_main.c
886
> 887 void ax88796c_phy_init(struct ax88796c_device *ax_local)
888 {
889 u16 advertise = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
890
891 /* Setup LED mode */
892 AX_WRITE(&ax_local->ax_spi,
893 (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |
894 LCR_LED1_100MODE), P2_LCR0);
895 AX_WRITE(&ax_local->ax_spi,
896 (AX_READ(&ax_local->ax_spi, P2_LCR1) & LCR_LED2_MASK) |
897 LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);
898
899 /* Enable PHY auto-polling */
900 AX_WRITE(&ax_local->ax_spi,
901 POOLCR_PHYID(ax_local->mii.phy_id) | POOLCR_POLL_EN |
902 POOLCR_POLL_FLOWCTRL | POOLCR_POLL_BMCR, P2_POOLCR);
903
904 ax88796c_mdio_write(ax_local->ndev,
905 ax_local->mii.phy_id, MII_ADVERTISE, advertise);
906
907 ax88796c_mdio_write(ax_local->ndev, ax_local->mii.phy_id, MII_BMCR,
908 BMCR_SPEED100 | BMCR_ANENABLE | BMCR_ANRESTART);
909 }
910
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 57251 bytes --]
[-- Attachment #3: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 57+ messages in thread