Skip to contentSkip to conversation

net: dsa: mv88e6060: add register defines header file

PATCH Superseded Neil Armstrong 3 participants 7 messages Nov 10, 2015

Subsystems (3)
Networking Network drivers Networking DSA

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Neil Armstrong

author
#0 lore raw

PATCH 5/6 net: dsa: mv88e6060: add register defines header file

To align with the mv88e6xxx code, add a similar header file with all the register defines.
The file is based on the mv88e6xxx header for coherency.

Signed-off-by Neil Armstrong <[email protected]>
---
 drivers/net/dsa/mv88e6060.h | 108 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 drivers/net/dsa/mv88e6060.h
drivers/net/dsa/mv88e6060.h new file +108 -0
new file mode 100644
index 0000000..adbc894
@@ -0,0 +1,108 @@
+/*
+ * net/dsa/mv88e6060.h - Marvell 88e6060 switch chip support
+ * Copyright (c) 2008 Marvell Semiconductor
+ *
+ * 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.
+ */
+
+#ifndef __MV88E6060_H
+#define __MV88E6060_H
+
+#define MV88E6060_PORTS	6
+
+#define REG_PORT(p)		(0x8 + (p))
+#define PORT_STATUS		0x00
+#define PORT_STATUS_PAUSE_EN	BIT(15)
+#define PORT_STATUS_MY_PAUSE	BIT(14)
+#define PORT_STATUS_FC		(PORT_STATUS_MY_PAUSE | PORT_STATUS_PAUSE_EN)
+#define PORT_STATUS_RESOLVED	BIT(13)
+#define PORT_STATUS_LINK	BIT(12)
+#define PORT_STATUS_PORTMODE	BIT(11)
+#define PORT_STATUS_PHYMODE	BIT(10)
+#define PORT_STATUS_DUPLEX	BIT(9)
+#define PORT_STATUS_SPEED	BIT(8)
+#define PORT_SWITCH_ID		0x03
+#define PORT_SWITCH_ID_6060	0x0600
+#define PORT_SWITCH_ID_6060_MASK	0xfff0
+#define PORT_SWITCH_ID_6060_R1	0x0601
+#define PORT_SWITCH_ID_6060_R2	0x0602
+#define PORT_CONTROL		0x04
+#define PORT_CONTROL_FORCE_FLOW_CTRL	BIT(15)
+#define PORT_CONTROL_TRAILER	BIT(14)
+#define PORT_CONTROL_HEADER	BIT(11)
+#define PORT_CONTROL_INGRESS_MODE	BIT(8)
+#define PORT_CONTROL_VLAN_TUNNEL	BIT(7)
+#define PORT_CONTROL_STATE_MASK	0x03
+#define PORT_CONTROL_STATE_DISABLED	0x00
+#define PORT_CONTROL_STATE_BLOCKING	0x01
+#define PORT_CONTROL_STATE_LEARNING	0x02
+#define PORT_CONTROL_STATE_FORWARDING	0x03
+#define PORT_VLAN_MAP		0x06
+#define PORT_VLAN_MAP_DBNUM_SHIFT	12
+#define PORT_VLAN_MAP_TABLE_MASK	0x1f
+#define PORT_ASSOC_VECTOR	0x0b
+#define PORT_ASSOC_VECTOR_MONITOR	BIT(15)
+#define PORT_ASSOC_VECTOR_PAV_MASK	0x1f
+#define PORT_RX_CNTR		0x10
+#define PORT_TX_CNTR		0x11
+
+#define REG_GLOBAL		0x0f
+#define GLOBAL_STATUS		0x00
+#define GLOBAL_STATUS_SW_MODE_MASK	(0x3 << 12)
+#define GLOBAL_STATUS_SW_MODE_0	(0x0 << 12)
+#define GLOBAL_STATUS_SW_MODE_1	(0x1 << 12)
+#define GLOBAL_STATUS_SW_MODE_2	(0x2 << 12)
+#define GLOBAL_STATUS_SW_MODE_3	(0x3 << 12)
+#define GLOBAL_STATUS_INIT_READY	BIT(11)
+#define GLOBAL_STATUS_ATU_FULL		BIT(3)
+#define GLOBAL_STATUS_ATU_DONE		BIT(2)
+#define GLOBAL_STATUS_PHY_INT	BIT(1)
+#define GLOBAL_STATUS_EEINT	BIT(0)
+#define GLOBAL_MAC_01		0x01
+#define GLOBAL_MAC_01_DIFF_ADDR	BIT(8)
+#define GLOBAL_MAC_23		0x02
+#define GLOBAL_MAC_45		0x03
+#define GLOBAL_CONTROL		0x04
+#define GLOBAL_CONTROL_DISCARD_EXCESS	BIT(13)
+#define GLOBAL_CONTROL_MAX_FRAME_1536	BIT(10)
+#define GLOBAL_CONTROL_RELOAD_EEPROM	BIT(9)
+#define GLOBAL_CONTROL_CTRMODE		BIT(8)
+#define GLOBAL_CONTROL_ATU_FULL_EN	BIT(3)
+#define GLOBAL_CONTROL_ATU_DONE_EN	BIT(2)
+#define GLOBAL_CONTROL_PHYINT_EN	BIT(1)
+#define GLOBAL_CONTROL_EEPROM_DONE_EN	BIT(0)
+#define GLOBAL_ATU_CONTROL	0x0a
+#define GLOBAL_ATU_CONTROL_SWRESET	BIT(15)
+#define GLOBAL_ATU_CONTROL_LEARNDIS	BIT(14)
+#define GLOBAL_ATU_CONTROL_ATUSIZE_256	(0x0 << 12)
+#define GLOBAL_ATU_CONTROL_ATUSIZE_512	(0x1 << 12)
+#define GLOBAL_ATU_CONTROL_ATUSIZE_1024	(0x2 << 12)
+#define GLOBAL_ATU_CONTROL_ATE_AGE_SHIFT	4
+#define GLOBAL_ATU_CONTROL_ATE_AGE_MASK	(0xff << 4)
+#define GLOBAL_ATU_CONTROL_ATE_AGE_5MIN	(0x13 << 4)
+#define GLOBAL_ATU_OP		0x0b
+#define GLOBAL_ATU_OP_BUSY	BIT(15)
+#define GLOBAL_ATU_OP_NOP		(0 << 12)
+#define GLOBAL_ATU_OP_FLUSH_ALL	((1 << 12) | GLOBAL_ATU_OP_BUSY)
+#define GLOBAL_ATU_OP_FLUSH_UNLOCKED	((2 << 12) | GLOBAL_ATU_OP_BUSY)
+#define GLOBAL_ATU_OP_LOAD_DB		((3 << 12) | GLOBAL_ATU_OP_BUSY)
+#define GLOBAL_ATU_OP_GET_NEXT_DB	((4 << 12) | GLOBAL_ATU_OP_BUSY)
+#define GLOBAL_ATU_OP_FLUSH_DB		((5 << 12) | GLOBAL_ATU_OP_BUSY)
+#define GLOBAL_ATU_OP_FLUSH_UNLOCKED_DB ((6 << 12) | GLOBAL_ATU_OP_BUSY)
+#define GLOBAL_ATU_DATA		0x0c
+#define GLOBAL_ATU_DATA_PORT_VECTOR_MASK	0x3f0
+#define GLOBAL_ATU_DATA_PORT_VECTOR_SHIFT	4
+#define GLOBAL_ATU_DATA_STATE_MASK		0x0f
+#define GLOBAL_ATU_DATA_STATE_UNUSED		0x00
+#define GLOBAL_ATU_DATA_STATE_UC_STATIC		0x0e
+#define GLOBAL_ATU_DATA_STATE_UC_LOCKED		0x0f
+#define GLOBAL_ATU_DATA_STATE_MC_STATIC		0x07
+#define GLOBAL_ATU_DATA_STATE_MC_LOCKED		0x0e
+#define GLOBAL_ATU_MAC_01	0x0d
+#define GLOBAL_ATU_MAC_23	0x0e
+#define GLOBAL_ATU_MAC_45	0x0f
+
+#endif
Signature · 1 line
1.9.1
#1 lore raw

Hi Neil,

Quoted 5 lines · Neil Armstrong

To align with the mv88e6xxx code, add a similar header file with all the register defines.
The file is based on the mv88e6xxx header for coherency.

Signed-off-by Neil Armstrong <[email protected]>

In the RFC patchset, Andrew mentioned that there is not that much things in common with mv88e6xxx, so I don't really see a value to add a separate header file. Would that make sense to you guys to add the defines directly in mv88e6060.c and squash that in the last patch?

Quoted 11 lines
---
 drivers/net/dsa/mv88e6060.h | 108 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 drivers/net/dsa/mv88e6060.h
drivers/net/dsa/mv88e6060.h new file +0 -0
new file mode 100644
index 0000000..adbc894

drivers/net/dsa/mv88e6060.h line 3

Quoted 3 lines
drivers/net/dsa/mv88e6060.h new file +3 -0
@@ -0,0 +1,108 @@
+/*
+ * net/dsa/mv88e6060.h - Marvell 88e6060 switch chip support
+ * Copyright (c) 2008 Marvell Semiconductor

Also I don't think the copyright notice is correct here.

Thanks,
-v

maintainer
#2 lore raw
Quoted 7 lines · Vivien Didelot

Hi Neil,

Quoted 4 lines · Neil Armstrong

To align with the mv88e6xxx code, add a similar header file with all the register defines.
The file is based on the mv88e6xxx header for coherency.

Quoted 6 lines
Quoted 1 line
Signed-off-by Neil Armstrong <[email protected]>

In the RFC patchset, Andrew mentioned that there is not that much things in common with mv88e6xxx, so I don't really see a value to add a separate header file. Would that make sense to you guys to add the defines directly in mv88e6060.c and squash that in the last patch?

It is personal taste, but i think there are enough defines that having a separate header file is useful. For < 10 i would agree with Vivien, but with ~100, i prefer a header file.

Andrew

#3 lore raw
Quoted 10 lines · Andrew Lunn
Quoted 9 lines · Vivien Didelot

Hi Neil,

Quoted 5 lines · Neil Armstrong

To align with the mv88e6xxx code, add a similar header file with all the register defines.
The file is based on the mv88e6xxx header for coherency.

Signed-off-by Neil Armstrong <[email protected]>
Quoted 8 lines
Quoted 4 lines

In the RFC patchset, Andrew mentioned that there is not that much things in common with mv88e6xxx, so I don't really see a value to add a separate header file. Would that make sense to you guys to add the defines directly in mv88e6060.c and squash that in the last patch?

It is personal taste, but i think there are enough defines that having a separate header file is useful. For < 10 i would agree with Vivien, but with ~100, i prefer a header file.

OK. So please fix the copyright owner of this new file then and we're good :-)

Thanks,
-v

author
#4 lore raw
In reply to Vivien Didelot
Quoted 31 lines · Vivien Didelot

Hi Neil,

Quoted 5 lines · Neil Armstrong

To align with the mv88e6xxx code, add a similar header file with all the register defines.
The file is based on the mv88e6xxx header for coherency.

Signed-off-by Neil Armstrong <[email protected]>

In the RFC patchset, Andrew mentioned that there is not that much things in common with mv88e6xxx, so I don't really see a value to add a separate header file. Would that make sense to you guys to add the defines directly in mv88e6060.c and squash that in the last patch?

Quoted 11 lines
---
 drivers/net/dsa/mv88e6060.h | 108 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 drivers/net/dsa/mv88e6060.h
drivers/net/dsa/mv88e6060.h new file +0 -0
new file mode 100644
index 0000000..adbc894

drivers/net/dsa/mv88e6060.h line 3

Quoted 3 lines
drivers/net/dsa/mv88e6060.h new file +3 -0
@@ -0,0 +1,108 @@
+/*
+ * net/dsa/mv88e6060.h - Marvell 88e6060 switch chip support
+ * Copyright (c) 2008 Marvell Semiconductor

Also I don't think the copyright notice is correct here.

Quoted 3 lines

Thanks,
-v

Vivien,

Is something like this OK ?
/*
* drivers/net/dsa/mv88e6060.h - Marvell 88e6060 switch chip support
* Copyright (c) 2015 Neil Armstrong
*
* Based on mv88e6xxx.h
* Copyright (c) 2008 Marvell Semiconductor
*
* 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.
*/

Thanks,
Neil

#5 lore raw
Quoted 32 lines · Neil Armstrong
Quoted 31 lines · Vivien Didelot

Hi Neil,

Quoted 5 lines · Neil Armstrong

To align with the mv88e6xxx code, add a similar header file with all the register defines.
The file is based on the mv88e6xxx header for coherency.

Signed-off-by Neil Armstrong <[email protected]>

In the RFC patchset, Andrew mentioned that there is not that much things in common with mv88e6xxx, so I don't really see a value to add a separate header file. Would that make sense to you guys to add the defines directly in mv88e6060.c and squash that in the last patch?

Quoted 11 lines
---
 drivers/net/dsa/mv88e6060.h | 108 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 drivers/net/dsa/mv88e6060.h
drivers/net/dsa/mv88e6060.h new file +0 -0
new file mode 100644
index 0000000..adbc894

drivers/net/dsa/mv88e6060.h line 3

Quoted 3 lines
drivers/net/dsa/mv88e6060.h new file +3 -0
@@ -0,0 +1,108 @@
+/*
+ * net/dsa/mv88e6060.h - Marvell 88e6060 switch chip support
+ * Copyright (c) 2008 Marvell Semiconductor

Also I don't think the copyright notice is correct here.

Quoted 6 lines
Quoted 3 lines

Thanks,
-v

Vivien,

Is something like this OK ?

I'd say yes.

Quoted 4 lines

/*
* drivers/net/dsa/mv88e6060.h - Marvell 88e6060 switch chip support
* Copyright (c) 2015 Neil Armstrong
*

Quoted 8 lines

* Based on mv88e6xxx.h
* Copyright (c) 2008 Marvell Semiconductor
*
* 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.
*/

Thanks Neil,
-v

maintainer
#6 lore raw
In reply to Neil Armstrong
Quoted 5 lines

Is something like this OK ?
/*
* drivers/net/dsa/mv88e6060.h - Marvell 88e6060 switch chip support
* Copyright (c) 2015 Neil Armstrong
*

Quoted 8 lines

* Based on mv88e6xxx.h
* Copyright (c) 2008 Marvell Semiconductor
*
* 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.
*/

Yes, that is good, and i really should add my copyright to mv88e6xxx.h the next time i edit it.

Thanks
Andrew