From: Bjorn Helgaas <helgaas@kernel.org>
To: Easwar Hariharan <eahariha@linux.microsoft.com>
Cc: vkuznets@redhat.com, Deepak Rawat <drawat.floss@gmail.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Helge Deller <deller@gmx.de>, Bjorn Helgaas <bhelgaas@google.com>,
Easwar Hariharan <easwar.hariharan@microsoft.com>,
Colin Ian King <colin.i.king@googlemail.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
"open list:DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE"
<linux-hyperv@vger.kernel.org>,
"open list:DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE"
<dri-devel@lists.freedesktop.org>,
open list <linux-kernel@vger.kernel.org>,
"open list:NETWORKING DRIVERS" <netdev@vger.kernel.org>,
"open list:FRAMEBUFFER LAYER" <linux-fbdev@vger.kernel.org>,
"open list:PCI SUBSYSTEM" <linux-pci@vger.kernel.org>
Subject: Re: [PATCH v2 2/2] pci_ids: Add the various Microsoft PCI device IDs
Date: Fri, 9 Sep 2022 14:38:49 -0500 [thread overview]
Message-ID: <20220909193849.GA309868@bhelgaas> (raw)
In-Reply-To: <1662749425-3037-3-git-send-email-eahariha@linux.microsoft.com>
Please follow the PCI subject line conventions. Discover it with
"git log --oneline include/linux/pci_ids.h".
On Fri, Sep 09, 2022 at 11:50:25AM -0700, Easwar Hariharan wrote:
> From: Easwar Hariharan <easwar.hariharan@microsoft.com>
>
Needs a commit log, even if it is nothing more than the subject line.
Also read the top of include/linux/pci_ids.h, because it looks like
some of these are only used in one driver and hence do not need to be
in pci_ids.h.
> Signed-off-by: Easwar Hariharan <easwar.hariharan@microsoft.com>
> ---
> drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 2 +-
> drivers/net/ethernet/microsoft/mana/gdma.h | 3 ---
> drivers/net/ethernet/microsoft/mana/gdma_main.c | 6 +++---
> drivers/video/fbdev/hyperv_fb.c | 4 ++--
> include/linux/pci_ids.h | 4 +++-
> 5 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
> index f84d397..24c2def 100644
> --- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
> +++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
> @@ -51,7 +51,7 @@ static void hyperv_pci_remove(struct pci_dev *pdev)
> static const struct pci_device_id hyperv_pci_tbl[] = {
> {
> .vendor = PCI_VENDOR_ID_MICROSOFT,
> - .device = PCI_DEVICE_ID_HYPERV_VIDEO,
> + .device = PCI_DEVICE_ID_MICROSOFT_HYPERV_VIDEO,
> },
> { /* end of list */ }
> };
> diff --git a/drivers/net/ethernet/microsoft/mana/gdma.h b/drivers/net/ethernet/microsoft/mana/gdma.h
> index 4a6efe6..9d3a9f7 100644
> --- a/drivers/net/ethernet/microsoft/mana/gdma.h
> +++ b/drivers/net/ethernet/microsoft/mana/gdma.h
> @@ -476,9 +476,6 @@ struct gdma_eqe {
>
> #define GDMA_SRIOV_REG_CFG_BASE_OFF 0x108
>
> -#define MANA_PF_DEVICE_ID 0x00B9
> -#define MANA_VF_DEVICE_ID 0x00BA
> -
> struct gdma_posted_wqe_info {
> u32 wqe_size_in_bu;
> };
> diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c
> index 00d8198..18cf168 100644
> --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
> +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
> @@ -1333,7 +1333,7 @@ static void mana_gd_cleanup(struct pci_dev *pdev)
>
> static bool mana_is_pf(unsigned short dev_id)
> {
> - return dev_id == MANA_PF_DEVICE_ID;
> + return dev_id == PCI_DEVICE_ID_MICROSOFT_MANA_PF;
> }
>
> static int mana_gd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> @@ -1466,8 +1466,8 @@ static void mana_gd_shutdown(struct pci_dev *pdev)
> }
>
> static const struct pci_device_id mana_id_table[] = {
> - { PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, MANA_PF_DEVICE_ID) },
> - { PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, MANA_VF_DEVICE_ID) },
> + { PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, PCI_DEVICE_ID_MICROSOFT_MANA_PF) },
> + { PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, PCI_DEVICE_ID_MICROSOFT_MANA_VF) },
> { }
> };
>
> diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
> index b58b445..118e244 100644
> --- a/drivers/video/fbdev/hyperv_fb.c
> +++ b/drivers/video/fbdev/hyperv_fb.c
> @@ -997,7 +997,7 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
>
> if (!gen2vm) {
> pdev = pci_get_device(PCI_VENDOR_ID_MICROSOFT,
> - PCI_DEVICE_ID_HYPERV_VIDEO, NULL);
> + PCI_DEVICE_ID_MICROSOFT_HYPERV_VIDEO, NULL);
> if (!pdev) {
> pr_err("Unable to find PCI Hyper-V video\n");
> return -ENODEV;
> @@ -1311,7 +1311,7 @@ static int hvfb_resume(struct hv_device *hdev)
> static const struct pci_device_id pci_stub_id_table[] = {
> {
> .vendor = PCI_VENDOR_ID_MICROSOFT,
> - .device = PCI_DEVICE_ID_HYPERV_VIDEO,
> + .device = PCI_DEVICE_ID_MICROSOFT_HYPERV_VIDEO,
> },
> { /* end of list */ }
> };
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 15b49e6..fe3517f 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2080,7 +2080,9 @@
> #define PCI_DEVICE_ID_VT1724 0x1724
>
> #define PCI_VENDOR_ID_MICROSOFT 0x1414
> -#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353
> +#define PCI_DEVICE_ID_MICROSOFT_HYPERV_VIDEO 0x5353
> +#define PCI_DEVICE_ID_MICROSOFT_MANA_PF 0x00B9
> +#define PCI_DEVICE_ID_MICROSOFT_MANA_VF 0x00BA
>
> #define PCI_VENDOR_ID_OXSEMI 0x1415
> #define PCI_DEVICE_ID_OXSEMI_12PCI840 0x8403
> --
> 1.8.3.1
>
next prev parent reply other threads:[~2022-09-09 19:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-08 22:05 [PATCH 1/3] hv: Use PCI_VENDOR_ID_MICROSOFT for better discoverability eahariha
2022-09-08 22:05 ` [PATCH 2/3] pci_ids: Add Microsoft PCI Vendor ID, and remove redundant definitions eahariha
2022-09-09 14:01 ` Vitaly Kuznetsov
[not found] ` <1662749425-3037-1-git-send-email-eahariha@linux.microsoft.com>
2022-09-09 18:50 ` [PATCH v2 1/2] hv: Use PCI_VENDOR_ID_MICROSOFT for better discoverability Easwar Hariharan
2022-09-12 14:53 ` Wei Liu
2022-09-19 19:39 ` Easwar Hariharan
2022-09-09 18:50 ` [PATCH v2 2/2] pci_ids: Add the various Microsoft PCI device IDs Easwar Hariharan
2022-09-09 19:38 ` Bjorn Helgaas [this message]
2022-09-08 22:05 ` [PATCH 3/3] " eahariha
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=20220909193849.GA309868@bhelgaas \
--to=helgaas@kernel.org \
--cc=airlied@linux.ie \
--cc=bhelgaas@google.com \
--cc=colin.i.king@googlemail.com \
--cc=daniel@ffwll.ch \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=deller@gmx.de \
--cc=drawat.floss@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=eahariha@linux.microsoft.com \
--cc=easwar.hariharan@microsoft.com \
--cc=edumazet@google.com \
--cc=gustavoars@kernel.org \
--cc=haiyangz@microsoft.com \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sthemmin@microsoft.com \
--cc=vkuznets@redhat.com \
--cc=wei.liu@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).