Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1631578
| From | Vivien Didelot <vivien.didelot@savoirfairelinux.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH net-next 06/18] net: dsa: mv88e6xxx: move VTU SID accessors |
| Date | 2017-04-26 18:10 +0200 |
| Message-ID | <tAxFT-4AU-13@gated-at.bofh.it> (permalink) |
| References | <tAxwd-4hS-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Add helpers to access the VTU SID register in the global1_vtu.c file.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
drivers/net/dsa/mv88e6xxx/chip.c | 21 ++++++++-------------
drivers/net/dsa/mv88e6xxx/global1.h | 4 ++++
drivers/net/dsa/mv88e6xxx/global1_vtu.c | 25 +++++++++++++++++++++++++
3 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 0452543a2463..ec621879439d 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1387,11 +1387,9 @@ static int _mv88e6xxx_vtu_getnext(struct mv88e6xxx_chip *chip,
}
if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_STU)) {
- err = mv88e6xxx_g1_read(chip, GLOBAL_VTU_SID, &val);
+ err = mv88e6xxx_g1_vtu_sid_read(chip, &next);
if (err)
return err;
-
- next.sid = val & GLOBAL_VTU_SID_MASK;
}
}
@@ -1482,8 +1480,7 @@ static int _mv88e6xxx_vtu_loadpurge(struct mv88e6xxx_chip *chip,
return err;
if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_STU)) {
- reg = entry->sid & GLOBAL_VTU_SID_MASK;
- err = mv88e6xxx_g1_write(chip, GLOBAL_VTU_SID, reg);
+ err = mv88e6xxx_g1_vtu_sid_write(chip, entry);
if (err)
return err;
}
@@ -1513,7 +1510,9 @@ static int _mv88e6xxx_vtu_loadpurge(struct mv88e6xxx_chip *chip,
static int _mv88e6xxx_stu_getnext(struct mv88e6xxx_chip *chip, u8 sid,
struct mv88e6xxx_vtu_entry *entry)
{
- struct mv88e6xxx_vtu_entry next = { 0 };
+ struct mv88e6xxx_vtu_entry next = {
+ .sid = sid,
+ };
u16 val;
int err;
@@ -1521,8 +1520,7 @@ static int _mv88e6xxx_stu_getnext(struct mv88e6xxx_chip *chip, u8 sid,
if (err)
return err;
- err = mv88e6xxx_g1_write(chip, GLOBAL_VTU_SID,
- sid & GLOBAL_VTU_SID_MASK);
+ err = mv88e6xxx_g1_vtu_sid_write(chip, &next);
if (err)
return err;
@@ -1530,12 +1528,10 @@ static int _mv88e6xxx_stu_getnext(struct mv88e6xxx_chip *chip, u8 sid,
if (err)
return err;
- err = mv88e6xxx_g1_read(chip, GLOBAL_VTU_SID, &val);
+ err = mv88e6xxx_g1_vtu_sid_read(chip, &next);
if (err)
return err;
- next.sid = val & GLOBAL_VTU_SID_MASK;
-
err = mv88e6xxx_g1_read(chip, GLOBAL_VTU_VID, &val);
if (err)
return err;
@@ -1576,8 +1572,7 @@ static int _mv88e6xxx_stu_loadpurge(struct mv88e6xxx_chip *chip,
if (err)
return err;
- reg = entry->sid & GLOBAL_VTU_SID_MASK;
- err = mv88e6xxx_g1_write(chip, GLOBAL_VTU_SID, reg);
+ err = mv88e6xxx_g1_vtu_sid_write(chip, entry);
if (err)
return err;
diff --git a/drivers/net/dsa/mv88e6xxx/global1.h b/drivers/net/dsa/mv88e6xxx/global1.h
index 353de283362f..1bf235085215 100644
--- a/drivers/net/dsa/mv88e6xxx/global1.h
+++ b/drivers/net/dsa/mv88e6xxx/global1.h
@@ -54,6 +54,10 @@ int mv88e6xxx_g1_vtu_fid_read(struct mv88e6xxx_chip *chip,
struct mv88e6xxx_vtu_entry *entry);
int mv88e6xxx_g1_vtu_fid_write(struct mv88e6xxx_chip *chip,
struct mv88e6xxx_vtu_entry *entry);
+int mv88e6xxx_g1_vtu_sid_read(struct mv88e6xxx_chip *chip,
+ struct mv88e6xxx_vtu_entry *entry);
+int mv88e6xxx_g1_vtu_sid_write(struct mv88e6xxx_chip *chip,
+ struct mv88e6xxx_vtu_entry *entry);
int mv88e6xxx_g1_vtu_op_wait(struct mv88e6xxx_chip *chip);
int mv88e6xxx_g1_vtu_op(struct mv88e6xxx_chip *chip, u16 op);
int mv88e6xxx_g1_vtu_flush(struct mv88e6xxx_chip *chip);
diff --git a/drivers/net/dsa/mv88e6xxx/global1_vtu.c b/drivers/net/dsa/mv88e6xxx/global1_vtu.c
index 81d6f9f3c84a..201c063d15f2 100644
--- a/drivers/net/dsa/mv88e6xxx/global1_vtu.c
+++ b/drivers/net/dsa/mv88e6xxx/global1_vtu.c
@@ -39,6 +39,31 @@ int mv88e6xxx_g1_vtu_fid_write(struct mv88e6xxx_chip *chip,
return mv88e6xxx_g1_write(chip, GLOBAL_VTU_FID, val);
}
+/* Offset 0x03: VTU SID Register */
+
+int mv88e6xxx_g1_vtu_sid_read(struct mv88e6xxx_chip *chip,
+ struct mv88e6xxx_vtu_entry *entry)
+{
+ u16 val;
+ int err;
+
+ err = mv88e6xxx_g1_read(chip, GLOBAL_VTU_SID, &val);
+ if (err)
+ return err;
+
+ entry->sid = val & GLOBAL_VTU_SID_MASK;
+
+ return 0;
+}
+
+int mv88e6xxx_g1_vtu_sid_write(struct mv88e6xxx_chip *chip,
+ struct mv88e6xxx_vtu_entry *entry)
+{
+ u16 val = entry->sid & GLOBAL_VTU_SID_MASK;
+
+ return mv88e6xxx_g1_write(chip, GLOBAL_VTU_SID, val);
+}
+
/* Offset 0x05: VTU Operation Register */
int mv88e6xxx_g1_vtu_op_wait(struct mv88e6xxx_chip *chip)
--
2.12.2
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH net-next 00/18] net: dsa: mv88e6xxx: 802.1s and 88E6390 VTU Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:00 +0200
[PATCH net-next 02/18] net: dsa: mv88e6xxx: split VTU entry data member Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:00 +0200
Re: [PATCH net-next 02/18] net: dsa: mv88e6xxx: split VTU entry data member Andrew Lunn <andrew@lunn.ch> - 2017-04-27 20:30 +0200
[PATCH net-next 11/18] net: dsa: mv88e6xxx: get STU entry on VTU GetNext Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:00 +0200
Re: [PATCH net-next 11/18] net: dsa: mv88e6xxx: get STU entry on VTU GetNext Andrew Lunn <andrew@lunn.ch> - 2017-04-27 22:20 +0200
[PATCH net-next 13/18] net: dsa: mv88e6xxx: add VTU GetNext operation Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:00 +0200
Re: [PATCH net-next 13/18] net: dsa: mv88e6xxx: add VTU GetNext operation Andrew Lunn <andrew@lunn.ch> - 2017-04-28 04:20 +0200
[PATCH net-next 17/18] net: dsa: mv88e6xxx: support the VTU Page bit Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:00 +0200
Re: [PATCH net-next 17/18] net: dsa: mv88e6xxx: support the VTU Page bit Andrew Lunn <andrew@lunn.ch> - 2017-04-28 15:00 +0200
Re: [PATCH net-next 17/18] net: dsa: mv88e6xxx: support the VTU Page bit Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-28 16:30 +0200
Re: [PATCH net-next 17/18] net: dsa: mv88e6xxx: support the VTU Page bit Andrew Lunn <andrew@lunn.ch> - 2017-04-28 17:00 +0200
[PATCH net-next 04/18] net: dsa: mv88e6xxx: move VTU flush Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:00 +0200
Re: [PATCH net-next 04/18] net: dsa: mv88e6xxx: move VTU flush Andrew Lunn <andrew@lunn.ch> - 2017-04-27 20:40 +0200
[PATCH net-next 14/18] net: dsa: mv88e6xxx: add VTU Load/Purge operation Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:00 +0200
Re: [PATCH net-next 14/18] net: dsa: mv88e6xxx: add VTU Load/Purge operation Andrew Lunn <andrew@lunn.ch> - 2017-04-28 04:20 +0200
[PATCH net-next 09/18] net: dsa: mv88e6xxx: move VTU Data accessors Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:00 +0200
Re: [PATCH net-next 09/18] net: dsa: mv88e6xxx: move VTU Data accessors Andrew Lunn <andrew@lunn.ch> - 2017-04-27 21:20 +0200
[PATCH net-next 01/18] net: dsa: mv88e6xxx: add max VID to info Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:00 +0200
Re: [PATCH net-next 01/18] net: dsa: mv88e6xxx: add max VID to info Andrew Lunn <andrew@lunn.ch> - 2017-04-26 18:10 +0200
[PATCH net-next 10/18] net: dsa: mv88e6xxx: move STU GetNext operation Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:00 +0200
Re: [PATCH net-next 10/18] net: dsa: mv88e6xxx: move STU GetNext operation Andrew Lunn <andrew@lunn.ch> - 2017-04-27 21:50 +0200
[PATCH net-next 03/18] net: dsa: mv88e6xxx: move VTU Operation accessors Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:00 +0200
Re: [PATCH net-next 03/18] net: dsa: mv88e6xxx: move VTU Operation accessors Andrew Lunn <andrew@lunn.ch> - 2017-04-27 20:40 +0200
Re: [PATCH net-next 03/18] net: dsa: mv88e6xxx: move VTU Operation accessors Andrew Lunn <andrew@lunn.ch> - 2017-04-27 20:40 +0200
[PATCH net-next 07/18] net: dsa: mv88e6xxx: move VTU VID accessors Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:00 +0200
Re: [PATCH net-next 07/18] net: dsa: mv88e6xxx: move VTU VID accessors Andrew Lunn <andrew@lunn.ch> - 2017-04-27 21:00 +0200
[PATCH net-next 16/18] net: dsa: mv88e6xxx: simplify VTU entry getter Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:10 +0200
Re: [PATCH net-next 16/18] net: dsa: mv88e6xxx: simplify VTU entry getter Andrew Lunn <andrew@lunn.ch> - 2017-04-28 04:30 +0200
[PATCH net-next 06/18] net: dsa: mv88e6xxx: move VTU SID accessors Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:10 +0200
Re: [PATCH net-next 06/18] net: dsa: mv88e6xxx: move VTU SID accessors Andrew Lunn <andrew@lunn.ch> - 2017-04-27 20:40 +0200
[PATCH net-next 08/18] net: dsa: mv88e6xxx: move generic VTU GetNext Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:10 +0200
Re: [PATCH net-next 08/18] net: dsa: mv88e6xxx: move generic VTU GetNext Andrew Lunn <andrew@lunn.ch> - 2017-04-27 21:00 +0200
Re: [PATCH net-next 08/18] net: dsa: mv88e6xxx: move generic VTU GetNext Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-28 17:10 +0200
[PATCH net-next 12/18] net: dsa: mv88e6xxx: load STU entry with VTU entry Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:10 +0200
Re: [PATCH net-next 12/18] net: dsa: mv88e6xxx: load STU entry with VTU entry Andrew Lunn <andrew@lunn.ch> - 2017-04-28 04:10 +0200
[PATCH net-next 05/18] net: dsa: mv88e6xxx: move VTU FID accessors Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-04-26 18:10 +0200
Re: [PATCH net-next 05/18] net: dsa: mv88e6xxx: move VTU FID accessors Andrew Lunn <andrew@lunn.ch> - 2017-04-27 20:40 +0200
Re: [PATCH net-next 00/18] net: dsa: mv88e6xxx: 802.1s and 88E6390 VTU Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-05-01 18:00 +0200
Re: [PATCH net-next 00/18] net: dsa: mv88e6xxx: 802.1s and 88E6390 VTU David Miller <davem@davemloft.net> - 2017-05-01 18:10 +0200
Re: [PATCH net-next 00/18] net: dsa: mv88e6xxx: 802.1s and 88E6390 VTU Andrew Lunn <andrew@lunn.ch> - 2017-05-01 18:30 +0200
Re: [PATCH net-next 00/18] net: dsa: mv88e6xxx: 802.1s and 88E6390 VTU Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-05-01 19:20 +0200
Re: [PATCH net-next 00/18] net: dsa: mv88e6xxx: 802.1s and 88E6390 VTU Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-05-01 18:30 +0200
Re: [PATCH net-next 00/18] net: dsa: mv88e6xxx: 802.1s and 88E6390 VTU David Miller <davem@davemloft.net> - 2017-05-01 18:30 +0200
Re: [PATCH net-next 00/18] net: dsa: mv88e6xxx: 802.1s and 88E6390 VTU Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-05-01 18:40 +0200
csiph-web