linux-spi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/2] spi: intel: PCI driver housekeeping
@ 2023-02-01  5:04 Mauro Lima
  2023-02-01  5:04 ` [PATCH 1/2] spi: intel: Fix device private data and PR_NUM for BXT Mauro Lima
  2023-02-01  5:04 ` [PATCH 2/2] spi: intel: Add support for controllers Mauro Lima
  0 siblings, 2 replies; 6+ messages in thread
From: Mauro Lima @ 2023-02-01  5:04 UTC (permalink / raw)
  To: mika.westerberg; +Cc: broonie, linux-spi, linux-kernel, Mauro Lima

Found some controllers' private data that were wrong according
to the documentation. Also, the number of Protected Regions from 
BXT types was changed.
The second patch adds more Device IDs to the module table.
Probably good candidates to stable?

Mauro Lima (2):
  spi: intel: Fix device private data and PR_NUM for BXT
  spi: intel: Add support for controllers

 drivers/spi/spi-intel-pci.c | 13 ++++++++-----
 drivers/spi/spi-intel.c     |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

-- 
2.39.1


^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH 1/2] spi: intel: Fix device private data and PR_NUM for BXT
  2023-02-01  5:04 [PATCH 0/2] spi: intel: PCI driver housekeeping Mauro Lima
@ 2023-02-01  5:04 ` Mauro Lima
  2023-02-01  5:48   ` Mika Westerberg
  2023-02-01  5:04 ` [PATCH 2/2] spi: intel: Add support for controllers Mauro Lima
  1 sibling, 1 reply; 6+ messages in thread
From: Mauro Lima @ 2023-02-01  5:04 UTC (permalink / raw)
  To: mika.westerberg; +Cc: broonie, linux-spi, linux-kernel, Mauro Lima

Some private data fields have to change from bxt_info to cnl_info.
Here is the list of Device IDs with the respective documentation taken for
validation:
    0xa0a4 - Intel® 500 Series Chipset Family On-Package Platform Controller Hub
    0x02a4 - Intel® 400 Series Chipset Family On-Package PCH
    0x06a4 - Intel® 400 Series Chipset Family Platform Controller Hub
    0x34a4 - Intel® 495 Chipset Family On-Package
    0xa3a4 - Intel® B460 and H410 Chipset

According to documentation BXT has five PR registers.

Signed-off-by: Mauro Lima <mauro.lima@eclypsium.com>
---
 drivers/spi/spi-intel-pci.c | 10 +++++-----
 drivers/spi/spi-intel.c     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/spi/spi-intel-pci.c b/drivers/spi/spi-intel-pci.c
index f0d532ea40e8..10fa3a7fa4f5 100644
--- a/drivers/spi/spi-intel-pci.c
+++ b/drivers/spi/spi-intel-pci.c
@@ -60,12 +60,12 @@ static int intel_spi_pci_probe(struct pci_dev *pdev,
 }
 
 static const struct pci_device_id intel_spi_pci_ids[] = {
-	{ PCI_VDEVICE(INTEL, 0x02a4), (unsigned long)&bxt_info },
-	{ PCI_VDEVICE(INTEL, 0x06a4), (unsigned long)&bxt_info },
+	{ PCI_VDEVICE(INTEL, 0x02a4), (unsigned long)&cnl_info },
+	{ PCI_VDEVICE(INTEL, 0x06a4), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0x18e0), (unsigned long)&bxt_info },
 	{ PCI_VDEVICE(INTEL, 0x19e0), (unsigned long)&bxt_info },
 	{ PCI_VDEVICE(INTEL, 0x1bca), (unsigned long)&bxt_info },
-	{ PCI_VDEVICE(INTEL, 0x34a4), (unsigned long)&bxt_info },
+	{ PCI_VDEVICE(INTEL, 0x34a4), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0x38a4), (unsigned long)&bxt_info },
 	{ PCI_VDEVICE(INTEL, 0x43a4), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0x4b24), (unsigned long)&bxt_info },
@@ -75,11 +75,11 @@ static const struct pci_device_id intel_spi_pci_ids[] = {
 	{ PCI_VDEVICE(INTEL, 0x7a24), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0x7aa4), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0x7e23), (unsigned long)&cnl_info },
-	{ PCI_VDEVICE(INTEL, 0xa0a4), (unsigned long)&bxt_info },
+	{ PCI_VDEVICE(INTEL, 0xa0a4), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0xa1a4), (unsigned long)&bxt_info },
 	{ PCI_VDEVICE(INTEL, 0xa224), (unsigned long)&bxt_info },
 	{ PCI_VDEVICE(INTEL, 0xa324), (unsigned long)&cnl_info },
-	{ PCI_VDEVICE(INTEL, 0xa3a4), (unsigned long)&bxt_info },
+	{ PCI_VDEVICE(INTEL, 0xa3a4), (unsigned long)&cnl_info },
 	{ },
 };
 MODULE_DEVICE_TABLE(pci, intel_spi_pci_ids);
diff --git a/drivers/spi/spi-intel.c b/drivers/spi/spi-intel.c
index f619212b0d5c..1052fb4b7973 100644
--- a/drivers/spi/spi-intel.c
+++ b/drivers/spi/spi-intel.c
@@ -104,7 +104,7 @@
 #define BXT_PR				0x84
 #define BXT_SSFSTS_CTL			0xa0
 #define BXT_FREG_NUM			12
-#define BXT_PR_NUM			6
+#define BXT_PR_NUM			5
 
 #define CNL_PR				0x84
 #define CNL_FREG_NUM			6
-- 
2.39.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 2/2] spi: intel: Add support for controllers
  2023-02-01  5:04 [PATCH 0/2] spi: intel: PCI driver housekeeping Mauro Lima
  2023-02-01  5:04 ` [PATCH 1/2] spi: intel: Fix device private data and PR_NUM for BXT Mauro Lima
@ 2023-02-01  5:04 ` Mauro Lima
  2023-02-01  5:49   ` Mika Westerberg
  1 sibling, 1 reply; 6+ messages in thread
From: Mauro Lima @ 2023-02-01  5:04 UTC (permalink / raw)
  To: mika.westerberg; +Cc: broonie, linux-spi, linux-kernel, Mauro Lima

Add Device IDs to the module table for the following controllers:
	- 9da4  Cannon Lake 300 Series On-Package
	- a2a4  200 Series/Z370 Chipset Family SPI Controller
	- 9d24  Intel® 200 Series Chipset Family (Including Intel® X299),
		Intel® Z370 Intel® H310C,B365,
		also Intel® B460 and H410 Chipset Platform Controller Hub

Signed-off-by: Mauro Lima <mauro.lima@eclypsium.com>
---
 drivers/spi/spi-intel-pci.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/spi/spi-intel-pci.c b/drivers/spi/spi-intel-pci.c
index 10fa3a7fa4f5..ba08f64e56eb 100644
--- a/drivers/spi/spi-intel-pci.c
+++ b/drivers/spi/spi-intel-pci.c
@@ -80,6 +80,9 @@ static const struct pci_device_id intel_spi_pci_ids[] = {
 	{ PCI_VDEVICE(INTEL, 0xa224), (unsigned long)&bxt_info },
 	{ PCI_VDEVICE(INTEL, 0xa324), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0xa3a4), (unsigned long)&cnl_info },
+	{ PCI_VDEVICE(INTEL, 0x9da4), (unsigned long)&cnl_info },
+	{ PCI_VDEVICE(INTEL, 0xa2a4), (unsigned long)&cnl_info },
+	{ PCI_VDEVICE(INTEL, 0x9d24), (unsigned long)&cnl_info },
 	{ },
 };
 MODULE_DEVICE_TABLE(pci, intel_spi_pci_ids);
-- 
2.39.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] spi: intel: Fix device private data and PR_NUM for BXT
  2023-02-01  5:04 ` [PATCH 1/2] spi: intel: Fix device private data and PR_NUM for BXT Mauro Lima
@ 2023-02-01  5:48   ` Mika Westerberg
  0 siblings, 0 replies; 6+ messages in thread
From: Mika Westerberg @ 2023-02-01  5:48 UTC (permalink / raw)
  To: Mauro Lima; +Cc: broonie, linux-spi, linux-kernel

Hi Mauro,

Please call it "Broxton".

On Wed, Feb 01, 2023 at 02:04:54AM -0300, Mauro Lima wrote:
> Some private data fields have to change from bxt_info to cnl_info.
> Here is the list of Device IDs with the respective documentation taken for
> validation:
>     0xa0a4 - Intel® 500 Series Chipset Family On-Package Platform Controller Hub
>     0x02a4 - Intel® 400 Series Chipset Family On-Package PCH
>     0x06a4 - Intel® 400 Series Chipset Family Platform Controller Hub
>     0x34a4 - Intel® 495 Chipset Family On-Package
>     0xa3a4 - Intel® B460 and H410 Chipset
> 
> According to documentation BXT has five PR registers.

Here too, "Broxton".

> Signed-off-by: Mauro Lima <mauro.lima@eclypsium.com>

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] spi: intel: Add support for controllers
  2023-02-01  5:04 ` [PATCH 2/2] spi: intel: Add support for controllers Mauro Lima
@ 2023-02-01  5:49   ` Mika Westerberg
  2023-02-01 14:27     ` ALOK TIWARI
  0 siblings, 1 reply; 6+ messages in thread
From: Mika Westerberg @ 2023-02-01  5:49 UTC (permalink / raw)
  To: Mauro Lima; +Cc: broonie, linux-spi, linux-kernel

On Wed, Feb 01, 2023 at 02:04:55AM -0300, Mauro Lima wrote:
> Add Device IDs to the module table for the following controllers:
> 	- 9da4  Cannon Lake 300 Series On-Package
> 	- a2a4  200 Series/Z370 Chipset Family SPI Controller
> 	- 9d24  Intel® 200 Series Chipset Family (Including Intel® X299),
> 		Intel® Z370 Intel® H310C,B365,
> 		also Intel® B460 and H410 Chipset Platform Controller Hub
> 
> Signed-off-by: Mauro Lima <mauro.lima@eclypsium.com>
> ---
>  drivers/spi/spi-intel-pci.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/spi/spi-intel-pci.c b/drivers/spi/spi-intel-pci.c
> index 10fa3a7fa4f5..ba08f64e56eb 100644
> --- a/drivers/spi/spi-intel-pci.c
> +++ b/drivers/spi/spi-intel-pci.c
> @@ -80,6 +80,9 @@ static const struct pci_device_id intel_spi_pci_ids[] = {
>  	{ PCI_VDEVICE(INTEL, 0xa224), (unsigned long)&bxt_info },
>  	{ PCI_VDEVICE(INTEL, 0xa324), (unsigned long)&cnl_info },
>  	{ PCI_VDEVICE(INTEL, 0xa3a4), (unsigned long)&cnl_info },
> +	{ PCI_VDEVICE(INTEL, 0x9da4), (unsigned long)&cnl_info },
> +	{ PCI_VDEVICE(INTEL, 0xa2a4), (unsigned long)&cnl_info },
> +	{ PCI_VDEVICE(INTEL, 0x9d24), (unsigned long)&cnl_info },

Make sure these are sorted numerically.

Otherwise looks good, thanks for doing this!


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] spi: intel: Add support for controllers
  2023-02-01  5:49   ` Mika Westerberg
@ 2023-02-01 14:27     ` ALOK TIWARI
  0 siblings, 0 replies; 6+ messages in thread
From: ALOK TIWARI @ 2023-02-01 14:27 UTC (permalink / raw)
  To: Mika Westerberg, Mauro Lima; +Cc: broonie, linux-spi, linux-kernel

9d24 and 9da4 should come after { PCI_VDEVICE(INTEL, 0x7e23), (unsigned 
long)&cnl_info

and a2a4  should be after { PCI_VDEVICE(INTEL, 0xa224), (unsigned 
long)&bxt_info }

Thanks,

Alok

On 2/1/2023 11:19 AM, Mika Westerberg wrote:
> On Wed, Feb 01, 2023 at 02:04:55AM -0300, Mauro Lima wrote:
>> Add Device IDs to the module table for the following controllers:
>> 	- 9da4  Cannon Lake 300 Series On-Package
>> 	- a2a4  200 Series/Z370 Chipset Family SPI Controller
>> 	- 9d24  Intel® 200 Series Chipset Family (Including Intel® X299),
>> 		Intel® Z370 Intel® H310C,B365,
>> 		also Intel® B460 and H410 Chipset Platform Controller Hub
>>
>> Signed-off-by: Mauro Lima <mauro.lima@eclypsium.com>
>> ---
>>   drivers/spi/spi-intel-pci.c | 3 +++
>>   1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/spi/spi-intel-pci.c b/drivers/spi/spi-intel-pci.c
>> index 10fa3a7fa4f5..ba08f64e56eb 100644
>> --- a/drivers/spi/spi-intel-pci.c
>> +++ b/drivers/spi/spi-intel-pci.c
>> @@ -80,6 +80,9 @@ static const struct pci_device_id intel_spi_pci_ids[] = {
>>   	{ PCI_VDEVICE(INTEL, 0xa224), (unsigned long)&bxt_info },
>>   	{ PCI_VDEVICE(INTEL, 0xa324), (unsigned long)&cnl_info },
>>   	{ PCI_VDEVICE(INTEL, 0xa3a4), (unsigned long)&cnl_info },
>> +	{ PCI_VDEVICE(INTEL, 0x9da4), (unsigned long)&cnl_info },
>> +	{ PCI_VDEVICE(INTEL, 0xa2a4), (unsigned long)&cnl_info },
>> +	{ PCI_VDEVICE(INTEL, 0x9d24), (unsigned long)&cnl_info },
> Make sure these are sorted numerically.
>
> Otherwise looks good, thanks for doing this!
>

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-02-01 14:27 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-01  5:04 [PATCH 0/2] spi: intel: PCI driver housekeeping Mauro Lima
2023-02-01  5:04 ` [PATCH 1/2] spi: intel: Fix device private data and PR_NUM for BXT Mauro Lima
2023-02-01  5:48   ` Mika Westerberg
2023-02-01  5:04 ` [PATCH 2/2] spi: intel: Add support for controllers Mauro Lima
2023-02-01  5:49   ` Mika Westerberg
2023-02-01 14:27     ` ALOK TIWARI

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).