spi: mchp-pci1xxxx: Fix minor bugs in spi-pci1xxxx driver
cover spi: mchp-pci1xxxx: Fix minor bugs in spi-pci1xxxx driver
This patch series fixes the following bugs in spi-pci1xxxx driver:
1. Length of SPI transactions is improper
2. SPI transactions fail after suspend and resume
3. Incorrect implementation of pci1xxxx_spi_set_cs API
Tharun Kumar P (3):
spi: mchp-pci1xxxx: Fix length of SPI transactions not set properly in
driver
spi: mchp-pci1xxxx: Fix SPI transactions not working after suspend and
resume
spi: mchp-pci1xxxx: Fix improper implementation of disabling chip
select lines
drivers/spi/spi-pci1xxxx.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/3 spi: mchp-pci1xxxx: Fix length of SPI transactions not set properly in driver
In pci1xxxx_spi_transfer_one API, length of SPI transaction gets cleared by setting of length mask. Set length of transaction only after masking length field.
--- drivers/spi/spi-pci1xxxx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi-pci1xxxx.c +2 -1
@@ -199,8 +199,9 @@ static int pci1xxxx_spi_transfer_one(struct spi_controller *spi_ctlr,else regval &= ~SPI_MST_CTL_MODE_SEL ; - regval |= ((clkdiv <<5 ) |SPI_FORCE_CE | (len <<8 )); + regval |= ((clkdiv <<5 ) |SPI_FORCE_CE ); regval &= ~SPI_MST_CTL_CMD_LEN_MASK ; + regval |= (len <<8 );writel (regval, par->reg_base +SPI_MST_CTL_REG_OFFSET (p->hw_inst)); regval = readl(par->reg_base +
Signature · 1 line
2.25.1
PATCH 2/3 spi: mchp-pci1xxxx: Fix SPI transactions not working after suspend and resume
In reply to Tharun Kumar Ppci1xxxx_spi_resume API masks SPI interrupt bit which prohibits interrupt from coming to the host at the end of the transaction after suspend-resume. This patch unmasks this bit at resume.
--- drivers/spi/spi-pci1xxxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-pci1xxxx.c +1 -1
@@ -58,7 +58,7 @@#define VENDOR_ID_MCHP 0x1055#define SPI_SUSPEND_CONFIG 0x101 -#define SPI_RESUME_CONFIG 0x303 +#define SPI_RESUME_CONFIG 0x203struct pci1xxxx_spi_internal {u8 hw_inst;
Signature · 1 line
2.25.1
PATCH 3/3 spi: mchp-pci1xxxx: Fix improper implementation of disabling chip select lines
In reply to Tharun Kumar PHardware does not have support to disable individual chip select lines. Disable all chip select lines by using SPI_FORCE_CE bit.
--- drivers/spi/spi-pci1xxxx.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
drivers/spi/spi-pci1xxxx.c +5 -12
@@ -114,17 +114,14 @@ static void pci1xxxx_spi_set_cs(struct spi_device *spi, bool enable)/* Set the DEV_SEL bits of the SPI_MST_CTL_REG */ regval =readl (par->reg_base +SPI_MST_CTL_REG_OFFSET (p->hw_inst)); -if (enable) { +if (!enable) { + regval |=SPI_FORCE_CE ; regval &= ~SPI_MST_CTL_DEVSEL_MASK ; regval |= (spi_get_chipselect (spi,0 ) <<25 ); -writel (regval, - par->reg_base +SPI_MST_CTL_REG_OFFSET (p->hw_inst)); }else { - regval &= ~(spi_get_chipselect (spi,0 ) <<25 ); -writel (regval, - par->reg_base +SPI_MST_CTL_REG_OFFSET (p->hw_inst)); - + regval &= ~SPI_FORCE_CE ; } +writel (regval, par->reg_base +SPI_MST_CTL_REG_OFFSET (p->hw_inst)); }static u8 pci1xxxx_get_clock_div (u32 hz)
@@ -199,7 +196,7 @@ static int pci1xxxx_spi_transfer_one(struct spi_controller *spi_ctlr,else regval &= ~SPI_MST_CTL_MODE_SEL ; - regval |= ((clkdiv <<5 ) |SPI_FORCE_CE ); + regval |= (clkdiv <<5 ); regval &= ~SPI_MST_CTL_CMD_LEN_MASK ; regval |= (len <<8 ); writel(regval, par->reg_base +
@@ -223,10 +220,6 @@ static int pci1xxxx_spi_transfer_one(struct spi_controller *spi_ctlr, } } } - - regval =readl (par->reg_base +SPI_MST_CTL_REG_OFFSET (p->hw_inst)); - regval &= ~SPI_FORCE_CE ; -writel (regval, par->reg_base +SPI_MST_CTL_REG_OFFSET (p->hw_inst)); p->spi_xfer_in_progress = false;return 0 ;
Signature · 1 line
2.25.1
Mark Brown
maintainerQuoted 13 lines · Tharun Kumar P
This patch series fixes the following bugs in spi-pci1xxxx driver:
1. Length of SPI transactions is improper
2. SPI transactions fail after suspend and resume
3. Incorrect implementation ofpci1xxxx_spi_set_csAPITharun Kumar P (3):
spi: mchp-pci1xxxx: Fix length of SPI transactions not set properly in
driver
spi: mchp-pci1xxxx: Fix SPI transactions not working after suspend and
resume
spi: mchp-pci1xxxx: Fix improper implementation of disabling chip
select lines
Quoted 1 line
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/3] spi: mchp-pci1xxxx: Fix length of SPI transactions not set properly in driver
commit: 35c8c5e503a82e0a4bf251d32096211eba8c2be6
[2/3] spi: mchp-pci1xxxx: Fix SPI transactions not working after suspend and resume
commit: 4266d21669de62cf3fb6774f7d404c1eb95a5ab3
[3/3] spi: mchp-pci1xxxx: Fix improper implementation of disabling chip select lines
commit: 45d2af82e0e6f662d0d0db20993b35cb1d8da646All 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