* [PATCH] net: dsa: mv88e6xxx: add MV88E6097 switch
@ 2016-11-22 10:28 Stefan Eichenberger
2016-11-22 15:07 ` Andrew Lunn
0 siblings, 1 reply; 6+ messages in thread
From: Stefan Eichenberger @ 2016-11-22 10:28 UTC (permalink / raw)
To: andrew, vivien.didelot, f.fainelli; +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 | 19 +++++++++++++++++++
drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 2 ++
2 files changed, 21 insertions(+)
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 5a9729b..20d6fb5 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3213,6 +3213,12 @@ static const struct mv88e6xxx_ops mv88e6095_ops = {
.phy_write = mv88e6xxx_phy_ppu_write,
};
+static const struct mv88e6xxx_ops mv88e6097_ops = {
+ .set_switch_mac = mv88e6xxx_g2_set_switch_mac,
+ .phy_read = mv88e6xxx_g2_smi_phy_read,
+ .phy_write = mv88e6xxx_g2_smi_phy_write,
+};
+
static const struct mv88e6xxx_ops mv88e6123_ops = {
.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
.phy_read = mv88e6xxx_read,
@@ -3342,6 +3348,19 @@ 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,
+ .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 e572121..42e28f8 100644
--- a/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
+++ b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
@@ -74,6 +74,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
@@ -353,6 +354,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: dsa: mv88e6xxx: add MV88E6097 switch
2016-11-22 10:28 [PATCH] net: dsa: mv88e6xxx: add MV88E6097 switch Stefan Eichenberger
@ 2016-11-22 15:07 ` Andrew Lunn
2016-11-22 16:47 ` [PATCH v2] " Stefan Eichenberger
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Lunn @ 2016-11-22 15:07 UTC (permalink / raw)
To: Stefan Eichenberger
Cc: vivien.didelot, f.fainelli, netdev, Stefan Eichenberger
On Tue, Nov 22, 2016 at 11:28:36AM +0100, Stefan Eichenberger wrote:
> Add support for the MV88E6097 switch. The change was tested on an Armada
> based platform with a MV88E6097 switch.
Hi Stefan
Please can you based your patches on net-next. You will then find the
ops structure has gained a few more entries.
Andrew
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2] net: dsa: mv88e6xxx: add MV88E6097 switch
2016-11-22 15:07 ` Andrew Lunn
@ 2016-11-22 16:47 ` Stefan Eichenberger
2016-11-24 20:29 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Stefan Eichenberger @ 2016-11-22 16:47 UTC (permalink / raw)
To: andrew; +Cc: vivien.didelot, f.fainelli, 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 | 26 ++++++++++++++++++++++++++
drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 2 ++
2 files changed, 28 insertions(+)
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 48b58c7..2d5941c 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3208,6 +3208,19 @@ static const struct mv88e6xxx_ops mv88e6095_ops = {
.stats_get_stats = mv88e6095_stats_get_stats,
};
+static const struct mv88e6xxx_ops mv88e6097_ops = {
+ .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,
@@ -3579,6 +3592,19 @@ 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,
+ .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 9298faa..ab52c37 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 v2] net: dsa: mv88e6xxx: add MV88E6097 switch
2016-11-22 16:47 ` [PATCH v2] " Stefan Eichenberger
@ 2016-11-24 20:29 ` David Miller
2016-11-24 21:14 ` Stefan Eichenberger
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2016-11-24 20:29 UTC (permalink / raw)
To: eichest; +Cc: andrew, vivien.didelot, f.fainelli, netdev, stefan.eichenberger
From: Stefan Eichenberger <eichest@gmail.com>
Date: Tue, 22 Nov 2016 17:47:21 +0100
> 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>
Applied to net-next, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] net: dsa: mv88e6xxx: add MV88E6097 switch
2016-11-24 20:29 ` David Miller
@ 2016-11-24 21:14 ` Stefan Eichenberger
2016-11-25 2:03 ` Andrew Lunn
0 siblings, 1 reply; 6+ messages in thread
From: Stefan Eichenberger @ 2016-11-24 21:14 UTC (permalink / raw)
To: David Miller
Cc: andrew, vivien.didelot, f.fainelli, netdev, stefan.eichenberger
Hi David
On Thu, Nov 24, 2016 at 03:29:21PM -0500, David Miller wrote:
> From: Stefan Eichenberger <eichest@gmail.com>
> Date: Tue, 22 Nov 2016 17:47:21 +0100
>
> > 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>
>
> Applied to net-next, thanks.
I'm afraid this is the wrong patch version, Andrew and Vivien had some
findings, this would be the correct patch series that include all
necessary changes:
http://marc.info/?l=linux-netdev&m=147993563215981&w=2
http://marc.info/?l=linux-netdev&m=147993580216027&w=2
http://marc.info/?l=linux-netdev&m=147993607616121&w=2
Sorry for the confusion, I did a mess
Stefan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] net: dsa: mv88e6xxx: add MV88E6097 switch
2016-11-24 21:14 ` Stefan Eichenberger
@ 2016-11-25 2:03 ` Andrew Lunn
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Lunn @ 2016-11-25 2:03 UTC (permalink / raw)
To: Stefan Eichenberger
Cc: David Miller, vivien.didelot, f.fainelli, netdev,
stefan.eichenberger
On Thu, Nov 24, 2016 at 10:14:49PM +0100, Stefan Eichenberger wrote:
> Hi David
>
> On Thu, Nov 24, 2016 at 03:29:21PM -0500, David Miller wrote:
> > From: Stefan Eichenberger <eichest@gmail.com>
> > Date: Tue, 22 Nov 2016 17:47:21 +0100
> >
> > > 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>
> >
> > Applied to net-next, thanks.
>
> I'm afraid this is the wrong patch version, Andrew and Vivien had some
> findings, this would be the correct patch series that include all
> necessary changes:
Hi Stefan
David does not remove patches once they are accepted. Please send
followup patches which convert the current state to what we actually
want.
Andrew
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-11-25 2:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-22 10:28 [PATCH] net: dsa: mv88e6xxx: add MV88E6097 switch Stefan Eichenberger
2016-11-22 15:07 ` Andrew Lunn
2016-11-22 16:47 ` [PATCH v2] " Stefan Eichenberger
2016-11-24 20:29 ` David Miller
2016-11-24 21:14 ` Stefan Eichenberger
2016-11-25 2:03 ` Andrew Lunn
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).