History

Merge tag 'spi-fix-v6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi fixes from Mark Brown: "A few small fixes for v6.9, The core fix is for issues with reuse of a spi_message in the case where we've got queued messages (a relatively rare occurrence with modern code so it wasn't noticed in testing). We also avoid an issue with the Kunpeng driver by simply removing the debug interface that could trigger it, and address issues with confusing and corrupted output when printing the IP version of the AXI SPI engine" * tag 'spi-fix-v6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: spi: fix null pointer dereference within spi_sync spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs spi: axi-spi-engine: fix version format string

Linus Torvalds committed 2 years ago

Commit 9fbc8bd2 parents f03359b 4756fa53 files · +2 −3Browse files

Unified · Split

3 files
  1. drivers/spi/spi-axi-spi-engine.c +1 −1
  2. drivers/spi/spi-hisi-kunpeng.c +0 −2
  3. drivers/spi/spi.c +1 −0
drivers/spi/spi-axi-spi-engine.c+1−1
@@ -623,7 +623,7 @@ static int spi_engine_probe(struct platform_device *pdev) · 622 unmodified lines
623 623
624 version = readl(spi_engine->base + ADI_AXI_REG_VERSION);624 version = readl(spi_engine->base + ADI_AXI_REG_VERSION);
625 if (ADI_AXI_PCORE_VER_MAJOR(version) != 1) {625 if (ADI_AXI_PCORE_VER_MAJOR(version) != 1) {
626 dev_err(&pdev->dev, "Unsupported peripheral version %u.%u.%c\n",626 dev_err(&pdev->dev, "Unsupported peripheral version %u.%u.%u\n",
627 ADI_AXI_PCORE_VER_MAJOR(version),627 ADI_AXI_PCORE_VER_MAJOR(version),
628 ADI_AXI_PCORE_VER_MINOR(version),628 ADI_AXI_PCORE_VER_MINOR(version),
629 ADI_AXI_PCORE_VER_PATCH(version));629 ADI_AXI_PCORE_VER_PATCH(version));
drivers/spi/spi-hisi-kunpeng.c+0−2
@@ -151,8 +151,6 @@ static const struct debugfs_reg32 hisi_spi_regs[] = { · 150 unmodified lines
151 HISI_SPI_DBGFS_REG("ENR", HISI_SPI_ENR),151 HISI_SPI_DBGFS_REG("ENR", HISI_SPI_ENR),
152 HISI_SPI_DBGFS_REG("FIFOC", HISI_SPI_FIFOC),152 HISI_SPI_DBGFS_REG("FIFOC", HISI_SPI_FIFOC),
153 HISI_SPI_DBGFS_REG("IMR", HISI_SPI_IMR),153 HISI_SPI_DBGFS_REG("IMR", HISI_SPI_IMR),
154 HISI_SPI_DBGFS_REG("DIN", HISI_SPI_DIN),
155 HISI_SPI_DBGFS_REG("DOUT", HISI_SPI_DOUT),
156 HISI_SPI_DBGFS_REG("SR", HISI_SPI_SR),154 HISI_SPI_DBGFS_REG("SR", HISI_SPI_SR),
157 HISI_SPI_DBGFS_REG("RISR", HISI_SPI_RISR),155 HISI_SPI_DBGFS_REG("RISR", HISI_SPI_RISR),
158 HISI_SPI_DBGFS_REG("ISR", HISI_SPI_ISR),156 HISI_SPI_DBGFS_REG("ISR", HISI_SPI_ISR),
drivers/spi/spi.c+1−0
@@ -4523,6 +4523,7 @@ static int __spi_sync(struct spi_device *spi, struct spi_message *message) · 4522 unmodified lines
4523 wait_for_completion(&done);4523 wait_for_completion(&done);
4524 status = message->status;4524 status = message->status;
4525 }4525 }
4526 message->complete = NULL;
4526 message->context = NULL;4527 message->context = NULL;
4527 4528
4528 return status;4529 return status;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t