All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jacob Keller <jacob.e.keller@intel.com>
To: linux-pci@vger.kernel.org, netdev@vger.kernel.org
Cc: Jacob Keller <jacob.e.keller@intel.com>,
	QLogic-Storage-Upstream@cavium.com
Subject: [PATCH 3/5] scsi: qedf: use pci_get_dsn
Date: Thu, 27 Feb 2020 14:36:33 -0800	[thread overview]
Message-ID: <20200227223635.1021197-5-jacob.e.keller@intel.com> (raw)
In-Reply-To: <20200227223635.1021197-1-jacob.e.keller@intel.com>

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

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Cc: QLogic-Storage-Upstream@cavium.com
---
 drivers/scsi/qedf/qedf_main.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index 604856e72cfb..6ef688ef465c 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -1578,7 +1578,7 @@ static void qedf_setup_fdmi(struct qedf_ctx *qedf)
 	struct fc_lport *lport = qedf->lport;
 	struct fc_host_attrs *fc_host = shost_to_fc_host(lport->host);
 	u8 buf[8];
-	int i, pos;
+	int i, err;
 
 	/*
 	 * fdmi_enabled needs to be set for libfc to execute FDMI registration.
@@ -1591,20 +1591,16 @@ static void qedf_setup_fdmi(struct qedf_ctx *qedf)
 	 */
 
 	/* Get the PCI-e Device Serial Number Capability */
-	pos = pci_find_ext_capability(qedf->pdev, PCI_EXT_CAP_ID_DSN);
-	if (pos) {
-		pos += 4;
-		for (i = 0; i < 8; i++)
-			pci_read_config_byte(qedf->pdev, pos + i, &buf[i]);
-
+	err = pci_get_dsn(qedf->pdev, buf);
+	if (err)
+		snprintf(fc_host->serial_number,
+		    sizeof(fc_host->serial_number), "Unknown");
+	else
 		snprintf(fc_host->serial_number,
 		    sizeof(fc_host->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
-		snprintf(fc_host->serial_number,
-		    sizeof(fc_host->serial_number), "Unknown");
 
 	snprintf(fc_host->manufacturer,
 	    sizeof(fc_host->manufacturer), "%s", "Cavium Inc.");
-- 
2.25.0.368.g28a2d05eebfb


  parent reply	other threads:[~2020-02-27 22:36 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               ` [PATCH v2 5/6] ixgbe: " Jacob Keller
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 ` Jacob Keller [this message]
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=20200227223635.1021197-5-jacob.e.keller@intel.com \
    --to=jacob.e.keller@intel.com \
    --cc=QLogic-Storage-Upstream@cavium.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.