| Message ID | 1662749425-3037-3-git-send-email-eahariha@linux.microsoft.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
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 >
On 9/9/22 19:38, Bjorn Helgaas wrote: > Please follow the PCI subject line conventions. Discover it with > "git log --oneline include/linux/pci_ids.h". Thanks, updated. > > 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. Thanks, this was a separate patch for exactly that reason instead of being combined with the patch to move the vendor ID. I assume other device IDs in the pci_ids.h file used only by a single driver are legacy artifacts. After removing the MANA device IDs, the patch boils down to a trivial rename of the HYPERV_VIDEO device ID, so I'm just dropping this patch. - Easwar > >> 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 >>
On 9/9/22 19:38, Bjorn Helgaas wrote: > 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. Thanks, this was a separate patch for exactly that reason instead of being combined with the patch to move the vendor ID. I sent it anyway because of other device IDs in the pci_ids.h file used only by a single driver, which I assume are legacy artifacts. After removing the MANA device IDs, the patch boils down to a trivial rename of the HYPERV_VIDEO device ID, so I'm just dropping this patch. - Easwar > >> 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 >>
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