From: Bjorn Helgaas <helgaas@kernel.org>
To: Jacob Keller <jacob.e.keller@intel.com>
Cc: linux-pci@vger.kernel.org, netdev@vger.kernel.org,
Jakub Kicinski <kuba@kernel.org>,
David Miller <davem@davemloft.net>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
Michael Chan <michael.chan@broadcom.com>
Subject: Re: [PATCH v2 1/6] PCI: Introduce pci_get_dsn
Date: Wed, 4 Mar 2020 16:42:04 -0600 [thread overview]
Message-ID: <20200304224204.GA33207@google.com> (raw)
In-Reply-To: <20200303022506.1792776-2-jacob.e.keller@intel.com>
On Mon, Mar 02, 2020 at 06:25:00PM -0800, Jacob Keller wrote:
> Several device drivers read their Device Serial Number from the PCIe
> extended config space.
>
> Introduce a new helper function, pci_get_dsn(). This function reads the
> eight bytes of the DSN and returns them as a u64. If the capability does not
> exist for the device, the function returns 0.
>
> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Cc: Michael Chan <michael.chan@broadcom.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Looks good, thanks! Feel free to merge this via the net tree.
> ---
> drivers/pci/pci.c | 34 ++++++++++++++++++++++++++++++++++
> include/linux/pci.h | 5 +++++
> 2 files changed, 39 insertions(+)
>
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index d828ca835a98..03f50e706c0d 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -557,6 +557,40 @@ int pci_find_ext_capability(struct pci_dev *dev, int cap)
> }
> EXPORT_SYMBOL_GPL(pci_find_ext_capability);
>
> +/**
> + * pci_get_dsn - Read and return the 8-byte Device Serial Number
> + * @dev: PCI device to query
> + *
> + * Looks up the PCI_EXT_CAP_ID_DSN and reads the 8 bytes of the Device Serial
> + * Number.
> + *
> + * Returns the DSN, or zero if the capability does not exist.
> + */
> +u64 pci_get_dsn(struct pci_dev *dev)
> +{
> + u32 dword;
> + u64 dsn;
> + int pos;
> +
> + pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DSN);
> + if (!pos)
> + return 0;
> +
> + /*
> + * The Device Serial Number is two dwords offset 4 bytes from the
> + * capability position. The specification says that the first dword is
> + * the lower half, and the second dword is the upper half.
> + */
> + pos += 4;
> + pci_read_config_dword(dev, pos, &dword);
> + dsn = (u64)dword;
> + pci_read_config_dword(dev, pos + 4, &dword);
> + dsn |= ((u64)dword) << 32;
> +
> + return dsn;
> +}
> +EXPORT_SYMBOL_GPL(pci_get_dsn);
> +
> static int __pci_find_next_ht_cap(struct pci_dev *dev, int pos, int ht_cap)
> {
> int rc, ttl = PCI_FIND_CAP_TTL;
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index 3840a541a9de..d92cf2da1ae1 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -1045,6 +1045,8 @@ int pci_find_ht_capability(struct pci_dev *dev, int ht_cap);
> int pci_find_next_ht_capability(struct pci_dev *dev, int pos, int ht_cap);
> struct pci_bus *pci_find_next_bus(const struct pci_bus *from);
>
> +u64 pci_get_dsn(struct pci_dev *dev);
> +
> struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device,
> struct pci_dev *from);
> struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
> @@ -1699,6 +1701,9 @@ static inline int pci_find_next_capability(struct pci_dev *dev, u8 post,
> static inline int pci_find_ext_capability(struct pci_dev *dev, int cap)
> { return 0; }
>
> +static inline u64 pci_get_dsn(struct pci_dev *dev)
> +{ return 0; }
> +
> /* Power management related routines */
> static inline int pci_save_state(struct pci_dev *dev) { return 0; }
> static inline void pci_restore_state(struct pci_dev *dev) { }
> --
> 2.25.0.368.g28a2d05eebfb
>
next prev parent reply other threads:[~2020-03-04 22:42 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 [this message]
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 ` [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=20200304224204.GA33207@google.com \
--to=helgaas@kernel.org \
--cc=davem@davemloft.net \
--cc=jacob.e.keller@intel.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=kuba@kernel.org \
--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).