From patchwork Tue Dec 18 19:06:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Didelot X-Patchwork-Id: 1015569 X-Patchwork-Delegate: linville@tuxdriver.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NiFvbGmo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43K6vt39grz9rxp for ; Wed, 19 Dec 2018 06:07:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726788AbeLRTHF (ORCPT ); Tue, 18 Dec 2018 14:07:05 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:35696 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726536AbeLRTHC (ORCPT ); Tue, 18 Dec 2018 14:07:02 -0500 Received: by mail-qt1-f194.google.com with SMTP id v11so19481732qtc.2 for ; Tue, 18 Dec 2018 11:07:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3YuT0NKixSBxQ9RVcjV0S9FAjxMPDaKFK8u+DYpndYY=; b=NiFvbGmoaOviDSKHCsgWhUgAPDBXjaO/o4nvMweyiC5+ri735rc86SYt/8KWOomYCX 6EPKVdB3faHGYxlODEk5vilMgSkfPAeejMusf/9/iiM1GTndKJ+aF6eCeYMnk6goL8Ia IWDz3GvcKUKfrskQwt1GKFJEjTBoDKM1G8YBVA7FiKF9dNW9vNoQYOTMmF6VmDZ0pKfH QWX/P1KYBqk8SvNScq/4Mo6H/sACe++zVGip6ysBB1KVLwvTyu7KexX92JSbW5vLNBtj HSoRYckFfMub/Iy/yc1tW6l5TY5yosYGi1fz073BUOEBYlnKMlXodr9AfjjkXfBVbIVF hksQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3YuT0NKixSBxQ9RVcjV0S9FAjxMPDaKFK8u+DYpndYY=; b=DtCzMfCISd5POV6+ybgRVE1rOMpp/eA1CWrYUDdKj7VVxfsHeTkCPrDZkpr8hRXT4z gABaAuROY3qPi0ZnrlZjl2ExZMWz00/NOOF56D9ri83dPjchlss4BPH1BPJxq6/ZUlbU jVNzj+DNBML41l5mAvQNs5a01nkK900WxOtmVz1xJfTUgciDNcS9LWV7j/zNTplXIo52 R5Sb6YQA8FUX8uJ6qZGPHp7nyS8G5za3UUhAznzsmS/JKrhRIduLi1XaP5BMTZbpI/x4 kfBTMeCWUauKOe0gxKERw7HYLPq1o7O2NDrWsujv6mviKMC6GT2XxY48kkVrLPMO9IAP 08lQ== X-Gm-Message-State: AA+aEWYZ2tJ14zIU0H9alQUVUlLVgpEV/AqxcakRdZspnsQ5zvDKO/hJ MJ5Avgynx6PNVeZ7Sx1+XQpatVSpPv4= X-Google-Smtp-Source: AFSGD/VxF70kjv8x2w5HJpwOEKSFohuLCMU9IeO9fFn5PGi3wHIH782VJtpf8q7cJRiVX6vKkGffig== X-Received: by 2002:a0c:c584:: with SMTP id a4mr18361690qvj.227.1545160021866; Tue, 18 Dec 2018 11:07:01 -0800 (PST) Received: from localhost (modemcable249.105-163-184.mc.videotron.ca. [184.163.105.249]) by smtp.gmail.com with ESMTPSA id v32sm648783qta.37.2018.12.18.11.07.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Dec 2018 11:07:01 -0800 (PST) From: Vivien Didelot To: netdev@vger.kernel.org Cc: Chris Healy , Vivien Didelot , "John W . Linville" , f.fainelli@gmail.com, andrew@lunn.ch Subject: [PATCH v2 2/7] ethtool: dsa: mv88e6xxx: add pretty dump Date: Tue, 18 Dec 2018 14:06:36 -0500 Message-Id: <20181218190641.31883-3-vivien.didelot@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181218190641.31883-1-vivien.didelot@gmail.com> References: <20181218190641.31883-1-vivien.didelot@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The mv88e6xxx DSA driver supports many Marvell devices all using 32 registers of 16 bits. However each devices have a slightly different register definition. This patch adds the boilerplate for providing an optional function per mv88e6xxx switch. It does not pretty dump anything yet. Signed-off-by: Vivien Didelot --- dsa.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dsa.c b/dsa.c index 83396b5..5de60b2 100644 --- a/dsa.c +++ b/dsa.c @@ -3,9 +3,86 @@ #include "internal.h" +/* Macros and dump functions for the 16-bit mv88e6xxx per-port registers */ + +#define REG(_reg, _name, _val) \ + printf("%.02u: %-38.38s 0x%.4x\n", _reg, _name, _val) + +#define FIELD(_name, _fmt, ...) \ + printf(" %-36.36s " _fmt "\n", _name, ##__VA_ARGS__) + +#define FIELD_BITMAP(_name, _val) \ + FIELD(_name, "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", \ + ((_val) & 0x0001) ? "0 " : "", \ + ((_val) & 0x0002) ? "1 " : "", \ + ((_val) & 0x0004) ? "2 " : "", \ + ((_val) & 0x0008) ? "3 " : "", \ + ((_val) & 0x0010) ? "4 " : "", \ + ((_val) & 0x0020) ? "5 " : "", \ + ((_val) & 0x0040) ? "6 " : "", \ + ((_val) & 0x0080) ? "7 " : "", \ + ((_val) & 0x0100) ? "8 " : "", \ + ((_val) & 0x0200) ? "9 " : "", \ + ((_val) & 0x0400) ? "10 " : "", \ + ((_val) & 0x0800) ? "11 " : "", \ + ((_val) & 0x1000) ? "12 " : "", \ + ((_val) & 0x2000) ? "13 " : "", \ + ((_val) & 0x4000) ? "14 " : "", \ + ((_val) & 0x8000) ? "15 " : "") + +struct dsa_mv88e6xxx_switch { + void (*dump)(int reg, u16 val); + const char *name; + u16 id; +}; + +static const struct dsa_mv88e6xxx_switch dsa_mv88e6xxx_switches[] = { +}; + +static int dsa_mv88e6xxx_dump_regs(struct ethtool_regs *regs) +{ + const struct dsa_mv88e6xxx_switch *sw = NULL; + const u16 *data = (u16 *)regs->data; + u16 id; + int i; + + /* Marvell chips have 32 per-port 16-bit registers */ + if (regs->len < 32 * 2) + return 1; + + id = regs->version & 0xfff0; + + for (i = 0; i < ARRAY_SIZE(dsa_mv88e6xxx_switches); i++) { + if (id == dsa_mv88e6xxx_switches[i].id) { + sw = &dsa_mv88e6xxx_switches[i]; + break; + } + } + + if (!sw) + return 1; + + printf("%s Switch Port Registers\n", sw->name); + printf("------------------------------\n"); + + for (i = 0; i < 32; i++) + if (sw->dump) + sw->dump(i, data[i]); + else + REG(i, "", data[i]); + + return 0; +} + +#undef FIELD_BITMAP +#undef FIELD +#undef REG + int dsa_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) { /* DSA per-driver register dump */ + if (!dsa_mv88e6xxx_dump_regs(regs)) + return 0; /* Fallback to hexdump */ return 1;