* [PATCH net-next v2 0/2] Add support for the MV88e6097
@ 2016-11-23 20:59 Stefan Eichenberger
2016-11-23 20:59 ` [PATCH net-next v2 1/2] net: dsa: mv88e6xxx: enable EDSA on mv88e6097 Stefan Eichenberger
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Stefan Eichenberger @ 2016-11-23 20:59 UTC (permalink / raw)
To: andrew, vivien.didelot, davem; +Cc: netdev, Stefan Eichenberger
This patchset will add support for the MV88E6097 DSA switch and enable
EDSA on MV88E6097 family devices.
Changes since v1:
- Add missing g1_irqs = 8
- Add missing comment after mv88e6097_ops
- Change patch order
Stefan Eichenberger (2):
net: dsa: mv88e6xxx: enable EDSA on mv88e6097
net: dsa: mv88e6xxx: add MV88E6097 switch
drivers/net/dsa/mv88e6xxx/chip.c | 28 ++++++++++++++++++++++++++++
drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 5 ++++-
2 files changed, 32 insertions(+), 1 deletion(-)
--
2.9.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v2 1/2] net: dsa: mv88e6xxx: enable EDSA on mv88e6097
2016-11-23 20:59 [PATCH net-next v2 0/2] Add support for the MV88e6097 Stefan Eichenberger
@ 2016-11-23 20:59 ` Stefan Eichenberger
2016-11-23 20:59 ` [PATCH net-next v2 2/2] net: dsa: mv88e6xxx: add MV88E6097 switch Stefan Eichenberger
2016-11-26 0:54 ` [PATCH net-next v2 0/2] Add support for the MV88e6097 David Miller
2 siblings, 0 replies; 6+ messages in thread
From: Stefan Eichenberger @ 2016-11-23 20:59 UTC (permalink / raw)
To: andrew, vivien.didelot, davem; +Cc: netdev, Stefan Eichenberger
EDSA is currently disabled on mv88e6097 devices, this commit enables it.
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@netmodule.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
index 9298faa..3e69526 100644
--- a/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
+++ b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
@@ -541,7 +541,8 @@ enum mv88e6xxx_cap {
MV88E6XXX_FLAGS_MULTI_CHIP)
#define MV88E6XXX_FLAGS_FAMILY_6097 \
- (MV88E6XXX_FLAG_G1_ATU_FID | \
+ (MV88E6XXX_FLAG_EDSA | \
+ MV88E6XXX_FLAG_G1_ATU_FID | \
MV88E6XXX_FLAG_G1_VTU_FID | \
MV88E6XXX_FLAG_GLOBAL2 | \
MV88E6XXX_FLAG_G2_MGMT_EN_2X | \
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next v2 2/2] net: dsa: mv88e6xxx: add MV88E6097 switch
2016-11-23 20:59 [PATCH net-next v2 0/2] Add support for the MV88e6097 Stefan Eichenberger
2016-11-23 20:59 ` [PATCH net-next v2 1/2] net: dsa: mv88e6xxx: enable EDSA on mv88e6097 Stefan Eichenberger
@ 2016-11-23 20:59 ` Stefan Eichenberger
2016-11-23 21:05 ` Andrew Lunn
2016-11-23 21:20 ` Vivien Didelot
2016-11-26 0:54 ` [PATCH net-next v2 0/2] Add support for the MV88e6097 David Miller
2 siblings, 2 replies; 6+ messages in thread
From: Stefan Eichenberger @ 2016-11-23 20:59 UTC (permalink / raw)
To: andrew, vivien.didelot, davem; +Cc: netdev, Stefan Eichenberger
Add support for the MV88E6097 switch. The change was tested on an Armada
based platform with a MV88E6097 switch.
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@netmodule.com>
---
drivers/net/dsa/mv88e6xxx/chip.c | 28 ++++++++++++++++++++++++++++
drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 2 ++
2 files changed, 30 insertions(+)
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index bada646..68eb8fc 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3209,6 +3209,20 @@ static const struct mv88e6xxx_ops mv88e6095_ops = {
.stats_get_stats = mv88e6095_stats_get_stats,
};
+static const struct mv88e6xxx_ops mv88e6097_ops = {
+ /* MV88E6XXX_FAMILY_6097 */
+ .set_switch_mac = mv88e6xxx_g2_set_switch_mac,
+ .phy_read = mv88e6xxx_g2_smi_phy_read,
+ .phy_write = mv88e6xxx_g2_smi_phy_write,
+ .port_set_link = mv88e6xxx_port_set_link,
+ .port_set_duplex = mv88e6xxx_port_set_duplex,
+ .port_set_speed = mv88e6185_port_set_speed,
+ .stats_snapshot = mv88e6xxx_g1_stats_snapshot,
+ .stats_get_sset_count = mv88e6095_stats_get_sset_count,
+ .stats_get_strings = mv88e6095_stats_get_strings,
+ .stats_get_stats = mv88e6095_stats_get_stats,
+};
+
static const struct mv88e6xxx_ops mv88e6123_ops = {
/* MV88E6XXX_FAMILY_6165 */
.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -3580,6 +3594,20 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.ops = &mv88e6095_ops,
},
+ [MV88E6097] = {
+ .prod_num = PORT_SWITCH_ID_PROD_NUM_6097,
+ .family = MV88E6XXX_FAMILY_6097,
+ .name = "Marvell 88E6097/88E6097F",
+ .num_databases = 4096,
+ .num_ports = 11,
+ .port_base_addr = 0x10,
+ .global1_addr = 0x1b,
+ .age_time_coeff = 15000,
+ .g1_irqs = 8,
+ .flags = MV88E6XXX_FLAGS_FAMILY_6097,
+ .ops = &mv88e6097_ops,
+ },
+
[MV88E6123] = {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6123,
.family = MV88E6XXX_FAMILY_6165,
diff --git a/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
index 3e69526..a2ff1fc 100644
--- a/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
+++ b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
@@ -81,6 +81,7 @@
#define PORT_SWITCH_ID 0x03
#define PORT_SWITCH_ID_PROD_NUM_6085 0x04a
#define PORT_SWITCH_ID_PROD_NUM_6095 0x095
+#define PORT_SWITCH_ID_PROD_NUM_6097 0x099
#define PORT_SWITCH_ID_PROD_NUM_6131 0x106
#define PORT_SWITCH_ID_PROD_NUM_6320 0x115
#define PORT_SWITCH_ID_PROD_NUM_6123 0x121
@@ -378,6 +379,7 @@
enum mv88e6xxx_model {
MV88E6085,
MV88E6095,
+ MV88E6097,
MV88E6123,
MV88E6131,
MV88E6161,
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v2 2/2] net: dsa: mv88e6xxx: add MV88E6097 switch
2016-11-23 20:59 ` [PATCH net-next v2 2/2] net: dsa: mv88e6xxx: add MV88E6097 switch Stefan Eichenberger
@ 2016-11-23 21:05 ` Andrew Lunn
2016-11-23 21:20 ` Vivien Didelot
1 sibling, 0 replies; 6+ messages in thread
From: Andrew Lunn @ 2016-11-23 21:05 UTC (permalink / raw)
To: Stefan Eichenberger; +Cc: vivien.didelot, davem, netdev, Stefan Eichenberger
On Wed, Nov 23, 2016 at 09:59:52PM +0100, Stefan Eichenberger wrote:
> Add support for the MV88E6097 switch. The change was tested on an Armada
> based platform with a MV88E6097 switch.
>
> Signed-off-by: Stefan Eichenberger <stefan.eichenberger@netmodule.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v2 2/2] net: dsa: mv88e6xxx: add MV88E6097 switch
2016-11-23 20:59 ` [PATCH net-next v2 2/2] net: dsa: mv88e6xxx: add MV88E6097 switch Stefan Eichenberger
2016-11-23 21:05 ` Andrew Lunn
@ 2016-11-23 21:20 ` Vivien Didelot
1 sibling, 0 replies; 6+ messages in thread
From: Vivien Didelot @ 2016-11-23 21:20 UTC (permalink / raw)
To: Stefan Eichenberger, andrew, davem; +Cc: netdev, Stefan Eichenberger
Hi Stefan,
Stefan Eichenberger <eichest@gmail.com> writes:
> Add support for the MV88E6097 switch. The change was tested on an Armada
> based platform with a MV88E6097 switch.
>
> Signed-off-by: Stefan Eichenberger <stefan.eichenberger@netmodule.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
One day I'll understand Marvell products naming... ;-)
Thanks,
Vivien
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v2 0/2] Add support for the MV88e6097
2016-11-23 20:59 [PATCH net-next v2 0/2] Add support for the MV88e6097 Stefan Eichenberger
2016-11-23 20:59 ` [PATCH net-next v2 1/2] net: dsa: mv88e6xxx: enable EDSA on mv88e6097 Stefan Eichenberger
2016-11-23 20:59 ` [PATCH net-next v2 2/2] net: dsa: mv88e6xxx: add MV88E6097 switch Stefan Eichenberger
@ 2016-11-26 0:54 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2016-11-26 0:54 UTC (permalink / raw)
To: eichest; +Cc: andrew, vivien.didelot, netdev, stefan.eichenberger
From: Stefan Eichenberger <eichest@gmail.com>
Date: Wed, 23 Nov 2016 21:59:50 +0100
> This patchset will add support for the MV88E6097 DSA switch and enable
> EDSA on MV88E6097 family devices.
>
> Changes since v1:
> - Add missing g1_irqs = 8
> - Add missing comment after mv88e6097_ops
> - Change patch order
This doesn't apply cleanly to net-next, please respin.
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-11-26 0:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-23 20:59 [PATCH net-next v2 0/2] Add support for the MV88e6097 Stefan Eichenberger
2016-11-23 20:59 ` [PATCH net-next v2 1/2] net: dsa: mv88e6xxx: enable EDSA on mv88e6097 Stefan Eichenberger
2016-11-23 20:59 ` [PATCH net-next v2 2/2] net: dsa: mv88e6xxx: add MV88E6097 switch Stefan Eichenberger
2016-11-23 21:05 ` Andrew Lunn
2016-11-23 21:20 ` Vivien Didelot
2016-11-26 0:54 ` [PATCH net-next v2 0/2] Add support for the MV88e6097 David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).