[PATCH 3/3] pci_ids: Add the various Microsoft PCI device IDs
From: <hidden>
Date: 2022-09-08 22:06:41
Also in:
dri-devel, linux-fbdev, linux-hyperv, linux-pci, lkml
Subsystem:
drm drivers, drm drivers and misc gpu patches, framebuffer layer, hyper-v/azure core and drivers, networking drivers, pci subsystem, the rest · Maintainers:
David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Helge Deller, "K. Y. Srinivasan", Haiyang Zhang, Wei Liu, Dexuan Cui, Long Li, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Bjorn Helgaas, Linus Torvalds
From: Easwar Hariharan <redacted> Signed-off-by: Easwar Hariharan <redacted> --- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +--- drivers/net/ethernet/microsoft/mana/gdma.h | 3 --- drivers/net/ethernet/microsoft/mana/gdma_main.c | 6 +++--- drivers/video/fbdev/hyperv_fb.c | 6 ++---- include/linux/pci_ids.h | 3 +++ 5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
index 61083c7..695d3a7 100644
--- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
+++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c@@ -23,8 +23,6 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 -#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353 - DEFINE_DRM_GEM_FOPS(hv_fops); static struct drm_driver hyperv_driver = {
@@ -53,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 a502c80..b9277e5 100644
--- a/drivers/video/fbdev/hyperv_fb.c
+++ b/drivers/video/fbdev/hyperv_fb.c@@ -73,8 +73,6 @@ #define SYNTHVID_DEPTH_WIN8 32 #define SYNTHVID_FB_SIZE_WIN8 (8 * 1024 * 1024) -#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353 - enum pipe_msg_type { PIPE_MSG_INVALID, PIPE_MSG_DATA,
@@ -998,7 +996,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;
@@ -1312,7 +1310,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 c008fda..0bef8e6 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h@@ -2080,6 +2080,9 @@ #define PCI_DEVICE_ID_VT1724 0x1724 #define PCI_VENDOR_ID_MICROSOFT 0x1414 +#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