lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0292/1039] net: dsa: hellcreek: Add missing PTP via UDP rules
    Date
    From: Kurt Kanzenbach <kurt@linutronix.de>

    [ Upstream commit 6cf01e451599da630ff1af529d61c5e4db4550ab ]

    The switch supports PTP for UDP transport too. Therefore, add the missing static
    FDB entries to ensure correct forwarding of these packets.

    Fixes: ddd56dfe52c9 ("net: dsa: hellcreek: Add PTP clock support")
    Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de>
    Acked-by: Richard Cochran <richardcochran@gmail.com>
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/dsa/hirschmann/hellcreek.c | 64 ++++++++++++++++++++++++--
    1 file changed, 60 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c
    index 40ce8c0c9167a..b2bab460d2e98 100644
    --- a/drivers/net/dsa/hirschmann/hellcreek.c
    +++ b/drivers/net/dsa/hirschmann/hellcreek.c
    @@ -1052,7 +1052,7 @@ static void hellcreek_setup_tc_identity_mapping(struct hellcreek *hellcreek)

    static int hellcreek_setup_fdb(struct hellcreek *hellcreek)
    {
    - static struct hellcreek_fdb_entry ptp = {
    + static struct hellcreek_fdb_entry l2_ptp = {
    /* MAC: 01-1B-19-00-00-00 */
    .mac = { 0x01, 0x1b, 0x19, 0x00, 0x00, 0x00 },
    .portmask = 0x03, /* Management ports */
    @@ -1063,7 +1063,29 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek)
    .reprio_tc = 6, /* TC: 6 as per IEEE 802.1AS */
    .reprio_en = 1,
    };
    - static struct hellcreek_fdb_entry p2p = {
    + static struct hellcreek_fdb_entry udp4_ptp = {
    + /* MAC: 01-00-5E-00-01-81 */
    + .mac = { 0x01, 0x00, 0x5e, 0x00, 0x01, 0x81 },
    + .portmask = 0x03, /* Management ports */
    + .age = 0,
    + .is_obt = 0,
    + .pass_blocked = 0,
    + .is_static = 1,
    + .reprio_tc = 6,
    + .reprio_en = 1,
    + };
    + static struct hellcreek_fdb_entry udp6_ptp = {
    + /* MAC: 33-33-00-00-01-81 */
    + .mac = { 0x33, 0x33, 0x00, 0x00, 0x01, 0x81 },
    + .portmask = 0x03, /* Management ports */
    + .age = 0,
    + .is_obt = 0,
    + .pass_blocked = 0,
    + .is_static = 1,
    + .reprio_tc = 6,
    + .reprio_en = 1,
    + };
    + static struct hellcreek_fdb_entry l2_p2p = {
    /* MAC: 01-80-C2-00-00-0E */
    .mac = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e },
    .portmask = 0x03, /* Management ports */
    @@ -1074,6 +1096,28 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek)
    .reprio_tc = 6, /* TC: 6 as per IEEE 802.1AS */
    .reprio_en = 1,
    };
    + static struct hellcreek_fdb_entry udp4_p2p = {
    + /* MAC: 01-00-5E-00-00-6B */
    + .mac = { 0x01, 0x00, 0x5e, 0x00, 0x00, 0x6b },
    + .portmask = 0x03, /* Management ports */
    + .age = 0,
    + .is_obt = 0,
    + .pass_blocked = 1,
    + .is_static = 1,
    + .reprio_tc = 6,
    + .reprio_en = 1,
    + };
    + static struct hellcreek_fdb_entry udp6_p2p = {
    + /* MAC: 33-33-00-00-00-6B */
    + .mac = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x6b },
    + .portmask = 0x03, /* Management ports */
    + .age = 0,
    + .is_obt = 0,
    + .pass_blocked = 1,
    + .is_static = 1,
    + .reprio_tc = 6,
    + .reprio_en = 1,
    + };
    static struct hellcreek_fdb_entry stp = {
    /* MAC: 01-80-C2-00-00-00 */
    .mac = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 },
    @@ -1088,10 +1132,22 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek)
    int ret;

    mutex_lock(&hellcreek->reg_lock);
    - ret = __hellcreek_fdb_add(hellcreek, &ptp);
    + ret = __hellcreek_fdb_add(hellcreek, &l2_ptp);
    + if (ret)
    + goto out;
    + ret = __hellcreek_fdb_add(hellcreek, &udp4_ptp);
    + if (ret)
    + goto out;
    + ret = __hellcreek_fdb_add(hellcreek, &udp6_ptp);
    + if (ret)
    + goto out;
    + ret = __hellcreek_fdb_add(hellcreek, &l2_p2p);
    + if (ret)
    + goto out;
    + ret = __hellcreek_fdb_add(hellcreek, &udp4_p2p);
    if (ret)
    goto out;
    - ret = __hellcreek_fdb_add(hellcreek, &p2p);
    + ret = __hellcreek_fdb_add(hellcreek, &udp6_p2p);
    if (ret)
    goto out;
    ret = __hellcreek_fdb_add(hellcreek, &stp);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 23:09    [W:3.657 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site