net: dsa: mv88e6xxx: add accessors for PTP/TAI registers

This patch implements support for accessing the Precision Time Protocol
and Time Application Interface registers via the AVB register interface
in the Global 2 register.

The register interface differs slightly between different models; older
models use a 3-bit operations field, while newer models use a 2-bit
field. The operations values and the special "global port" values are
different between the two. This is a similar split to the differences
in the "Ingress Rate" register between models, so, like in that case,
we call the two variants "6352" and "6390" and create an ops structure
to abstract between the two.

checkpatch fixups by Andrew Lunn

Signed-off-by: Brandon Streiff <brandon.streiff@ni.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx/Makefile b/drivers/net/dsa/mv88e6xxx/Makefile
index 58a4a00..bdbbbf7 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/Makefile
+++ b/drivers/net/dsa/mv88e6xxx/Makefile
@@ -5,6 +5,7 @@ mv88e6xxx-objs += global1.o
 mv88e6xxx-objs += global1_atu.o
 mv88e6xxx-objs += global1_vtu.o
 mv88e6xxx-$(CONFIG_NET_DSA_MV88E6XXX_GLOBAL2) += global2.o
+mv88e6xxx-$(CONFIG_NET_DSA_MV88E6XXX_GLOBAL2) += global2_avb.o
 mv88e6xxx-objs += phy.o
 mv88e6xxx-objs += port.o
 mv88e6xxx-objs += serdes.o

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index eb328ba..413d50e 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2843,6 +2843,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops = {
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
        .serdes_power = mv88e6352_serdes_power,
+       .avb_ops = &mv88e6352_avb_ops,
 };
 
 static const struct mv88e6xxx_ops mv88e6290_ops = {
@@ -2879,6 +2880,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {
        .vtu_getnext = mv88e6390_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
+       .avb_ops = &mv88e6390_avb_ops,
 };
 
 static const struct mv88e6xxx_ops mv88e6320_ops = {
@@ -2913,6 +2915,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = {
        .reset = mv88e6352_g1_reset,
        .vtu_getnext = mv88e6185_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
+       .avb_ops = &mv88e6352_avb_ops,
 };
 
 static const struct mv88e6xxx_ops mv88e6321_ops = {
@@ -2945,6 +2948,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = {
        .reset = mv88e6352_g1_reset,
        .vtu_getnext = mv88e6185_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
+       .avb_ops = &mv88e6352_avb_ops,
 };
 
 static const struct mv88e6xxx_ops mv88e6341_ops = {
@@ -2981,6 +2985,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
        .reset = mv88e6352_g1_reset,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .avb_ops = &mv88e6390_avb_ops,
 };
 
 static const struct mv88e6xxx_ops mv88e6350_ops = {
@@ -3049,6 +3054,7 @@ static const struct mv88e6xxx_ops mv88e6351_ops = {
        .reset = mv88e6352_g1_reset,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .avb_ops = &mv88e6352_avb_ops,
 };
 
 static const struct mv88e6xxx_ops mv88e6352_ops = {
@@ -3086,6 +3092,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops = {
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
        .serdes_power = mv88e6352_serdes_power,
+       .avb_ops = &mv88e6352_avb_ops,
 };
 
 static const struct mv88e6xxx_ops mv88e6390_ops = {
@@ -3124,6 +3131,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = {
        .vtu_getnext = mv88e6390_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
+       .avb_ops = &mv88e6390_avb_ops,
 };
 
 static const struct mv88e6xxx_ops mv88e6390x_ops = {
@@ -3162,6 +3170,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {
        .vtu_getnext = mv88e6390_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
+       .avb_ops = &mv88e6390_avb_ops,
 };
 
 static const struct mv88e6xxx_info mv88e6xxx_table[] = {

diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h
index 3dba6e9..5467c86 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.h
+++ b/drivers/net/dsa/mv88e6xxx/chip.h
@@ -146,6 +146,7 @@ struct mv88e6xxx_vtu_entry {
 
 struct mv88e6xxx_bus_ops;
 struct mv88e6xxx_irq_ops;
+struct mv88e6xxx_avb_ops;
 
 struct mv88e6xxx_irq {
        u16 masked;
@@ -344,6 +345,9 @@ struct mv88e6xxx_ops {
                           struct mv88e6xxx_vtu_entry *entry);
        int (*vtu_loadpurge)(struct mv88e6xxx_chip *chip,
                             struct mv88e6xxx_vtu_entry *entry);
+
+       /* Interface to the AVB/PTP registers */
+       const struct mv88e6xxx_avb_ops *avb_ops;
 };
 
 struct mv88e6xxx_irq_ops {
@@ -355,6 +359,24 @@ struct mv88e6xxx_irq_ops {
        void (*irq_free)(struct mv88e6xxx_chip *chip);
 };
 
+struct mv88e6xxx_avb_ops {
+       /* Access port-scoped Precision Time Protocol registers */
+       int (*port_ptp_read)(struct mv88e6xxx_chip *chip, int port, int addr,
+                            u16 *data, int len);
+       int (*port_ptp_write)(struct mv88e6xxx_chip *chip, int port, int addr,
+                             u16 data);
+
+       /* Access global Precision Time Protocol registers */
+       int (*ptp_read)(struct mv88e6xxx_chip *chip, int addr, u16 *data,
+                       int len);
+       int (*ptp_write)(struct mv88e6xxx_chip *chip, int addr, u16 data);
+
+       /* Access global Time Application Interface registers */
+       int (*tai_read)(struct mv88e6xxx_chip *chip, int addr, u16 *data,
+                       int len);
+       int (*tai_write)(struct mv88e6xxx_chip *chip, int addr, u16 data);
+};
+
 #define STATS_TYPE_PORT                BIT(0)
 #define STATS_TYPE_BANK0       BIT(1)
 #define STATS_TYPE_BANK1       BIT(2)

diff --git a/drivers/net/dsa/mv88e6xxx/global2.h b/drivers/net/dsa/mv88e6xxx/global2.h
index bfa2522..e1d4850 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/global2.h
+++ b/drivers/net/dsa/mv88e6xxx/global2.h
@@ -149,7 +149,26 @@
 #define MV88E6390_G2_EEPROM_ADDR_MASK  0xffff
 
 /* Offset 0x16: AVB Command Register */
-#define MV88E6352_G2_AVB_CMD           0x16
+#define MV88E6352_G2_AVB_CMD                   0x16
+#define MV88E6352_G2_AVB_CMD_BUSY              0x8000
+#define MV88E6352_G2_AVB_CMD_OP_READ           0x4000
+#define MV88E6352_G2_AVB_CMD_OP_READ_INCR      0x6000
+#define MV88E6352_G2_AVB_CMD_OP_WRITE          0x3000
+#define MV88E6390_G2_AVB_CMD_OP_READ           0x0000
+#define MV88E6390_G2_AVB_CMD_OP_READ_INCR      0x4000
+#define MV88E6390_G2_AVB_CMD_OP_WRITE          0x6000
+#define MV88E6352_G2_AVB_CMD_PORT_MASK         0x0f00
+#define MV88E6352_G2_AVB_CMD_PORT_TAIGLOBAL    0xe
+#define MV88E6352_G2_AVB_CMD_PORT_PTPGLOBAL    0xf
+#define MV88E6390_G2_AVB_CMD_PORT_MASK         0x1f00
+#define MV88E6390_G2_AVB_CMD_PORT_TAIGLOBAL    0x1e
+#define MV88E6390_G2_AVB_CMD_PORT_PTPGLOBAL    0x1f
+#define MV88E6352_G2_AVB_CMD_BLOCK_PTP         0
+#define MV88E6352_G2_AVB_CMD_BLOCK_AVB         1
+#define MV88E6352_G2_AVB_CMD_BLOCK_QAV         2
+#define MV88E6352_G2_AVB_CMD_BLOCK_QVB         3
+#define MV88E6352_G2_AVB_CMD_BLOCK_MASK                0x00e0
+#define MV88E6352_G2_AVB_CMD_ADDR_MASK         0x001f
 
 /* Offset 0x17: AVB Data Register */
 #define MV88E6352_G2_AVB_DATA          0x17
@@ -272,6 +291,9 @@ int mv88e6xxx_g2_pot_clear(struct mv88e6xxx_chip *chip);
 extern const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops;
 extern const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops;
 
+extern const struct mv88e6xxx_avb_ops mv88e6352_avb_ops;
+extern const struct mv88e6xxx_avb_ops mv88e6390_avb_ops;
+
 #else /* !CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */
 
 static inline int mv88e6xxx_g2_require(struct mv88e6xxx_chip *chip)
@@ -407,6 +429,9 @@ static inline int mv88e6xxx_g2_pot_clear(struct mv88e6xxx_chip *chip)
 static const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops = {};
 static const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops = {};
 
+static const struct mv88e6xxx_avb_ops mv88e6352_avb_ops = {};
+static const struct mv88e6xxx_avb_ops mv88e6390_avb_ops = {};
+
 #endif /* CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */
 
 #endif /* _MV88E6XXX_GLOBAL2_H */

diff --git a/drivers/net/dsa/mv88e6xxx/global2_avb.c b/drivers/net/dsa/mv88e6xxx/global2_avb.c
new file mode 100644 (file)
index 0000000..2e398cc
--- /dev/null
+++ b/drivers/net/dsa/mv88e6xxx/global2_avb.c
@@ -0,0 +1,193 @@
+/*
+ * Marvell 88E6xxx Switch Global 2 Registers support
+ *
+ * Copyright (c) 2008 Marvell Semiconductor
+ *
+ * Copyright (c) 2016-2017 Savoir-faire Linux Inc.
+ *     Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+ *
+ * Copyright (c) 2017 National Instruments
+ *     Brandon Streiff <brandon.streiff@ni.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include "global2.h"
+
+/* Offset 0x16: AVB Command Register
+ * Offset 0x17: AVB Data Register
+ *
+ * There are two different versions of this register interface:
+ *    "6352": 3-bit "op" field, 4-bit "port" field.
+ *    "6390": 2-bit "op" field, 5-bit "port" field.
+ *
+ * The "op" codes are different between the two, as well as the special
+ * port fields for global PTP and TAI configuration.
+ */
+
+/* mv88e6xxx_g2_avb_read -- Read one or multiple 16-bit words.
+ * The hardware supports snapshotting up to four contiguous registers.
+ */
+static int mv88e6xxx_g2_avb_read(struct mv88e6xxx_chip *chip, u16 readop,
+                                u16 *data, int len)
+{
+       int err;
+       int i;
+
+       /* Hardware can only snapshot four words. */
+       if (len > 4)
+               return -E2BIG;
+
+       err = mv88e6xxx_g2_update(chip, MV88E6352_G2_AVB_CMD, readop);
+       if (err)
+               return err;
+
+       for (i = 0; i < len; ++i) {
+               err = mv88e6xxx_g2_read(chip, MV88E6352_G2_AVB_DATA,
+                                       &data[i]);
+               if (err)
+                       return err;
+       }
+
+       return 0;
+}
+
+/* mv88e6xxx_g2_avb_write -- Write one 16-bit word. */
+static int mv88e6xxx_g2_avb_write(struct mv88e6xxx_chip *chip, u16 writeop,
+                                 u16 data)
+{
+       int err;
+
+       err = mv88e6xxx_g2_write(chip, MV88E6352_G2_AVB_DATA, data);
+       if (err)
+               return err;
+
+       return mv88e6xxx_g2_update(chip, MV88E6352_G2_AVB_CMD, writeop);
+}
+
+static int mv88e6352_g2_avb_port_ptp_read(struct mv88e6xxx_chip *chip,
+                                         int port, int addr, u16 *data,
+                                         int len)
+{
+       u16 readop = (len == 1 ? MV88E6352_G2_AVB_CMD_OP_READ :
+                                MV88E6352_G2_AVB_CMD_OP_READ_INCR) |
+                    (port << 8) | (MV88E6352_G2_AVB_CMD_BLOCK_PTP << 5) |
+                    addr;
+
+       return mv88e6xxx_g2_avb_read(chip, readop, data, len);
+}
+
+static int mv88e6352_g2_avb_port_ptp_write(struct mv88e6xxx_chip *chip,
+                                          int port, int addr, u16 data)
+{
+       u16 writeop = MV88E6352_G2_AVB_CMD_OP_WRITE | (port << 8) |
+                     (MV88E6352_G2_AVB_CMD_BLOCK_PTP << 5) | addr;
+
+       return mv88e6xxx_g2_avb_write(chip, writeop, data);
+}
+
+static int mv88e6352_g2_avb_ptp_read(struct mv88e6xxx_chip *chip, int addr,
+                                    u16 *data, int len)
+{
+       return mv88e6352_g2_avb_port_ptp_read(chip,
+                                       MV88E6352_G2_AVB_CMD_PORT_PTPGLOBAL,
+                                       addr, data, len);
+}
+
+static int mv88e6352_g2_avb_ptp_write(struct mv88e6xxx_chip *chip, int addr,
+                                     u16 data)
+{
+       return mv88e6352_g2_avb_port_ptp_write(chip,
+                                       MV88E6352_G2_AVB_CMD_PORT_PTPGLOBAL,
+                                       addr, data);
+}
+
+static int mv88e6352_g2_avb_tai_read(struct mv88e6xxx_chip *chip, int addr,
+                                    u16 *data, int len)
+{
+       return mv88e6352_g2_avb_port_ptp_read(chip,
+                                       MV88E6352_G2_AVB_CMD_PORT_TAIGLOBAL,
+                                       addr, data, len);
+}
+
+static int mv88e6352_g2_avb_tai_write(struct mv88e6xxx_chip *chip, int addr,
+                                     u16 data)
+{
+       return mv88e6352_g2_avb_port_ptp_write(chip,
+                                       MV88E6352_G2_AVB_CMD_PORT_TAIGLOBAL,
+                                       addr, data);
+}
+
+const struct mv88e6xxx_avb_ops mv88e6352_avb_ops = {
+       .port_ptp_read          = mv88e6352_g2_avb_port_ptp_read,
+       .port_ptp_write         = mv88e6352_g2_avb_port_ptp_write,
+       .ptp_read               = mv88e6352_g2_avb_ptp_read,
+       .ptp_write              = mv88e6352_g2_avb_ptp_write,
+       .tai_read               = mv88e6352_g2_avb_tai_read,
+       .tai_write              = mv88e6352_g2_avb_tai_write,
+};
+
+static int mv88e6390_g2_avb_port_ptp_read(struct mv88e6xxx_chip *chip,
+                                         int port, int addr, u16 *data,
+                                         int len)
+{
+       u16 readop = (len == 1 ? MV88E6390_G2_AVB_CMD_OP_READ :
+                                MV88E6390_G2_AVB_CMD_OP_READ_INCR) |
+                    (port << 8) | (MV88E6352_G2_AVB_CMD_BLOCK_PTP << 5) |
+                    addr;
+
+       return mv88e6xxx_g2_avb_read(chip, readop, data, len);
+}
+
+static int mv88e6390_g2_avb_port_ptp_write(struct mv88e6xxx_chip *chip,
+                                          int port, int addr, u16 data)
+{
+       u16 writeop = MV88E6390_G2_AVB_CMD_OP_WRITE | (port << 8) |
+                     (MV88E6352_G2_AVB_CMD_BLOCK_PTP << 5) | addr;
+
+       return mv88e6xxx_g2_avb_write(chip, writeop, data);
+}
+
+static int mv88e6390_g2_avb_ptp_read(struct mv88e6xxx_chip *chip, int addr,
+                                    u16 *data, int len)
+{
+       return mv88e6390_g2_avb_port_ptp_read(chip,
+                                       MV88E6390_G2_AVB_CMD_PORT_PTPGLOBAL,
+                                       addr, data, len);
+}
+
+static int mv88e6390_g2_avb_ptp_write(struct mv88e6xxx_chip *chip, int addr,
+                                     u16 data)
+{
+       return mv88e6390_g2_avb_port_ptp_write(chip,
+                                       MV88E6390_G2_AVB_CMD_PORT_PTPGLOBAL,
+                                       addr, data);
+}
+
+static int mv88e6390_g2_avb_tai_read(struct mv88e6xxx_chip *chip, int addr,
+                                    u16 *data, int len)
+{
+       return mv88e6390_g2_avb_port_ptp_read(chip,
+                                       MV88E6390_G2_AVB_CMD_PORT_TAIGLOBAL,
+                                       addr, data, len);
+}
+
+static int mv88e6390_g2_avb_tai_write(struct mv88e6xxx_chip *chip, int addr,
+                                     u16 data)
+{
+       return mv88e6390_g2_avb_port_ptp_write(chip,
+                                       MV88E6390_G2_AVB_CMD_PORT_TAIGLOBAL,
+                                       addr, data);
+}
+
+const struct mv88e6xxx_avb_ops mv88e6390_avb_ops = {
+       .port_ptp_read          = mv88e6390_g2_avb_port_ptp_read,
+       .port_ptp_write         = mv88e6390_g2_avb_port_ptp_write,
+       .ptp_read               = mv88e6390_g2_avb_ptp_read,
+       .ptp_write              = mv88e6390_g2_avb_ptp_write,
+       .tai_read               = mv88e6390_g2_avb_tai_read,
+       .tai_write              = mv88e6390_g2_avb_tai_write,
+};