From patchwork Fri Jul 17 15:15:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 235722 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1796532ilg; Fri, 17 Jul 2020 08:15:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzoDy11lHush2ykF+PjnmisFhqjhhdHtuKxQ+9M+X1pPna3e7ajyBdQBEHwzxMe3Pzcs86T X-Received: by 2002:a17:906:a156:: with SMTP id bu22mr8792333ejb.322.1594998953001; Fri, 17 Jul 2020 08:15:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594998952; cv=none; d=google.com; s=arc-20160816; b=azU0tfFoyfHJ0eWRqFVPzankIJrxQKISH8D+yTUHw0ohuN5dqMiHKg+ETqQgj0n4+u 70jCiIQyjCWet0fofr3UIU/FH/tYRI8mfWvBFtQMJNiNwdt78+RcKpyBcQC7mtnjbmnw eqNbm0y7R6g32h0KeAu45tN6EthVByJHSinaFo+2nNhxKrYGQRSedxDCNLaFFHvZgoHl vMZ3qj+Tw5e/Rg2WCdXzGaEACMnZzRE2jFAccRq1LBvg0+PsH9ZooRezdNXKnw8lB7le my6x5U+oXF7agrvLRUazaP7wdHyngODCv16xFZqkBJHZUzbnMnEBLrSqwyRWqxvMSxeq JGew== 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=WxDEtRm3a/wa33jldX0CGrGTdA+ypUuGGB7IfYVd2+D541AOmVsA5lgoxGZ7K5ztOK ZVHQykrfCfnetL1x1UURHOWz0mTlIoHqtGfjdEl0MaO19ucp+Qur3tMmhKOI791JkUcB PjWMVNsBr6B/crkoh74Pn1mIe6421ffXmzn9dxX1sW9O/M4jWwvOJqRFyy63fJmIBKxc djiR4VO7F73Pf7StjakBVpcVU6dDgIFZoGPjnk6T3CJ/g8nXEA2AW7EbRwQYAzdD4pQH UsfgNzImx1nUWsPcGTvhAW5z7dOlYlAl959VisPBkM2UUvIomuciEBPVtGpDStsUcQFh Rrqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=w2fO94op; 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 by7si5185311edb.303.2020.07.17.08.15.52; Fri, 17 Jul 2020 08:15:52 -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=w2fO94op; 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 S1728001AbgGQPPn (ORCPT + 9 others); Fri, 17 Jul 2020 11:15:43 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:43452 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726882AbgGQPPT (ORCPT ); Fri, 17 Jul 2020 11:15:19 -0400 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 06HFFG9X085664; Fri, 17 Jul 2020 10:15:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1594998916; bh=DIxOOQwIi12wLQSGUItZsPXBRsZgdqTGMtvo+XZ3cO0=; h=From:To:Subject:Date:In-Reply-To:References; b=w2fO94opv0/Uwfz0x4+DtoAI4aD3rmGw9JNtkUNj8emS9MEzzs1VscwQOrqcloP9W f8Szq6TX1KYK8mnf/ANcHlGVpt5jtf9To8QQLVjEITvVd6k6WrOTIW6h2u36eZi2XK BlbqvXUga1l5lrXVFPLBovjcw7kWpMW0qCDki7d8= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 06HFFFwu069299 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 17 Jul 2020 10:15:15 -0500 Received: from DLEE110.ent.ti.com (157.170.170.21) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Fri, 17 Jul 2020 10:15:15 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) 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; Fri, 17 Jul 2020 10:15:15 -0500 Received: from uda0868495.fios-router.home (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 06HFFBmj010522; Fri, 17 Jul 2020 10:15:15 -0500 From: Murali Karicheri To: , , , , , , , Subject: [net-next PATCH v3 7/7] net: prp: enhance debugfs to display PRP info Date: Fri, 17 Jul 2020 11:15:11 -0400 Message-ID: <20200717151511.329-8-m-karicheri2@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200717151511.329-1-m-karicheri2@ti.com> References: <20200717151511.329-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)