From patchwork Thu Mar 29 21:24:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Alex G." X-Patchwork-Id: 10316259 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8178C60353 for ; Thu, 29 Mar 2018 21:24:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66B202A50A for ; Thu, 29 Mar 2018 21:24:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57CBC2A51B; Thu, 29 Mar 2018 21:24:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 029252A50A for ; Thu, 29 Mar 2018 21:24:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751938AbeC2VYq (ORCPT ); Thu, 29 Mar 2018 17:24:46 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:44398 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbeC2VYp (ORCPT ); Thu, 29 Mar 2018 17:24:45 -0400 Received: by mail-oi0-f65.google.com with SMTP id j143-v6so6350525oih.11 for ; Thu, 29 Mar 2018 14:24:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mlECclIEnXTd5s1aYon+NIwWg9V5pAqmTRDwhphLObg=; b=FKx6a+v8hSSuHugEY124g0rVSdNhxTunfUxwDiW++RcSxdReDRWlgMnOYMpYxfB0Zw Bpf1CQeroZ+Ed+o2l42CaY65AFdImMuC9kq/VBWcWazbEZOu2tbIDmI+fSf33gKKqO4Q +hPo1Adp9AteQRdjH9DLKD+EchYoByTVJCPgNh/kzt4QKVhZ9kUbcTlo608XDZZ0m0u1 56LmYF7CfhEtImlguatkNyhCXgQuEFOF+dMpxgdhszybxo1ROkLjYgWsTeFXjthPBF+K Fg6uyAM7oalxxHWD2bpUbNxuo+tjZRdpzkMcjPPE3SKdbxoVH9N0Pm0Y0jpABDDTzlBQ artg== 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; bh=mlECclIEnXTd5s1aYon+NIwWg9V5pAqmTRDwhphLObg=; b=pZ2eHySdHOjNazR+AvNMFckF6Niseft2+vBzhFWxSXKFs38LLiyT77Yx9qyGyDXGhb e4rAlmkooMXdcTXj8kJvWZwH3yX+RiWU4/WNCi9OCPegnh1Cefnmj7B3wLmrvKYLV0s9 elP6Ka/r7oqC90ZsnL6XHKwZB3/9A9I7P1HKoPm0qkQ6C6xwOwei7ZxOQPP8szJ4NYC9 5AeXB6JxVpPoyETobytMI6RF13Reut+tEw13j9SM1uoc12vvEmXUAdP2x6nnM+yf6EQb UQrR2dkKWIlD7Adczr1ohoLzKqpMVqQrKsz8wrkJcC8AYZ/IFZJZWpmt4HHM6vr6IIGS q+BQ== X-Gm-Message-State: AElRT7EzJzmZTJdqhQqU15Fkphs84JciI/HagDbfmTPidz/rZSn0NlQv FClwGPVmmPkugx3Sn1Y2AScJKXET X-Google-Smtp-Source: AIpwx492JLIjfiQRi+w5CyQfbClASSGBegqsF2V1zdOboxT0SuODPwURYJyXn9AW4MgHq2cMYjmLcA== X-Received: by 10.202.172.82 with SMTP id v79mr5654813oie.329.1522358684769; Thu, 29 Mar 2018 14:24:44 -0700 (PDT) Received: from nuclearis2_1.lan (c-98-197-2-30.hsd1.tx.comcast.net. [98.197.2.30]) by smtp.gmail.com with ESMTPSA id l3-v6sm4040053ote.41.2018.03.29.14.24.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Mar 2018 14:24:44 -0700 (PDT) From: Alexandru Gagniuc To: linux-pci@vger.kernel.org Cc: alex_gagniuc@dellteam.com, austin_bolen@dellteam.com, bhelgaas@google.com, fred@fredlawl.com, gregkh@linuxfoundation.org, Alexandru Gagniuc Subject: [PATCH] PCI/AER: Use a common function to print AER error bits Date: Thu, 29 Mar 2018 16:24:35 -0500 Message-Id: <20180329212435.13277-1-mr.nuke.me@gmail.com> X-Mailer: git-send-email 2.14.3 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On errors reported from CPER, cper_print_bits() was used to log the AER bits. This resulted in hard-to-understand messages, without a prefix. Instead use __aer_print_error() for both native AER and CPER to provide a more consistent log format. Signed-off-by: Alexandru Gagniuc --- drivers/pci/pcie/aer/aerdrv_errprint.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c index 6a352e638699..7cef8492c6d8 100644 --- a/drivers/pci/pcie/aer/aerdrv_errprint.c +++ b/drivers/pci/pcie/aer/aerdrv_errprint.c @@ -219,28 +219,30 @@ EXPORT_SYMBOL_GPL(cper_severity_to_aer); void cper_print_aer(struct pci_dev *dev, int aer_severity, struct aer_capability_regs *aer) { - int layer, agent, status_strs_size, tlp_header_valid = 0; + int layer, agent, tlp_header_valid = 0; u32 status, mask; - const char **status_strs; + struct aer_err_info info; if (aer_severity == AER_CORRECTABLE) { status = aer->cor_status; mask = aer->cor_mask; - status_strs = aer_correctable_error_string; - status_strs_size = ARRAY_SIZE(aer_correctable_error_string); } else { status = aer->uncor_status; mask = aer->uncor_mask; - status_strs = aer_uncorrectable_error_string; - status_strs_size = ARRAY_SIZE(aer_uncorrectable_error_string); tlp_header_valid = status & AER_LOG_TLP_MASKS; } layer = AER_GET_LAYER_ERROR(aer_severity, status); agent = AER_GET_AGENT(aer_severity, status); + memset(&info, 0, sizeof(info)); + info.severity = aer_severity; + info.status = status; + info.mask = mask; + info.first_error = 0x1f; + pci_err(dev, "aer_status: 0x%08x, aer_mask: 0x%08x\n", status, mask); - cper_print_bits("", status, status_strs, status_strs_size); + __aer_print_error(dev, &info); pci_err(dev, "aer_layer=%s, aer_agent=%s\n", aer_error_layer[layer], aer_agent_string[agent]);