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>,
Michael Chan <michael.chan@broadcom.com>
Subject: [PATCH 2/5] bnxt_en: use pci_get_dsn
Date: Thu, 27 Feb 2020 14:36:32 -0800 [thread overview]
Message-ID: <20200227223635.1021197-4-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: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 597e6fd5bfea..55f078fc067e 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -11755,20 +11755,14 @@ static int bnxt_init_mac_addr(struct bnxt *bp)
static int bnxt_pcie_dsn_get(struct bnxt *bp, u8 dsn[])
{
struct pci_dev *pdev = bp->pdev;
- int pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_DSN);
- u32 dw;
+ int err;
- if (!pos) {
+ err = pci_get_dsn(pdev, dsn);
+ if (err) {
netdev_info(bp->dev, "Unable do read adapter's DSN");
- return -EOPNOTSUPP;
+ return err;
}
- /* DSN (two dw) is at an offset of 4 from the cap pos */
- pos += 4;
- pci_read_config_dword(pdev, pos, &dw);
- put_unaligned_le32(dw, &dsn[0]);
- pci_read_config_dword(pdev, pos + 4, &dw);
- put_unaligned_le32(dw, &dsn[4]);
bp->flags |= BNXT_FLAG_DSN_VALID;
return 0;
}
--
2.25.0.368.g28a2d05eebfb
next prev 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 ` Jacob Keller [this message]
2020-03-02 22:25 ` [PATCH 2/5] bnxt_en: use pci_get_dsn 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=20200227223635.1021197-4-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=linux-pci@vger.kernel.org \
--cc=michael.chan@broadcom.com \
--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).