From patchwork Wed Jul 15 16:40:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 235614 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp30332ilg; Wed, 15 Jul 2020 09:41:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4Y7jmLlDmyE/EN/isEvvtsdUiMfKAnu0A0eQYpMwn8DR4HgqLMolDsMgotf/UGAkNoufR X-Received: by 2002:a17:906:ca57:: with SMTP id jx23mr9753192ejb.256.1594831270361; Wed, 15 Jul 2020 09:41:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594831270; cv=none; d=google.com; s=arc-20160816; b=Kwd2Py/XP1gOVr4I5Vn2av06nPgCIRIXLZrk8k1RK3Mw9d9auCxq3hbvshSoHoGIUP NqZy/mONJyxrUFhE9UXsChL3kimP1W7w5GHitE2wxQ5kXfnywkrVz1AEyr/G4xItzmpP TcSsjM+1kUWJ5jFphTPOJLdwY7F3XJ2jPb0djDjjgeW02grOP9w6nwRVtdUQA7EZuqY1 1PKfElWXF5f6LB4li8MzCbphFrdaxNBlwm8oqw4lhoqBpinPn5T9HmSdJk8OF7lLhhTj 7OIylhSC/kQzaUgTkCHesiUIwzkVg16J2gLBLAFLrziknTfP7xHFeh90atjr7uieBog3 SPFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=DIxOOQwIi12wLQSGUItZsPXBRsZgdqTGMtvo+XZ3cO0=; b=pQHMYTXUKPsN2WvLft3h+FlyxHzItfPG1KOf8I+/Xu19xik3Fw/v6LtUEXEvoQMga9 pCsSgPWh8NZkwoiMx8lFe0Kmkdm9NTvAdy7B83g4nn16xZOnv2eKUhmlZvdS0PAtScI0 TMwdu+Cb6X6jcsJMGUzN9IzQV01z55lfNBFifKxw9DPO9AuxcVqtR12NVJcvEW5xbq+C Ofa4b79kApiYpHs4HbptZjVrR2IxMWyNJHAz2O02EEgc0UQnPAHGz/1/ZakBufsmuwOr pr+SwTqoJVjtMSELsyvnHaGNOBtvh4380ha9dw+rAXrlJTxcb4UyJIFyYFwib6+yWg5y tL2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=NZhwHN61; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w17si1332810ejq.743.2020.07.15.09.41.10; Wed, 15 Jul 2020 09:41:10 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=NZhwHN61; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727976AbgGOQlJ (ORCPT + 9 others); Wed, 15 Jul 2020 12:41:09 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:42676 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727118AbgGOQkd (ORCPT ); Wed, 15 Jul 2020 12:40:33 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 06FGeSZx003863; Wed, 15 Jul 2020 11:40:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1594831228; bh=DIxOOQwIi12wLQSGUItZsPXBRsZgdqTGMtvo+XZ3cO0=; h=From:To:Subject:Date:In-Reply-To:References; b=NZhwHN61v/ncEVgo2rqXdLJ8o4rLRxcozE3YA67zV6QxDBruQMl85vfgB5Rz6K9gi ek70TKamPKdje3jaMJrFE5IyHYe8+EvWI+hs7NT1WxC1bXqv3qtFL1/WdBjjGMbN/n vj30tYziXSyRGCyuU5QvM4T7Z8DEPJ11Fs0qlW1A= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 06FGeSCF031939; Wed, 15 Jul 2020 11:40:28 -0500 Received: from DLEE110.ent.ti.com (157.170.170.21) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 15 Jul 2020 11:40:28 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 15 Jul 2020 11:40:27 -0500 Received: from uda0868495.fios-router.home (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 06FGeCvh081717; Wed, 15 Jul 2020 11:40:26 -0500 From: Murali Karicheri To: , , , , , , , Subject: [net-next PATCH v2 9/9] net: prp: enhance debugfs to display PRP info Date: Wed, 15 Jul 2020 12:40:10 -0400 Message-ID: <20200715164012.1222-10-m-karicheri2@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715164012.1222-1-m-karicheri2@ti.com> References: <20200715164012.1222-1-m-karicheri2@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Print PRP specific information from node table as part of debugfs node table display. Also display the node as DAN-H or DAN-P depending on the info from node table. Signed-off-by: Murali Karicheri --- net/hsr/hsr_debugfs.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) -- 2.17.1 diff --git a/net/hsr/hsr_debugfs.c b/net/hsr/hsr_debugfs.c index c1932c0a15be..3b6f675bd55a 100644 --- a/net/hsr/hsr_debugfs.c +++ b/net/hsr/hsr_debugfs.c @@ -24,7 +24,7 @@ static struct dentry *hsr_debugfs_root_dir; static void print_mac_address(struct seq_file *sfp, unsigned char *mac) { - seq_printf(sfp, "%02x:%02x:%02x:%02x:%02x:%02x:", + seq_printf(sfp, "%02x:%02x:%02x:%02x:%02x:%02x ", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); } @@ -35,20 +35,32 @@ hsr_node_table_show(struct seq_file *sfp, void *data) struct hsr_priv *priv = (struct hsr_priv *)sfp->private; struct hsr_node *node; - seq_puts(sfp, "Node Table entries\n"); - seq_puts(sfp, "MAC-Address-A, MAC-Address-B, time_in[A], "); - seq_puts(sfp, "time_in[B], Address-B port\n"); + seq_printf(sfp, "Node Table entries for (%s) device\n", + (priv->prot_version == PRP_V1 ? "PRP" : "HSR")); + seq_puts(sfp, "MAC-Address-A, MAC-Address-B, time_in[A], "); + seq_puts(sfp, "time_in[B], Address-B port, "); + if (priv->prot_version == PRP_V1) + seq_puts(sfp, "SAN-A, SAN-B, DAN-P\n"); + else + seq_puts(sfp, "DAN-H\n"); + rcu_read_lock(); list_for_each_entry_rcu(node, &priv->node_db, mac_list) { /* skip self node */ if (hsr_addr_is_self(priv, node->macaddress_A)) continue; print_mac_address(sfp, &node->macaddress_A[0]); - seq_puts(sfp, " "); print_mac_address(sfp, &node->macaddress_B[0]); - seq_printf(sfp, "0x%lx, ", node->time_in[HSR_PT_SLAVE_A]); - seq_printf(sfp, "0x%lx ", node->time_in[HSR_PT_SLAVE_B]); - seq_printf(sfp, "0x%x\n", node->addr_B_port); + seq_printf(sfp, "%10lx, ", node->time_in[HSR_PT_SLAVE_A]); + seq_printf(sfp, "%10lx, ", node->time_in[HSR_PT_SLAVE_B]); + seq_printf(sfp, "%14x, ", node->addr_B_port); + + if (priv->prot_version == PRP_V1) + seq_printf(sfp, "%5x, %5x, %5x\n", + node->san_a, node->san_b, + (node->san_a == 0 && node->san_b == 0)); + else + seq_printf(sfp, "%5x\n", 1); } rcu_read_unlock(); return 0; @@ -57,7 +69,8 @@ hsr_node_table_show(struct seq_file *sfp, void *data) /* hsr_node_table_open - Open the node_table file * * Description: - * This routine opens a debugfs file node_table of specific hsr device + * This routine opens a debugfs file node_table of specific hsr + * or prp device */ static int hsr_node_table_open(struct inode *inode, struct file *filp)