Skip to content

Commit d973ac8

Browse files
yangflkuba-moo
authored andcommitted
net: dsa: yt921x: Use *_ULL bitfield macros for VLAN_CTRL
VLAN_CTRL should be treated as a 64-bit register. GENMASK and BIT macros use unsigned long as the underlying type, which will result in a build error on architectures where sizeof(long) == 4. Replace them with unsigned long long variants. Signed-off-by: David Yang <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent a202701 commit d973ac8

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

drivers/net/dsa/yt921x.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -382,23 +382,23 @@
382382
#define YT921X_FDB_HW_FLUSH_ON_LINKDOWN BIT(0)
383383

384384
#define YT921X_VLANn_CTRL(vlan) (0x188000 + 8 * (vlan))
385-
#define YT921X_VLAN_CTRL_UNTAG_PORTS_M GENMASK(50, 40)
385+
#define YT921X_VLAN_CTRL_UNTAG_PORTS_M GENMASK_ULL(50, 40)
386386
#define YT921X_VLAN_CTRL_UNTAG_PORTS(x) FIELD_PREP(YT921X_VLAN_CTRL_UNTAG_PORTS_M, (x))
387-
#define YT921X_VLAN_CTRL_UNTAG_PORTn(port) BIT((port) + 40)
388-
#define YT921X_VLAN_CTRL_STP_ID_M GENMASK(39, 36)
387+
#define YT921X_VLAN_CTRL_UNTAG_PORTn(port) BIT_ULL((port) + 40)
388+
#define YT921X_VLAN_CTRL_STP_ID_M GENMASK_ULL(39, 36)
389389
#define YT921X_VLAN_CTRL_STP_ID(x) FIELD_PREP(YT921X_VLAN_CTRL_STP_ID_M, (x))
390-
#define YT921X_VLAN_CTRL_SVLAN_EN BIT(35)
391-
#define YT921X_VLAN_CTRL_FID_M GENMASK(34, 23)
390+
#define YT921X_VLAN_CTRL_SVLAN_EN BIT_ULL(35)
391+
#define YT921X_VLAN_CTRL_FID_M GENMASK_ULL(34, 23)
392392
#define YT921X_VLAN_CTRL_FID(x) FIELD_PREP(YT921X_VLAN_CTRL_FID_M, (x))
393-
#define YT921X_VLAN_CTRL_LEARN_DIS BIT(22)
394-
#define YT921X_VLAN_CTRL_INT_PRI_EN BIT(21)
395-
#define YT921X_VLAN_CTRL_INT_PRI_M GENMASK(20, 18)
396-
#define YT921X_VLAN_CTRL_PORTS_M GENMASK(17, 7)
393+
#define YT921X_VLAN_CTRL_LEARN_DIS BIT_ULL(22)
394+
#define YT921X_VLAN_CTRL_INT_PRI_EN BIT_ULL(21)
395+
#define YT921X_VLAN_CTRL_INT_PRI_M GENMASK_ULL(20, 18)
396+
#define YT921X_VLAN_CTRL_PORTS_M GENMASK_ULL(17, 7)
397397
#define YT921X_VLAN_CTRL_PORTS(x) FIELD_PREP(YT921X_VLAN_CTRL_PORTS_M, (x))
398-
#define YT921X_VLAN_CTRL_PORTn(port) BIT((port) + 7)
399-
#define YT921X_VLAN_CTRL_BYPASS_1X_AC BIT(6)
400-
#define YT921X_VLAN_CTRL_METER_EN BIT(5)
401-
#define YT921X_VLAN_CTRL_METER_ID_M GENMASK(4, 0)
398+
#define YT921X_VLAN_CTRL_PORTn(port) BIT_ULL((port) + 7)
399+
#define YT921X_VLAN_CTRL_BYPASS_1X_AC BIT_ULL(6)
400+
#define YT921X_VLAN_CTRL_METER_EN BIT_ULL(5)
401+
#define YT921X_VLAN_CTRL_METER_ID_M GENMASK_ULL(4, 0)
402402

403403
#define YT921X_TPID_IGRn(x) (0x210000 + 4 * (x)) /* [0, 3] */
404404
#define YT921X_TPID_IGR_TPID_M GENMASK(15, 0)

0 commit comments

Comments
 (0)