From patchwork Mon Jul 20 16:58:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 237568 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2153159ilg; Mon, 20 Jul 2020 09:58:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtqfUGlXvWM562UH7QJuMDSYakUdbcLuUMn5dxFfkHTPBg29zlJggStdrOwo/sjiFTTPAH X-Received: by 2002:aa7:d353:: with SMTP id m19mr21529896edr.75.1595264312154; Mon, 20 Jul 2020 09:58:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595264312; cv=none; d=google.com; s=arc-20160816; b=XnGY7D6/70TIcwYdPoGynRzmu0nad9tRKkJ9H8KoLgBIQkQVzGETMoBU/mm4zDrASk m6FO3WNMe25eEinQmncFiEAScrBLjjZRKTBCZhFt9jq7w/CccyZRj24olRWp7rbTLEbJ El7L5mEYPPwImqz1nklJ/RwjO82/an6/3rmH8085Q2/fd952t+0lGAeWfwmwFIOdBF4Z hwgG3ZRMaOn94tK3fxtsnv5NwroYCeF2EcL8FAeaKbHUA2aZMFuAEZSj0GBJZe2Moa43 BaJAPu0RElJ1iLzVrMxZx+CwegGQ36Z+8+XGVqOvzpWPBBHYcAhm7fL45pcR1RLxmEZi lP3w== 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=mgGEFeWJ6Yw9Ud+h5pGsNV65dyZ3DoOrw98ULKaVVNzqtizd0LyyNsc3GA8NYKq0QK wPn7uJxgGYUB88VRtZq6ENhUoxRid23YUNUdsVtmMzHlZ/PCIU0rK/5QvolJbNoBB64h xS3WVUEtRQBGxdniJd/GtLqimjMqtFYUvFNhIxwovRZsS66IFbiY30/1AxKS8ugSg4HN qnfP0dKnZ7Tv12wSs3uPIsFI5iD/mV7s5Zdhf2M9r1yUJTPJCVnWqaeSiJtQ2yHGe4FP qtdaeghujsW9VcQ4fYwaUetrL0Hvik9wos8xfM0UCtYeUuUTF0wh01cAIfBhDuoOEUaN VUZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=wKiGe2St; 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 br6si10308717ejb.203.2020.07.20.09.58.32; Mon, 20 Jul 2020 09:58:32 -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=wKiGe2St; 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 S1731815AbgGTQ6R (ORCPT + 9 others); Mon, 20 Jul 2020 12:58:17 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:40030 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729941AbgGTQ6M (ORCPT ); Mon, 20 Jul 2020 12:58:12 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 06KGw8kP027292; Mon, 20 Jul 2020 11:58:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1595264288; bh=DIxOOQwIi12wLQSGUItZsPXBRsZgdqTGMtvo+XZ3cO0=; h=From:To:Subject:Date:In-Reply-To:References; b=wKiGe2StgYD0Ho62RfoMEE3WDkCa4W4YdsU9G37VuQB3aKrxg4a/NvrcB3X4N+ZE1 Z0MHjHlQP9IRj7XvOG8N/h9vAlWc7ncTheS+b5swlWeZAfkznOmQdCx1EnDrTziDEa lYQr2yqzS5hAi4BFj7KDftQ8vVQ3HkbpjGoy5iOc= Received: from DFLE115.ent.ti.com (dfle115.ent.ti.com [10.64.6.36]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 06KGw8M2118536; Mon, 20 Jul 2020 11:58:08 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Mon, 20 Jul 2020 11:58:08 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE100.ent.ti.com (10.64.6.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; Mon, 20 Jul 2020 11:58:08 -0500 Received: from uda0868495.fios-router.home (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 06KGw3BA041101; Mon, 20 Jul 2020 11:58:07 -0500 From: Murali Karicheri To: , , , , , , , Subject: [net-next v4 PATCH 7/7] net: prp: enhance debugfs to display PRP info Date: Mon, 20 Jul 2020 12:58:03 -0400 Message-ID: <20200720165803.17793-8-m-karicheri2@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200720165803.17793-1-m-karicheri2@ti.com> References: <20200720165803.17793-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)