| Message ID | 1523543140-20747-1-git-send-email-ivan.khoronzhuk@linaro.org |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: ethernet: ti: cpsw: fix tx vlan priority mapping | expand |
On 04/12/2018 09:25 AM, Ivan Khoronzhuk wrote: > The CPDMA_TX_PRIORITY_MAP in real is vlan pcp field priority mapping > register and basically replaces vlan pcp field for tagged packets. > So, set it to be 1:1 mapping. "Otherwise, it will cause unexpected change of egress vlan tagged packets, like prio 2 -> prio 5" > > Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> > --- > Based on net/master Fixes: e05 107 e6b 747 ("net: ethernet: ti: cpsw: add multi queue support") Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com> > > drivers/net/ethernet/ti/cpsw.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c > index 3037127..74f8284 100644 > --- a/drivers/net/ethernet/ti/cpsw.c > +++ b/drivers/net/ethernet/ti/cpsw.c > @@ -129,7 +129,7 @@ do { \ > > #define RX_PRIORITY_MAPPING 0x76543210 > #define TX_PRIORITY_MAPPING 0x33221100 > -#define CPDMA_TX_PRIORITY_MAP 0x01234567 > +#define CPDMA_TX_PRIORITY_MAP 0x76543210 > > #define CPSW_VLAN_AWARE BIT(1) > #define CPSW_RX_VLAN_ENCAP BIT(2) >
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 3037127..74f8284 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -129,7 +129,7 @@ do { \ #define RX_PRIORITY_MAPPING 0x76543210 #define TX_PRIORITY_MAPPING 0x33221100 -#define CPDMA_TX_PRIORITY_MAP 0x01234567 +#define CPDMA_TX_PRIORITY_MAP 0x76543210 #define CPSW_VLAN_AWARE BIT(1) #define CPSW_RX_VLAN_ENCAP BIT(2)
The CPDMA_TX_PRIORITY_MAP in real is vlan pcp field priority mapping register and basically replaces vlan pcp field for tagged packets. So, set it to be 1:1 mapping. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> --- Based on net/master drivers/net/ethernet/ti/cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)