[PATCH 0/2] spi: intel-pci: Meteor Lake fix and Arrow Lake PCI ID

[PATCH 0/2] spi: intel-pci: Meteor Lake fix and Arrow Lake PCI ID

[Mika Westerberg]

Hi,

The Meteor Lake-S SPI-NOR PCI ID is for a controller that does not
support all the necessary operations so the first patch removes that
from the driver. Second one adds the correct one (the same is used in
Arrow Lake).

Mika Westerberg (2):
  spi: intel-pci: Remove Meteor Lake-S SoC PCI ID from the list
  spi: intel-pci: Add support for Arrow Lake SPI serial flash

 drivers/spi/spi-intel-pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.43.0

[PATCH 1/2] spi: intel-pci: Remove Meteor Lake-S SoC PCI ID from the list

[Mika Westerberg]

Turns out this "SoC" side controller does not support certain commands,
such as reading chip JEDEC ID, so the controller is pretty much unusable
in Linux. We should be using the "PCH" side controller instead. For this
reason remove this PCI ID from the list.

Fixes: c2912d42e86e ("spi: intel-pci: Add support for Meteor Lake-S SPI serial flash")
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 drivers/spi/spi-intel-pci.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/spi/spi-intel-pci.c b/drivers/spi/spi-intel-pci.c
index 57d767a68e7b..b9918dcc3802 100644
--- a/drivers/spi/spi-intel-pci.c
+++ b/drivers/spi/spi-intel-pci.c
@@ -84,7 +84,6 @@ static const struct pci_device_id intel_spi_pci_ids[] = {
 	{ PCI_VDEVICE(INTEL, 0xa2a4), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0xa324), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0xa3a4), (unsigned long)&cnl_info },
-	{ PCI_VDEVICE(INTEL, 0xae23), (unsigned long)&cnl_info },
 	{ },
 };
 MODULE_DEVICE_TABLE(pci, intel_spi_pci_ids);
-- 
2.43.0

Re: [PATCH 1/2] spi: intel-pci: Remove Meteor Lake-S SoC PCI ID from the list

[Mark Brown]

On Mon, 22 Jan 2024 14:00:33 +0200, Mika Westerberg wrote:
> Turns out this "SoC" side controller does not support certain commands,
> such as reading chip JEDEC ID, so the controller is pretty much unusable
> in Linux. We should be using the "PCH" side controller instead. For this
> reason remove this PCI ID from the list.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/2] spi: intel-pci: Remove Meteor Lake-S SoC PCI ID from the list
      commit: 6c314425b9ef6b247cefd0903e287eb072580c3b
[2/2] spi: intel-pci: Add support for Arrow Lake SPI serial flash
      commit: 8afe3c7fcaf72fca1e7d3dab16a5b7f4201ece17

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

[PATCH 2/2] spi: intel-pci: Add support for Arrow Lake SPI serial flash

[Mika Westerberg]

This adds the PCI ID of the Arrow Lake and Meteor Lake-S PCH SPI serial
flash controller. This one supports all the necessary commands Linux
SPI-NOR stack requires.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 drivers/spi/spi-intel-pci.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/spi/spi-intel-pci.c b/drivers/spi/spi-intel-pci.c
index b9918dcc3802..07d20ca1164c 100644
--- a/drivers/spi/spi-intel-pci.c
+++ b/drivers/spi/spi-intel-pci.c
@@ -76,6 +76,7 @@ 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, 0x7f24), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0x9d24), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0x9da4), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0xa0a4), (unsigned long)&cnl_info },
-- 
2.43.0