linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jacob Keller <jacob.e.keller@intel.com>
To: linux-pci@vger.kernel.org, netdev@vger.kernel.org,
	Bjorn Helgaas <bhelgaas@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>,
	David Miller <davem@davemloft.net>,
	Jacob Keller <jacob.e.keller@intel.com>,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [PATCH v2 5/6] ixgbe: Use pci_get_dsn()
Date: Mon,  2 Mar 2020 18:25:04 -0800	[thread overview]
Message-ID: <20200303022506.1792776-6-jacob.e.keller@intel.com> (raw)
In-Reply-To: <20200303022506.1792776-1-jacob.e.keller@intel.com>

Replace the open-coded implementation for reading the PCIe DSN with
pci_get_dsn().

The original code used a simple for-loop to read the bytes in order into
a buffer one byte at a time.

The pci_get_dsn() function returns the DSN as a u64, correctly ordering
the upper and lower 32 bit dwords. Simplify the display code by using
%016llX to display the u64 DSN.

This should have equivalent behavior on both Little and Big Endian
systems. The bus will have correctly ordered the dwords in the CPU
endian format, while pci_get_dsn() will correctly order the lower and
higher dwords into a u64.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
index ccd852ad62a4..d733165c4a2e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
@@ -968,8 +968,8 @@ int ixgbe_fcoe_get_hbainfo(struct net_device *netdev,
 {
 	struct ixgbe_adapter *adapter = netdev_priv(netdev);
 	struct ixgbe_hw *hw = &adapter->hw;
-	int i, pos;
-	u8 buf[8];
+	u64 dsn;
+	int i;
 
 	if (!info)
 		return -EINVAL;
@@ -985,17 +985,11 @@ int ixgbe_fcoe_get_hbainfo(struct net_device *netdev,
 	/* Serial Number */
 
 	/* Get the PCI-e Device Serial Number Capability */
-	pos = pci_find_ext_capability(adapter->pdev, PCI_EXT_CAP_ID_DSN);
-	if (pos) {
-		pos += 4;
-		for (i = 0; i < 8; i++)
-			pci_read_config_byte(adapter->pdev, pos + i, &buf[i]);
-
+	dsn = pci_get_dsn(adapter->pdev);
+	if (dsn)
 		snprintf(info->serial_number, sizeof(info->serial_number),
-			 "%02X%02X%02X%02X%02X%02X%02X%02X",
-			 buf[7], buf[6], buf[5], buf[4],
-			 buf[3], buf[2], buf[1], buf[0]);
-	} else
+			 "%016llX", dsn);
+	else
 		snprintf(info->serial_number, sizeof(info->serial_number),
 			 "Unknown");
 
-- 
2.25.0.368.g28a2d05eebfb


  parent reply	other threads:[~2020-03-03  2:25 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-27 22:36 [PATCH 0/5] pci: implement function to read Device Serial Number Jacob Keller
2020-02-27 22:36 ` [PATCH] ice-shared: add macro specifying max NVM offset Jacob Keller
2020-02-27 22:43   ` Jacob Keller
2020-02-27 22:36 ` [PATCH 1/5] pci: introduce pci_get_dsn Jacob Keller
2020-03-01  5:27   ` David Miller
2020-03-02 19:58     ` Jacob Keller
2020-03-02 22:25   ` Bjorn Helgaas
2020-03-02 22:33     ` Jacob Keller
2020-03-02 23:20       ` Bjorn Helgaas
2020-03-02 23:24         ` Jacob Keller
2020-03-02 23:39           ` Bjorn Helgaas
2020-03-03  2:24             ` [PATCH v2 0/6] PCI: Implement function to read Device Serial Number Jacob Keller
2020-03-03  2:25               ` [PATCH v2 1/6] PCI: Introduce pci_get_dsn Jacob Keller
2020-03-04 22:42                 ` Bjorn Helgaas
2020-03-03  2:25               ` [PATCH v2 2/6] bnxt_en: Use pci_get_dsn() Jacob Keller
2020-03-03  2:25               ` [PATCH v2 3/6] scsi: qedf: " Jacob Keller
2020-03-03  2:25               ` [PATCH v2 4/6] ice: " Jacob Keller
2020-03-03  2:25               ` Jacob Keller [this message]
2020-03-03  2:25               ` [PATCH v2 6/6] nfp: " Jacob Keller
2020-03-03  3:40                 ` Jakub Kicinski
2020-03-03 17:36                   ` Jacob Keller
2020-03-04 22:28               ` [PATCH v2 0/6] PCI: Implement function to read Device Serial Number David Miller
2020-03-06  1:30               ` David Miller
2020-02-27 22:36 ` [PATCH 2/5] bnxt_en: use pci_get_dsn Jacob Keller
2020-03-02 22:25   ` Bjorn Helgaas
2020-02-27 22:36 ` [PATCH 3/5] scsi: qedf: " Jacob Keller
2020-02-27 22:36 ` [PATCH 4/5] ice: " Jacob Keller
2020-02-27 22:36 ` [PATCH 5/5] ixgbe: " Jacob Keller

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=20200303022506.1792776-6-jacob.e.keller@intel.com \
    --to=jacob.e.keller@intel.com \
    --cc=bhelgaas@google.com \
    --cc=davem@davemloft.net \
    --cc=jeffrey.t.kirsher@intel.com \
    --cc=kuba@kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /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).