From: Bjorn Helgaas <bhelgaas@google.com>
To: Borislav Petkov <bp@alien8.de>
Cc: LKML <linux-kernel@vger.kernel.org>, Borislav Petkov <bp@suse.de>,
Lance Ortiz <lance.ortiz@hp.com>, Tony Luck <tony.luck@intel.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linux-pci@vger.kernel.org
Subject: Re: [PATCH 1/2] PCI, AER: Add a TLP header print helper
Date: Mon, 16 Dec 2013 14:03:27 -0700 [thread overview]
Message-ID: <20131216210327.GA28662@google.com> (raw)
In-Reply-To: <1386515571-23252-1-git-send-email-bp@alien8.de>
On Sun, Dec 08, 2013 at 04:12:50PM +0100, Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
>
> ... and call it instead of duplicating the large printk format
> statement.
>
> No functionality change.
>
> Signed-off-by: Borislav Petkov <bp@suse.de>
I applied both of these to my pci/aer branch for v3.14, thanks!
Bjorn
> ---
> drivers/pci/pcie/aer/aerdrv_errprint.c | 44 ++++++++++++++++------------------
> 1 file changed, 21 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c
> index 2c7c9f5f592c..32efc5e0d2eb 100644
> --- a/drivers/pci/pcie/aer/aerdrv_errprint.c
> +++ b/drivers/pci/pcie/aer/aerdrv_errprint.c
> @@ -124,6 +124,21 @@ static const char *aer_agent_string[] = {
> "Transmitter ID"
> };
>
> +static void __print_tlp_header(struct pci_dev *dev,
> + struct aer_header_log_regs *t)
> +{
> + unsigned char *tlp = (unsigned char *)&t;
> +
> + dev_err(&dev->dev, " TLP Header:"
> + " %02x%02x%02x%02x %02x%02x%02x%02x"
> + " %02x%02x%02x%02x %02x%02x%02x%02x\n",
> + *(tlp + 3), *(tlp + 2), *(tlp + 1), *tlp,
> + *(tlp + 7), *(tlp + 6), *(tlp + 5), *(tlp + 4),
> + *(tlp + 11), *(tlp + 10), *(tlp + 9),
> + *(tlp + 8), *(tlp + 15), *(tlp + 14),
> + *(tlp + 13), *(tlp + 12));
> +}
> +
> static void __aer_print_error(struct pci_dev *dev,
> struct aer_err_info *info)
> {
> @@ -178,17 +193,8 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
>
> __aer_print_error(dev, info);
>
> - if (info->tlp_header_valid) {
> - unsigned char *tlp = (unsigned char *) &info->tlp;
> - dev_err(&dev->dev, " TLP Header:"
> - " %02x%02x%02x%02x %02x%02x%02x%02x"
> - " %02x%02x%02x%02x %02x%02x%02x%02x\n",
> - *(tlp + 3), *(tlp + 2), *(tlp + 1), *tlp,
> - *(tlp + 7), *(tlp + 6), *(tlp + 5), *(tlp + 4),
> - *(tlp + 11), *(tlp + 10), *(tlp + 9),
> - *(tlp + 8), *(tlp + 15), *(tlp + 14),
> - *(tlp + 13), *(tlp + 12));
> - }
> + if (info->tlp_header_valid)
> + __print_tlp_header(dev, &info->tlp);
> }
>
> if (info->id && info->error_dev_num > 1 && info->id == id)
> @@ -250,18 +256,10 @@ void cper_print_aer(struct pci_dev *dev, int cper_severity,
> if (aer_severity != AER_CORRECTABLE)
> dev_err(&dev->dev, "aer_uncor_severity: 0x%08x\n",
> aer->uncor_severity);
> - if (tlp_header_valid) {
> - const unsigned char *tlp;
> - tlp = (const unsigned char *)&aer->header_log;
> - dev_err(&dev->dev, "aer_tlp_header:"
> - " %02x%02x%02x%02x %02x%02x%02x%02x"
> - " %02x%02x%02x%02x %02x%02x%02x%02x\n",
> - *(tlp + 3), *(tlp + 2), *(tlp + 1), *tlp,
> - *(tlp + 7), *(tlp + 6), *(tlp + 5), *(tlp + 4),
> - *(tlp + 11), *(tlp + 10), *(tlp + 9),
> - *(tlp + 8), *(tlp + 15), *(tlp + 14),
> - *(tlp + 13), *(tlp + 12));
> - }
> +
> + if (tlp_header_valid)
> + __print_tlp_header(dev, &aer->header_log);
> +
> trace_aer_event(dev_name(&dev->dev), (status & ~mask),
> aer_severity);
> }
> --
> 1.8.4
>
prev parent reply other threads:[~2013-12-16 21:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-08 15:12 [PATCH 1/2] PCI, AER: Add a TLP header print helper Borislav Petkov
2013-12-08 15:12 ` [PATCH 2/2] PCI, AER: Clean up error printing code a bit Borislav Petkov
2013-12-08 16:05 ` [PATCH 1/2] PCI, AER: Add a TLP header print helper Joe Perches
2013-12-08 16:13 ` Borislav Petkov
2013-12-08 20:59 ` Joe Perches
2013-12-16 21:03 ` Bjorn Helgaas [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131216210327.GA28662@google.com \
--to=bhelgaas@google.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=lance.ortiz@hp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).