[PATCH] PCI: Add ASPEED vendor ID

[PATCH] PCI: Add ASPEED vendor ID

[Patrick McLean]

Currently the ASPEED PCI vendor ID is defined in
drivers/gpu/drm/ast/ast_drv.c, move that to include/linux/pci_ids.h
with all the rest of the PCI vendor ID definitions. Rename the definition
to follow the format that the other definitions follow.

Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
---
 drivers/gpu/drm/ast/ast_drv.c | 4 +---
 include/linux/pci_ids.h       | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index d78852c7cf5b..232e797793b6 100644
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -70,12 +70,10 @@ static const struct drm_driver ast_driver = {
  * PCI driver
  */
 
-#define PCI_VENDOR_ASPEED 0x1a03
-
 #define AST_VGA_DEVICE(id, info) {		\
 	.class = PCI_BASE_CLASS_DISPLAY << 16,	\
 	.class_mask = 0xff0000,			\
-	.vendor = PCI_VENDOR_ASPEED,			\
+	.vendor = PCI_VENDOR_ID_ASPEED,			\
 	.device = id,				\
 	.subvendor = PCI_ANY_ID,		\
 	.subdevice = PCI_ANY_ID,		\
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 45c3d62e616d..40e04e88ca5a 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2553,6 +2553,8 @@
 #define PCI_DEVICE_ID_NETRONOME_NFP3800_VF	0x3803
 #define PCI_DEVICE_ID_NETRONOME_NFP6000_VF	0x6003
 
+#define PCI_VENDOR_ID_ASPEED		0x1a03
+
 #define PCI_VENDOR_ID_QMI		0x1a32
 
 #define PCI_VENDOR_ID_AZWAVE		0x1a3b
-- 
2.40.0

Re: [PATCH] PCI: Add ASPEED vendor ID

[Thomas Zimmermann]

[-- Attachment #1.1: Type: text/plain, Size: 1990 bytes --]

Hi

Am 19.04.23 um 00:57 schrieb Patrick McLean:
> Currently the ASPEED PCI vendor ID is defined in
> drivers/gpu/drm/ast/ast_drv.c, move that to include/linux/pci_ids.h
> with all the rest of the PCI vendor ID definitions. Rename the definition
> to follow the format that the other definitions follow.

Thanks a lot. Can you please also move and rename the PCI device ids? [1]

Best regards
Thomas

[1] 
https://elixir.bootlin.com/linux/v6.2/source/drivers/gpu/drm/ast/ast_drv.h#L52

> 
> Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
> ---
>   drivers/gpu/drm/ast/ast_drv.c | 4 +---
>   include/linux/pci_ids.h       | 2 ++
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> index d78852c7cf5b..232e797793b6 100644
> --- a/drivers/gpu/drm/ast/ast_drv.c
> +++ b/drivers/gpu/drm/ast/ast_drv.c
> @@ -70,12 +70,10 @@ static const struct drm_driver ast_driver = {
>    * PCI driver
>    */
>   
> -#define PCI_VENDOR_ASPEED 0x1a03
> -
>   #define AST_VGA_DEVICE(id, info) {		\
>   	.class = PCI_BASE_CLASS_DISPLAY << 16,	\
>   	.class_mask = 0xff0000,			\
> -	.vendor = PCI_VENDOR_ASPEED,			\
> +	.vendor = PCI_VENDOR_ID_ASPEED,			\
>   	.device = id,				\
>   	.subvendor = PCI_ANY_ID,		\
>   	.subdevice = PCI_ANY_ID,		\
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 45c3d62e616d..40e04e88ca5a 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2553,6 +2553,8 @@
>   #define PCI_DEVICE_ID_NETRONOME_NFP3800_VF	0x3803
>   #define PCI_DEVICE_ID_NETRONOME_NFP6000_VF	0x6003
>   
> +#define PCI_VENDOR_ID_ASPEED		0x1a03
> +
>   #define PCI_VENDOR_ID_QMI		0x1a32
>   
>   #define PCI_VENDOR_ID_AZWAVE		0x1a3b

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [PATCH] PCI: Add ASPEED vendor ID

[Bjorn Helgaas]

On Wed, Apr 19, 2023 at 09:00:15AM +0200, Thomas Zimmermann wrote:
> Am 19.04.23 um 00:57 schrieb Patrick McLean:
> > Currently the ASPEED PCI vendor ID is defined in
> > drivers/gpu/drm/ast/ast_drv.c, move that to include/linux/pci_ids.h
> > with all the rest of the PCI vendor ID definitions. Rename the definition
> > to follow the format that the other definitions follow.
> 
> Thanks a lot. Can you please also move and rename the PCI device ids? [1]

Generally we move things to pci_ids.h only when they are shared
between multiple drivers.  This is mostly to make backports easier.

PCI_VENDOR_ID_ASPEED is (or will be) used in both ast_drv.c and
libata-core.c, so it qualifies.

It doesn't look like PCI_CHIP_AST2000 and PCI_CHIP_AST2100 would
qualify since they're only used in ast_drv.c and ast_main.c, which are
part of the same driver.

> [1] https://elixir.bootlin.com/linux/v6.2/source/drivers/gpu/drm/ast/ast_drv.h#L52
> 
> > 
> > Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
> > ---
> >   drivers/gpu/drm/ast/ast_drv.c | 4 +---
> >   include/linux/pci_ids.h       | 2 ++
> >   2 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> > index d78852c7cf5b..232e797793b6 100644
> > --- a/drivers/gpu/drm/ast/ast_drv.c
> > +++ b/drivers/gpu/drm/ast/ast_drv.c
> > @@ -70,12 +70,10 @@ static const struct drm_driver ast_driver = {
> >    * PCI driver
> >    */
> > -#define PCI_VENDOR_ASPEED 0x1a03
> > -
> >   #define AST_VGA_DEVICE(id, info) {		\
> >   	.class = PCI_BASE_CLASS_DISPLAY << 16,	\
> >   	.class_mask = 0xff0000,			\
> > -	.vendor = PCI_VENDOR_ASPEED,			\
> > +	.vendor = PCI_VENDOR_ID_ASPEED,			\
> >   	.device = id,				\
> >   	.subvendor = PCI_ANY_ID,		\
> >   	.subdevice = PCI_ANY_ID,		\
> > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> > index 45c3d62e616d..40e04e88ca5a 100644
> > --- a/include/linux/pci_ids.h
> > +++ b/include/linux/pci_ids.h
> > @@ -2553,6 +2553,8 @@
> >   #define PCI_DEVICE_ID_NETRONOME_NFP3800_VF	0x3803
> >   #define PCI_DEVICE_ID_NETRONOME_NFP6000_VF	0x6003
> > +#define PCI_VENDOR_ID_ASPEED		0x1a03
> > +
> >   #define PCI_VENDOR_ID_QMI		0x1a32
> >   #define PCI_VENDOR_ID_AZWAVE		0x1a3b
> 
> -- 
> Thomas Zimmermann
> Graphics Driver Developer
> SUSE Software Solutions Germany GmbH
> Maxfeldstr. 5, 90409 Nürnberg, Germany
> (HRB 36809, AG Nürnberg)
> Geschäftsführer: Ivo Totev

Re: [PATCH] PCI: Add ASPEED vendor ID

[Thomas Zimmermann]

[-- Attachment #1.1: Type: text/plain, Size: 2927 bytes --]

Hi

Am 19.04.23 um 20:37 schrieb Bjorn Helgaas:
> On Wed, Apr 19, 2023 at 09:00:15AM +0200, Thomas Zimmermann wrote:
>> Am 19.04.23 um 00:57 schrieb Patrick McLean:
>>> Currently the ASPEED PCI vendor ID is defined in
>>> drivers/gpu/drm/ast/ast_drv.c, move that to include/linux/pci_ids.h
>>> with all the rest of the PCI vendor ID definitions. Rename the definition
>>> to follow the format that the other definitions follow.
>>
>> Thanks a lot. Can you please also move and rename the PCI device ids? [1]
> 
> Generally we move things to pci_ids.h only when they are shared
> between multiple drivers.  This is mostly to make backports easier.
> 
> PCI_VENDOR_ID_ASPEED is (or will be) used in both ast_drv.c and
> libata-core.c, so it qualifies.
> 
> It doesn't look like PCI_CHIP_AST2000 and PCI_CHIP_AST2100 would
> qualify since they're only used in ast_drv.c and ast_main.c, which are
> part of the same driver.

Ok, I see. Can I take the patch into DRM trees?

Best regards
Thomas

> 
>> [1] https://elixir.bootlin.com/linux/v6.2/source/drivers/gpu/drm/ast/ast_drv.h#L52
>>
>>>
>>> Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
>>> ---
>>>    drivers/gpu/drm/ast/ast_drv.c | 4 +---
>>>    include/linux/pci_ids.h       | 2 ++
>>>    2 files changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
>>> index d78852c7cf5b..232e797793b6 100644
>>> --- a/drivers/gpu/drm/ast/ast_drv.c
>>> +++ b/drivers/gpu/drm/ast/ast_drv.c
>>> @@ -70,12 +70,10 @@ static const struct drm_driver ast_driver = {
>>>     * PCI driver
>>>     */
>>> -#define PCI_VENDOR_ASPEED 0x1a03
>>> -
>>>    #define AST_VGA_DEVICE(id, info) {		\
>>>    	.class = PCI_BASE_CLASS_DISPLAY << 16,	\
>>>    	.class_mask = 0xff0000,			\
>>> -	.vendor = PCI_VENDOR_ASPEED,			\
>>> +	.vendor = PCI_VENDOR_ID_ASPEED,			\
>>>    	.device = id,				\
>>>    	.subvendor = PCI_ANY_ID,		\
>>>    	.subdevice = PCI_ANY_ID,		\
>>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>>> index 45c3d62e616d..40e04e88ca5a 100644
>>> --- a/include/linux/pci_ids.h
>>> +++ b/include/linux/pci_ids.h
>>> @@ -2553,6 +2553,8 @@
>>>    #define PCI_DEVICE_ID_NETRONOME_NFP3800_VF	0x3803
>>>    #define PCI_DEVICE_ID_NETRONOME_NFP6000_VF	0x6003
>>> +#define PCI_VENDOR_ID_ASPEED		0x1a03
>>> +
>>>    #define PCI_VENDOR_ID_QMI		0x1a32
>>>    #define PCI_VENDOR_ID_AZWAVE		0x1a3b
>>
>> -- 
>> Thomas Zimmermann
>> Graphics Driver Developer
>> SUSE Software Solutions Germany GmbH
>> Maxfeldstr. 5, 90409 Nürnberg, Germany
>> (HRB 36809, AG Nürnberg)
>> Geschäftsführer: Ivo Totev
> 
> 
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [PATCH] PCI: Add ASPEED vendor ID

[Bjorn Helgaas]

[+cc Damien, linux-ide]

On Thu, Apr 20, 2023 at 09:08:48AM +0200, Thomas Zimmermann wrote:
> Am 19.04.23 um 20:37 schrieb Bjorn Helgaas:
> > On Wed, Apr 19, 2023 at 09:00:15AM +0200, Thomas Zimmermann wrote:
> > > Am 19.04.23 um 00:57 schrieb Patrick McLean:
> > > > Currently the ASPEED PCI vendor ID is defined in
> > > > drivers/gpu/drm/ast/ast_drv.c, move that to include/linux/pci_ids.h
> > > > with all the rest of the PCI vendor ID definitions. Rename the definition
> > > > to follow the format that the other definitions follow.
> > > 
> > > Thanks a lot. Can you please also move and rename the PCI device ids? [1]
> > 
> > Generally we move things to pci_ids.h only when they are shared
> > between multiple drivers.  This is mostly to make backports easier.
> > 
> > PCI_VENDOR_ID_ASPEED is (or will be) used in both ast_drv.c and
> > libata-core.c, so it qualifies.
> > 
> > It doesn't look like PCI_CHIP_AST2000 and PCI_CHIP_AST2100 would
> > qualify since they're only used in ast_drv.c and ast_main.c, which are
> > part of the same driver.
> 
> Ok, I see. Can I take the patch into DRM trees?

The first time around I got two patches [2].  This time I only got
this patch, but IIUC there are still two patches in play here:

  - This one, which moves PCI_VENDOR_ID_ASPEED to pci_ids.h, and
  - The libata-core one that adds a use in ata_dev_config_ncq()

Those should go together via the same tree.  I supplied my ack to
indicate that I'm not going to merge anything myself, and I expect
whoever merges the libata patch to also merge this one.

If for some reason the libata-core patch doesn't happen, then this
patch shouldn't happen either, because there would no longer be any
sharing between drivers that would justify a pci_ids.h addition.

Bjorn

[2] https://lore.kernel.org/r/20230418011720.3900090-1-chutzpah@gentoo.org

> > > [1] https://elixir.bootlin.com/linux/v6.2/source/drivers/gpu/drm/ast/ast_drv.h#L52

> > > > Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
> > > > ---
> > > >    drivers/gpu/drm/ast/ast_drv.c | 4 +---
> > > >    include/linux/pci_ids.h       | 2 ++
> > > >    2 files changed, 3 insertions(+), 3 deletions(-)
> > > > 
> > > > diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> > > > index d78852c7cf5b..232e797793b6 100644
> > > > --- a/drivers/gpu/drm/ast/ast_drv.c
> > > > +++ b/drivers/gpu/drm/ast/ast_drv.c
> > > > @@ -70,12 +70,10 @@ static const struct drm_driver ast_driver = {
> > > >     * PCI driver
> > > >     */
> > > > -#define PCI_VENDOR_ASPEED 0x1a03
> > > > -
> > > >    #define AST_VGA_DEVICE(id, info) {		\
> > > >    	.class = PCI_BASE_CLASS_DISPLAY << 16,	\
> > > >    	.class_mask = 0xff0000,			\
> > > > -	.vendor = PCI_VENDOR_ASPEED,			\
> > > > +	.vendor = PCI_VENDOR_ID_ASPEED,			\
> > > >    	.device = id,				\
> > > >    	.subvendor = PCI_ANY_ID,		\
> > > >    	.subdevice = PCI_ANY_ID,		\
> > > > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> > > > index 45c3d62e616d..40e04e88ca5a 100644
> > > > --- a/include/linux/pci_ids.h
> > > > +++ b/include/linux/pci_ids.h
> > > > @@ -2553,6 +2553,8 @@
> > > >    #define PCI_DEVICE_ID_NETRONOME_NFP3800_VF	0x3803
> > > >    #define PCI_DEVICE_ID_NETRONOME_NFP6000_VF	0x6003
> > > > +#define PCI_VENDOR_ID_ASPEED		0x1a03
> > > > +
> > > >    #define PCI_VENDOR_ID_QMI		0x1a32
> > > >    #define PCI_VENDOR_ID_AZWAVE		0x1a3b
> > > 
> > > -- 
> > > Thomas Zimmermann
> > > Graphics Driver Developer
> > > SUSE Software Solutions Germany GmbH
> > > Maxfeldstr. 5, 90409 Nürnberg, Germany
> > > (HRB 36809, AG Nürnberg)
> > > Geschäftsführer: Ivo Totev
> > 
> > 
> > 
> 
> -- 
> Thomas Zimmermann
> Graphics Driver Developer
> SUSE Software Solutions Germany GmbH
> Frankenstrasse 146, 90461 Nuernberg, Germany
> GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
> HRB 36809 (AG Nuernberg)

Re: [PATCH] PCI: Add ASPEED vendor ID

[Damien Le Moal]

On 4/21/23 04:10, Bjorn Helgaas wrote:
> [+cc Damien, linux-ide]
> 
> On Thu, Apr 20, 2023 at 09:08:48AM +0200, Thomas Zimmermann wrote:
>> Am 19.04.23 um 20:37 schrieb Bjorn Helgaas:
>>> On Wed, Apr 19, 2023 at 09:00:15AM +0200, Thomas Zimmermann wrote:
>>>> Am 19.04.23 um 00:57 schrieb Patrick McLean:
>>>>> Currently the ASPEED PCI vendor ID is defined in
>>>>> drivers/gpu/drm/ast/ast_drv.c, move that to include/linux/pci_ids.h
>>>>> with all the rest of the PCI vendor ID definitions. Rename the definition
>>>>> to follow the format that the other definitions follow.
>>>>
>>>> Thanks a lot. Can you please also move and rename the PCI device ids? [1]
>>>
>>> Generally we move things to pci_ids.h only when they are shared
>>> between multiple drivers.  This is mostly to make backports easier.
>>>
>>> PCI_VENDOR_ID_ASPEED is (or will be) used in both ast_drv.c and
>>> libata-core.c, so it qualifies.
>>>
>>> It doesn't look like PCI_CHIP_AST2000 and PCI_CHIP_AST2100 would
>>> qualify since they're only used in ast_drv.c and ast_main.c, which are
>>> part of the same driver.
>>
>> Ok, I see. Can I take the patch into DRM trees?
> 
> The first time around I got two patches [2].  This time I only got
> this patch, but IIUC there are still two patches in play here:
> 
>   - This one, which moves PCI_VENDOR_ID_ASPEED to pci_ids.h, and
>   - The libata-core one that adds a use in ata_dev_config_ncq()
> 
> Those should go together via the same tree.  I supplied my ack to
> indicate that I'm not going to merge anything myself, and I expect
> whoever merges the libata patch to also merge this one.
> 
> If for some reason the libata-core patch doesn't happen, then this
> patch shouldn't happen either, because there would no longer be any
> sharing between drivers that would justify a pci_ids.h addition.

I can take both patches through the libata tree but there were comments on the
second patch for libata and I have not seen these addressed yet (I did not get a
v2). And in the meantime, it seems that the PCI ID patch was reworked as a
single patch... Not sure what's happening here.

Re: [PATCH] PCI: Add ASPEED vendor ID

[Thomas Zimmermann]

[-- Attachment #1.1: Type: text/plain, Size: 2626 bytes --]

Hi

Am 21.04.23 um 00:04 schrieb Damien Le Moal:
> On 4/21/23 04:10, Bjorn Helgaas wrote:
>> [+cc Damien, linux-ide]
>>
>> On Thu, Apr 20, 2023 at 09:08:48AM +0200, Thomas Zimmermann wrote:
>>> Am 19.04.23 um 20:37 schrieb Bjorn Helgaas:
>>>> On Wed, Apr 19, 2023 at 09:00:15AM +0200, Thomas Zimmermann wrote:
>>>>> Am 19.04.23 um 00:57 schrieb Patrick McLean:
>>>>>> Currently the ASPEED PCI vendor ID is defined in
>>>>>> drivers/gpu/drm/ast/ast_drv.c, move that to include/linux/pci_ids.h
>>>>>> with all the rest of the PCI vendor ID definitions. Rename the definition
>>>>>> to follow the format that the other definitions follow.
>>>>>
>>>>> Thanks a lot. Can you please also move and rename the PCI device ids? [1]
>>>>
>>>> Generally we move things to pci_ids.h only when they are shared
>>>> between multiple drivers.  This is mostly to make backports easier.
>>>>
>>>> PCI_VENDOR_ID_ASPEED is (or will be) used in both ast_drv.c and
>>>> libata-core.c, so it qualifies.
>>>>
>>>> It doesn't look like PCI_CHIP_AST2000 and PCI_CHIP_AST2100 would
>>>> qualify since they're only used in ast_drv.c and ast_main.c, which are
>>>> part of the same driver.
>>>
>>> Ok, I see. Can I take the patch into DRM trees?
>>
>> The first time around I got two patches [2].  This time I only got
>> this patch, but IIUC there are still two patches in play here:
>>
>>    - This one, which moves PCI_VENDOR_ID_ASPEED to pci_ids.h, and
>>    - The libata-core one that adds a use in ata_dev_config_ncq()
>>
>> Those should go together via the same tree.  I supplied my ack to
>> indicate that I'm not going to merge anything myself, and I expect
>> whoever merges the libata patch to also merge this one.
>>
>> If for some reason the libata-core patch doesn't happen, then this
>> patch shouldn't happen either, because there would no longer be any
>> sharing between drivers that would justify a pci_ids.h addition.
> 
> I can take both patches through the libata tree but there were comments on the
> second patch for libata and I have not seen these addressed yet (I did not get a
> v2). And in the meantime, it seems that the PCI ID patch was reworked as a
> single patch... Not sure what's happening here.

I don't think I've even seen the libata patch. Please take both patches 
through your tree when they are ready.

Best regards
Thomas

> 
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [PATCH] PCI: Add ASPEED vendor ID

[Bjorn Helgaas]

On Tue, Apr 18, 2023 at 03:57:57PM -0700, Patrick McLean wrote:
> Currently the ASPEED PCI vendor ID is defined in
> drivers/gpu/drm/ast/ast_drv.c, move that to include/linux/pci_ids.h
> with all the rest of the PCI vendor ID definitions. Rename the definition
> to follow the format that the other definitions follow.
> 
> Signed-off-by: Patrick McLean <chutzpah@gentoo.org>

Acked-by: Bjorn Helgaas <bhelgaas@google.com>

But please include this patch in the series that adds the use in
libata-core, as in your original posting, so we can see *why* we're
moving this to pci_ids.h.  That also makes it easier to make sure
those patches go together.

> ---
>  drivers/gpu/drm/ast/ast_drv.c | 4 +---
>  include/linux/pci_ids.h       | 2 ++
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> index d78852c7cf5b..232e797793b6 100644
> --- a/drivers/gpu/drm/ast/ast_drv.c
> +++ b/drivers/gpu/drm/ast/ast_drv.c
> @@ -70,12 +70,10 @@ static const struct drm_driver ast_driver = {
>   * PCI driver
>   */
>  
> -#define PCI_VENDOR_ASPEED 0x1a03
> -
>  #define AST_VGA_DEVICE(id, info) {		\
>  	.class = PCI_BASE_CLASS_DISPLAY << 16,	\
>  	.class_mask = 0xff0000,			\
> -	.vendor = PCI_VENDOR_ASPEED,			\
> +	.vendor = PCI_VENDOR_ID_ASPEED,			\
>  	.device = id,				\
>  	.subvendor = PCI_ANY_ID,		\
>  	.subdevice = PCI_ANY_ID,		\
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 45c3d62e616d..40e04e88ca5a 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2553,6 +2553,8 @@
>  #define PCI_DEVICE_ID_NETRONOME_NFP3800_VF	0x3803
>  #define PCI_DEVICE_ID_NETRONOME_NFP6000_VF	0x6003
>  
> +#define PCI_VENDOR_ID_ASPEED		0x1a03
> +
>  #define PCI_VENDOR_ID_QMI		0x1a32
>  
>  #define PCI_VENDOR_ID_AZWAVE		0x1a3b
> -- 
> 2.40.0
> 

Re: [PATCH] PCI: Add ASPEED vendor ID

[Thomas Zimmermann]

[-- Attachment #1.1: Type: text/plain, Size: 1892 bytes --]



Am 19.04.23 um 00:57 schrieb Patrick McLean:
> Currently the ASPEED PCI vendor ID is defined in
> drivers/gpu/drm/ast/ast_drv.c, move that to include/linux/pci_ids.h
> with all the rest of the PCI vendor ID definitions. Rename the definition
> to follow the format that the other definitions follow.
> 
> Signed-off-by: Patrick McLean <chutzpah@gentoo.org>

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

> ---
>   drivers/gpu/drm/ast/ast_drv.c | 4 +---
>   include/linux/pci_ids.h       | 2 ++
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> index d78852c7cf5b..232e797793b6 100644
> --- a/drivers/gpu/drm/ast/ast_drv.c
> +++ b/drivers/gpu/drm/ast/ast_drv.c
> @@ -70,12 +70,10 @@ static const struct drm_driver ast_driver = {
>    * PCI driver
>    */
>   
> -#define PCI_VENDOR_ASPEED 0x1a03
> -
>   #define AST_VGA_DEVICE(id, info) {		\
>   	.class = PCI_BASE_CLASS_DISPLAY << 16,	\
>   	.class_mask = 0xff0000,			\
> -	.vendor = PCI_VENDOR_ASPEED,			\
> +	.vendor = PCI_VENDOR_ID_ASPEED,			\
>   	.device = id,				\
>   	.subvendor = PCI_ANY_ID,		\
>   	.subdevice = PCI_ANY_ID,		\
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 45c3d62e616d..40e04e88ca5a 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2553,6 +2553,8 @@
>   #define PCI_DEVICE_ID_NETRONOME_NFP3800_VF	0x3803
>   #define PCI_DEVICE_ID_NETRONOME_NFP6000_VF	0x6003
>   
> +#define PCI_VENDOR_ID_ASPEED		0x1a03
> +
>   #define PCI_VENDOR_ID_QMI		0x1a32
>   
>   #define PCI_VENDOR_ID_AZWAVE		0x1a3b

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]