Received: by 10.213.65.68 with SMTP id h4csp318720imn; Fri, 16 Mar 2018 04:16:25 -0700 (PDT) X-Google-Smtp-Source: AG47ELuu67/qFe1UBrey9syrAd6Ls5zBypwM7Wma2xgzhJDQJ1gFWkN8egFdy8KcYpz2fepqeGTj X-Received: by 2002:a17:902:341:: with SMTP id 59-v6mr1643402pld.407.1521198985662; Fri, 16 Mar 2018 04:16:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521198985; cv=none; d=google.com; s=arc-20160816; b=BjCkvh7ylCc4qsKnHoF3SgQuh9Q80LQc57IvbWvguJWES8uygL/NamCXuRC2uyT2xu EH0PAmViQIyJAxyFR6oqCKXJp/AIOD6NabUrYGDXP05bkEYPPd4NN3CPi9Yi8pSc/kgt ogkeWqvgrykj0S/oULbDUV5xKHdDiubNnvrIxj8KQr6lWWMG666kWdHNW5m9sQWpRLVq SiyVlcOX2Sr72fosWiEh4UtdB//cbTq6gMKOMB0SADRo98k9DzckmMraqFNHOjxzXjx6 +AKfp3E7YebtSyRxXe+2guE/5/c3ZqUn+iVCXTKaQhzhg/zXiW1cO0dnkx2aeLgigMaB afFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Hd4jLluu/rmW1fSqTScbgtA1/rwX1sLwEurNXkw5wKc=; b=RnKyFeYfFq27Pr2VxltXJcdub6I8Vy3TC1D9tuRLcTPB6qcV2kEG+nxwQHa0Z3sToO vczjR449F9Y9AgEku7zmEAAiSn9efHvHfxkCFTNPq2U/ZErA03oVNePmW241a70M9GRy Z2nSpaQ6WPEcGJ3sip27LfnI6VQUy1atzgtC5rVGmF4ALDtwprzfT9I3xK8R5EyIC8xB oSIhTg+Mt8pDqyRPxUguPy6035pEFmDco9yiqFjADOfa3dzu7UyaUbmJGrsbScAxaQmA nAo7U4M9fs5ipwj9hJCtkCF02ZyP8wC31n1ma+ZabAXe9aSpvvoaMy1ZYS77nIs8Zrwi /ucw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y4-v6si5979621pll.413.2018.03.16.04.16.11; Fri, 16 Mar 2018 04:16:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753786AbeCPLNp (ORCPT + 99 others); Fri, 16 Mar 2018 07:13:45 -0400 Received: from stargate.chelsio.com ([12.32.117.8]:19409 "EHLO stargate.chelsio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753793AbeCPLNN (ORCPT ); Fri, 16 Mar 2018 07:13:13 -0400 Received: from localhost (scalar.blr.asicdesigners.com [10.193.185.94]) by stargate.chelsio.com (8.13.8/8.13.8) with ESMTP id w2GBD162004195; Fri, 16 Mar 2018 04:13:01 -0700 From: Rahul Lakkireddy To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, kexec@lists.infradead.org Cc: davem@davemloft.net, ebiederm@xmission.com, akpm@linux-foundation.org, torvalds@linux-foundation.org, ganeshgr@chelsio.com, nirranjan@chelsio.com, indranil@chelsio.com, Rahul Lakkireddy Subject: [RFC v2 2/2] cxgb4: collect hardware dump in second kernel Date: Fri, 16 Mar 2018 16:42:05 +0530 Message-Id: <1521198725-13463-3-git-send-email-rahul.lakkireddy@chelsio.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1521198725-13463-1-git-send-email-rahul.lakkireddy@chelsio.com> References: <1521198725-13463-1-git-send-email-rahul.lakkireddy@chelsio.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Register callback to collect hardware/firmware dumps in second kernel before hardware/firmware is initialized. The dumps for each device will be available under /proc/crashdd/cxgb4/ directory in second kernel. Signed-off-by: Rahul Lakkireddy Signed-off-by: Ganesh Goudar --- v2: - Updated dump registration to the new API in patch 1. drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 4 ++++ drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c | 25 ++++++++++++++++++++++++ drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h | 3 +++ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 12 ++++++++++++ 4 files changed, 44 insertions(+) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h index b2df0ffb7c94..00201e98ad19 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h @@ -50,6 +50,7 @@ #include #include #include +#include #include #include "t4_chip_type.h" #include "cxgb4_uld.h" @@ -959,6 +960,9 @@ struct adapter { /* HMA */ struct hma_data hma; + + /* Dump buffer for collecting logs in kdump kernel */ + struct crashdd_data crashdd_buf; }; /* Support for "sched-class" command to allow a TX Scheduling Class to be diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c index 143686c60234..ce9f544781af 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c @@ -488,3 +488,28 @@ void cxgb4_init_ethtool_dump(struct adapter *adapter) adapter->eth_dump.version = adapter->params.fw_vers; adapter->eth_dump.len = 0; } + +static int cxgb4_cudbg_crashdd_collect(struct crashdd_data *data, void *buf) +{ + struct adapter *adap = container_of(data, struct adapter, crashdd_buf); + u32 len = data->size; + + return cxgb4_cudbg_collect(adap, buf, &len, CXGB4_ETH_DUMP_ALL); +} + +int cxgb4_cudbg_crashdd_add_dump(struct adapter *adap) +{ + struct crashdd_data *data = &adap->crashdd_buf; + u32 len; + + len = sizeof(struct cudbg_hdr) + + sizeof(struct cudbg_entity_hdr) * CUDBG_MAX_ENTITY; + len += CUDBG_DUMP_BUFF_SIZE; + + data->size = len; + snprintf(data->name, sizeof(data->name), "%s_%s", cxgb4_driver_name, + adap->name); + data->crashdd_callback = cxgb4_cudbg_crashdd_collect; + + return crashdd_add_dump(cxgb4_driver_name, data); +} diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h index ce1ac9a1c878..095c6f04357e 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h @@ -41,8 +41,11 @@ enum CXGB4_ETHTOOL_DUMP_FLAGS { CXGB4_ETH_DUMP_HW = (1 << 1), /* various FW and HW dumps */ }; +#define CXGB4_ETH_DUMP_ALL (CXGB4_ETH_DUMP_MEM | CXGB4_ETH_DUMP_HW) + u32 cxgb4_get_dump_length(struct adapter *adap, u32 flag); int cxgb4_cudbg_collect(struct adapter *adap, void *buf, u32 *buf_size, u32 flag); void cxgb4_init_ethtool_dump(struct adapter *adapter); +int cxgb4_cudbg_crashdd_add_dump(struct adapter *adap); #endif /* __CXGB4_CUDBG_H__ */ diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 5a349e1576cb..6a380bee85b8 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -5484,6 +5484,18 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (err) goto out_free_adapter; + if (is_kdump_kernel()) { + /* Collect hardware state and append to /proc/crashdd/cxgb4/ + * directory + */ + err = cxgb4_cudbg_crashdd_add_dump(adapter); + if (err) { + dev_warn(adapter->pdev_dev, + "Fail collecting crash driver dump, err: %d. Continuing\n", + err); + err = 0; + } + } if (!is_t4(adapter->params.chip)) { s_qpp = (QUEUESPERPAGEPF0_S + -- 2.14.1