diff mbox series

[2/2] dmaengine: idxd: Add new DSA and IAA device IDs on Diamond Rapids platform

Message ID 20240828224204.151761-3-fenghua.yu@intel.com (mailing list archive)
State Superseded
Headers show
Series Add a few new DSA/IAX device IDs | expand

Commit Message

Fenghua Yu Aug. 28, 2024, 10:42 p.m. UTC
A new DSA device ID, 0x1212, and a new IAA device ID, 0x1216, are
introduced on Diamond Rapids platform. Add the device IDs to the IDXD
driver.

Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
---
 drivers/dma/idxd/init.c | 4 ++++
 include/linux/pci_ids.h | 2 ++
 2 files changed, 6 insertions(+)

Comments

Dave Jiang Aug. 28, 2024, 10:45 p.m. UTC | #1
On 8/28/24 3:42 PM, Fenghua Yu wrote:
> A new DSA device ID, 0x1212, and a new IAA device ID, 0x1216, are
> introduced on Diamond Rapids platform. Add the device IDs to the IDXD
> driver.
> 
> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
> ---
>  drivers/dma/idxd/init.c | 4 ++++
>  include/linux/pci_ids.h | 2 ++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
> index 415b17b0acd0..21e3cff66f77 100644
> --- a/drivers/dma/idxd/init.c
> +++ b/drivers/dma/idxd/init.c
> @@ -71,9 +71,13 @@ static struct pci_device_id idxd_pci_tbl[] = {
>  	{ PCI_DEVICE_DATA(INTEL, DSA_SPR0, &idxd_driver_data[IDXD_TYPE_DSA]) },
>  	/* DSA on GNR-D platforms */
>  	{ PCI_DEVICE_DATA(INTEL, DSA_GNRD, &idxd_driver_data[IDXD_TYPE_DSA]) },
> +	/* DSA on DMR platforms */
> +	{ PCI_DEVICE_DATA(INTEL, DSA_DMR, &idxd_driver_data[IDXD_TYPE_DSA]) },
>  
>  	/* IAX ver 1.0 platforms */
>  	{ PCI_DEVICE_DATA(INTEL, IAX_SPR0, &idxd_driver_data[IDXD_TYPE_IAX]) },
> +	/* IAX on DMR platforms */
> +	{ PCI_DEVICE_DATA(INTEL, IAX_DMR, &idxd_driver_data[IDXD_TYPE_IAX]) },

IAA_DMR?

>  	{ 0, }
>  };
>  MODULE_DEVICE_TABLE(pci, idxd_pci_tbl);
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index ff99047dac44..e15ebb3942ae 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2707,6 +2707,8 @@
>  #define PCI_DEVICE_ID_INTEL_82815_CGC	0x1132
>  #define PCI_DEVICE_ID_INTEL_SST_TNG	0x119a
>  #define PCI_DEVICE_ID_INTEL_DSA_GNRD	0x11fb
> +#define PCI_DEVICE_ID_INTEL_DSA_DMR	0x1212
> +#define PCI_DEVICE_ID_INTEL_IAX_DMR	0x1216

s/IAX/IAA/ ?

>  #define PCI_DEVICE_ID_INTEL_82092AA_0	0x1221
>  #define PCI_DEVICE_ID_INTEL_82437	0x122d
>  #define PCI_DEVICE_ID_INTEL_82371FB_0	0x122e
Fenghua Yu Aug. 28, 2024, 11:07 p.m. UTC | #2
Hi, Dave,

On 8/28/24 15:45, Dave Jiang wrote:
> 
> 
> On 8/28/24 3:42 PM, Fenghua Yu wrote:
>> A new DSA device ID, 0x1212, and a new IAA device ID, 0x1216, are
>> introduced on Diamond Rapids platform. Add the device IDs to the IDXD
>> driver.
>>
>> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
>> ---
>>   drivers/dma/idxd/init.c | 4 ++++
>>   include/linux/pci_ids.h | 2 ++
>>   2 files changed, 6 insertions(+)
>>
>> diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
>> index 415b17b0acd0..21e3cff66f77 100644
>> --- a/drivers/dma/idxd/init.c
>> +++ b/drivers/dma/idxd/init.c
>> @@ -71,9 +71,13 @@ static struct pci_device_id idxd_pci_tbl[] = {
>>   	{ PCI_DEVICE_DATA(INTEL, DSA_SPR0, &idxd_driver_data[IDXD_TYPE_DSA]) },
>>   	/* DSA on GNR-D platforms */
>>   	{ PCI_DEVICE_DATA(INTEL, DSA_GNRD, &idxd_driver_data[IDXD_TYPE_DSA]) },
>> +	/* DSA on DMR platforms */
>> +	{ PCI_DEVICE_DATA(INTEL, DSA_DMR, &idxd_driver_data[IDXD_TYPE_DSA]) },
>>   
>>   	/* IAX ver 1.0 platforms */
>>   	{ PCI_DEVICE_DATA(INTEL, IAX_SPR0, &idxd_driver_data[IDXD_TYPE_IAX]) },
>> +	/* IAX on DMR platforms */
>> +	{ PCI_DEVICE_DATA(INTEL, IAX_DMR, &idxd_driver_data[IDXD_TYPE_IAX]) },
> 
> IAA_DMR?

Sure. Will fix this.

Also add something in the commit message? "Use IAA in new code instead 
of old name IAX. The IAX name (e.g. IDXD_TYPE_IAX) is still kept in 
legacy code"

> 
>>   	{ 0, }
>>   };
>>   MODULE_DEVICE_TABLE(pci, idxd_pci_tbl);
>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>> index ff99047dac44..e15ebb3942ae 100644
>> --- a/include/linux/pci_ids.h
>> +++ b/include/linux/pci_ids.h
>> @@ -2707,6 +2707,8 @@
>>   #define PCI_DEVICE_ID_INTEL_82815_CGC	0x1132
>>   #define PCI_DEVICE_ID_INTEL_SST_TNG	0x119a
>>   #define PCI_DEVICE_ID_INTEL_DSA_GNRD	0x11fb
>> +#define PCI_DEVICE_ID_INTEL_DSA_DMR	0x1212
>> +#define PCI_DEVICE_ID_INTEL_IAX_DMR	0x1216
> 
> s/IAX/IAA/ ?

Ditto.

> 
>>   #define PCI_DEVICE_ID_INTEL_82092AA_0	0x1221
>>   #define PCI_DEVICE_ID_INTEL_82437	0x122d
>>   #define PCI_DEVICE_ID_INTEL_82371FB_0	0x122e

Thanks.

-Fenghua
Dave Jiang Aug. 28, 2024, 11:08 p.m. UTC | #3
On 8/28/24 4:07 PM, Fenghua Yu wrote:
> Hi, Dave,
> 
> On 8/28/24 15:45, Dave Jiang wrote:
>>
>>
>> On 8/28/24 3:42 PM, Fenghua Yu wrote:
>>> A new DSA device ID, 0x1212, and a new IAA device ID, 0x1216, are
>>> introduced on Diamond Rapids platform. Add the device IDs to the IDXD
>>> driver.
>>>
>>> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
>>> ---
>>>   drivers/dma/idxd/init.c | 4 ++++
>>>   include/linux/pci_ids.h | 2 ++
>>>   2 files changed, 6 insertions(+)
>>>
>>> diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
>>> index 415b17b0acd0..21e3cff66f77 100644
>>> --- a/drivers/dma/idxd/init.c
>>> +++ b/drivers/dma/idxd/init.c
>>> @@ -71,9 +71,13 @@ static struct pci_device_id idxd_pci_tbl[] = {
>>>       { PCI_DEVICE_DATA(INTEL, DSA_SPR0, &idxd_driver_data[IDXD_TYPE_DSA]) },
>>>       /* DSA on GNR-D platforms */
>>>       { PCI_DEVICE_DATA(INTEL, DSA_GNRD, &idxd_driver_data[IDXD_TYPE_DSA]) },
>>> +    /* DSA on DMR platforms */
>>> +    { PCI_DEVICE_DATA(INTEL, DSA_DMR, &idxd_driver_data[IDXD_TYPE_DSA]) },
>>>         /* IAX ver 1.0 platforms */
>>>       { PCI_DEVICE_DATA(INTEL, IAX_SPR0, &idxd_driver_data[IDXD_TYPE_IAX]) },
>>> +    /* IAX on DMR platforms */
>>> +    { PCI_DEVICE_DATA(INTEL, IAX_DMR, &idxd_driver_data[IDXD_TYPE_IAX]) },
>>
>> IAA_DMR?
> 
> Sure. Will fix this.
> 
> Also add something in the commit message? "Use IAA in new code instead of old name IAX. The IAX name (e.g. IDXD_TYPE_IAX) is still kept in legacy code"

sure

> 
>>
>>>       { 0, }
>>>   };
>>>   MODULE_DEVICE_TABLE(pci, idxd_pci_tbl);
>>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>>> index ff99047dac44..e15ebb3942ae 100644
>>> --- a/include/linux/pci_ids.h
>>> +++ b/include/linux/pci_ids.h
>>> @@ -2707,6 +2707,8 @@
>>>   #define PCI_DEVICE_ID_INTEL_82815_CGC    0x1132
>>>   #define PCI_DEVICE_ID_INTEL_SST_TNG    0x119a
>>>   #define PCI_DEVICE_ID_INTEL_DSA_GNRD    0x11fb
>>> +#define PCI_DEVICE_ID_INTEL_DSA_DMR    0x1212
>>> +#define PCI_DEVICE_ID_INTEL_IAX_DMR    0x1216
>>
>> s/IAX/IAA/ ?
> 
> Ditto.
> 
>>
>>>   #define PCI_DEVICE_ID_INTEL_82092AA_0    0x1221
>>>   #define PCI_DEVICE_ID_INTEL_82437    0x122d
>>>   #define PCI_DEVICE_ID_INTEL_82371FB_0    0x122e
> 
> Thanks.
> 
> -Fenghua
diff mbox series

Patch

diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
index 415b17b0acd0..21e3cff66f77 100644
--- a/drivers/dma/idxd/init.c
+++ b/drivers/dma/idxd/init.c
@@ -71,9 +71,13 @@  static struct pci_device_id idxd_pci_tbl[] = {
 	{ PCI_DEVICE_DATA(INTEL, DSA_SPR0, &idxd_driver_data[IDXD_TYPE_DSA]) },
 	/* DSA on GNR-D platforms */
 	{ PCI_DEVICE_DATA(INTEL, DSA_GNRD, &idxd_driver_data[IDXD_TYPE_DSA]) },
+	/* DSA on DMR platforms */
+	{ PCI_DEVICE_DATA(INTEL, DSA_DMR, &idxd_driver_data[IDXD_TYPE_DSA]) },
 
 	/* IAX ver 1.0 platforms */
 	{ PCI_DEVICE_DATA(INTEL, IAX_SPR0, &idxd_driver_data[IDXD_TYPE_IAX]) },
+	/* IAX on DMR platforms */
+	{ PCI_DEVICE_DATA(INTEL, IAX_DMR, &idxd_driver_data[IDXD_TYPE_IAX]) },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, idxd_pci_tbl);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index ff99047dac44..e15ebb3942ae 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2707,6 +2707,8 @@ 
 #define PCI_DEVICE_ID_INTEL_82815_CGC	0x1132
 #define PCI_DEVICE_ID_INTEL_SST_TNG	0x119a
 #define PCI_DEVICE_ID_INTEL_DSA_GNRD	0x11fb
+#define PCI_DEVICE_ID_INTEL_DSA_DMR	0x1212
+#define PCI_DEVICE_ID_INTEL_IAX_DMR	0x1216
 #define PCI_DEVICE_ID_INTEL_82092AA_0	0x1221
 #define PCI_DEVICE_ID_INTEL_82437	0x122d
 #define PCI_DEVICE_ID_INTEL_82371FB_0	0x122e