Skip to contentSkip to conversation

misc: rtsx: add to support new card reader rts5264

PATCH Superseded Ricky WU 2 participants 6 messages Oct 20, 2023 – Oct 27, 2023

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Ricky WU

author
#0 lore raw

PATCH v3 1/2 misc: rtsx: add to support new card reader rts5264

In order to support new chip rts5264, the definitions of some internal registers and workflow have to be modified.
Added rts5264.c rts5264.h for independent functions of the new chip rts5264

---
v2: removed ic version check
v3: split the patch up with cardreader part and mmc part

---
 drivers/misc/cardreader/Makefile   |   2 +-
 drivers/misc/cardreader/rts5264.c  | 886 +++++++++++++++++++++++++++++
 drivers/misc/cardreader/rts5264.h  | 278 +++++++++
 drivers/misc/cardreader/rtsx_pcr.c |  30 +-
 drivers/misc/cardreader/rtsx_pcr.h |   1 +
 include/linux/rtsx_pci.h           |   8 +
 6 files changed, 1199 insertions(+), 6 deletions(-)
 create mode 100644 drivers/misc/cardreader/rts5264.c
 create mode 100644 drivers/misc/cardreader/rts5264.h
drivers/misc/cardreader/Makefile +1 -1
index 895128475d83..1e1bca6b0b22 100644
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_MISC_ALCOR_PCI)	+= alcor_pci.o
 obj-$(CONFIG_MISC_RTSX_PCI)	+= rtsx_pci.o
-rtsx_pci-objs := rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o rts5260.o rts5261.o rts5228.o
+rtsx_pci-objs := rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o rts5260.o rts5261.o rts5228.o rts5264.o
 obj-$(CONFIG_MISC_RTSX_USB)	+= rtsx_usb.o
drivers/misc/cardreader/rts5264.c new file +886 -0

886 lines not on this page · raw message

drivers/misc/cardreader/rts5264.h new file +278 -0

278 lines not on this page · raw message

drivers/misc/cardreader/rtsx_pcr.c +25 -5
index a30751ad3733..1a64364700eb 100644
@@ -26,6 +26,7 @@
 #include "rtsx_pcr.h"
 #include "rts5261.h"
 #include "rts5228.h"
+#include "rts5264.h"
 
 static bool msi_en = true;
 module_param(msi_en, bool, S_IRUGO | S_IWUSR);
@@ -54,6 +55,7 @@ static const struct pci_device_id rtsx_pci_ids[] = {
 	{ PCI_DEVICE(0x10EC, 0x5260), PCI_CLASS_OTHERS << 16, 0xFF0000 },
 	{ PCI_DEVICE(0x10EC, 0x5261), PCI_CLASS_OTHERS << 16, 0xFF0000 },
 	{ PCI_DEVICE(0x10EC, 0x5228), PCI_CLASS_OTHERS << 16, 0xFF0000 },
+	{ PCI_DEVICE(0x10EC, 0x5264), PCI_CLASS_OTHERS << 16, 0xFF0000 },
 	{ 0, }
 };
 
@@ -714,6 +716,9 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
 	if (PCI_PID(pcr) == PID_5228)
 		return rts5228_pci_switch_clock(pcr, card_clock,
 				ssc_depth, initial_mode, double_clk, vpclk);
+	if (PCI_PID(pcr) == PID_5264)
+		return rts5264_pci_switch_clock(pcr, card_clock,
+				ssc_depth, initial_mode, double_clk, vpclk);
 
 	if (initial_mode) {
 		/* We use 250k(around) here, in initial stage */
@@ -987,7 +992,8 @@ static irqreturn_t rtsx_pci_isr(int irq, void *dev_id)
 
 	int_reg &= (pcr->bier | 0x7FFFFF);
 
-	if (int_reg & SD_OC_INT)
+	if ((int_reg & SD_OC_INT) ||
+			((int_reg & SD_OVP_INT) && (PCI_PID(pcr) == PID_5264)))
 		rtsx_pci_process_ocp_interrupt(pcr);
 
 	if (int_reg & SD_INT) {
@@ -1159,7 +1165,9 @@ void rtsx_pci_enable_oobs_polling(struct rtsx_pcr *pcr)
 {
 	u16 val;
 
-	if ((PCI_PID(pcr) != PID_525A) && (PCI_PID(pcr) != PID_5260)) {
+	if ((PCI_PID(pcr) != PID_525A) &&
+		(PCI_PID(pcr) != PID_5260) &&
+		(PCI_PID(pcr) != PID_5264)) {
 		rtsx_pci_read_phy_register(pcr, 0x01, &val);
 		val |= 1<<9;
 		rtsx_pci_write_phy_register(pcr, 0x01, val);
@@ -1175,7 +1183,9 @@ void rtsx_pci_disable_oobs_polling(struct rtsx_pcr *pcr)
 {
 	u16 val;
 
-	if ((PCI_PID(pcr) != PID_525A) && (PCI_PID(pcr) != PID_5260)) {
+	if ((PCI_PID(pcr) != PID_525A) &&
+		(PCI_PID(pcr) != PID_5260) &&
+		(PCI_PID(pcr) != PID_5264)) {
 		rtsx_pci_read_phy_register(pcr, 0x01, &val);
 		val &= ~(1<<9);
 		rtsx_pci_write_phy_register(pcr, 0x01, val);
@@ -1226,7 +1236,7 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)
 	rtsx_pci_enable_bus_int(pcr);
 
 	/* Power on SSC */
-	if (PCI_PID(pcr) == PID_5261) {
+	if ((PCI_PID(pcr) == PID_5261) || (PCI_PID(pcr) == PID_5264)) {
 		/* Gating real mcu clock */
 		err = rtsx_pci_write_register(pcr, RTS5261_FW_CFG1,
 			RTS5261_MCU_CLOCK_GATING, 0);
@@ -1270,6 +1280,11 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)
 	else if (PCI_PID(pcr) == PID_5228)
 		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SSC_CTL2, 0xFF,
 			RTS5228_SSC_DEPTH_2M);
+	else if (is_version(pcr, 0x5264, IC_VER_A))
+		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SSC_CTL1, SSC_RSTB, 0);
+	else if (PCI_PID(pcr) == PID_5264)
+		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SSC_CTL2, 0xFF,
+			RTS5264_SSC_DEPTH_2M);
 	else
 		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SSC_CTL2, 0xFF, 0x12);
 
@@ -1305,6 +1320,7 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)
 	case PID_5260:
 	case PID_5261:
 	case PID_5228:
+	case PID_5264:
 		rtsx_pci_write_register(pcr, PM_CLK_FORCE_CTL, 1, 1);
 		break;
 	default:
@@ -1404,6 +1420,10 @@ static int rtsx_pci_init_chip(struct rtsx_pcr *pcr)
 	case 0x5228:
 		rts5228_init_params(pcr);
 		break;
+
+	case 0x5264:
+		rts5264_init_params(pcr);
+		break;
 	}
 
 	pcr_dbg(pcr, "PID: 0x%04x, IC version: 0x%02x\n",
@@ -1544,7 +1564,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
 	pcr->pci = pcidev;
 	dev_set_drvdata(&pcidev->dev, handle);
 
-	if (CHK_PCI_PID(pcr, 0x525A))
+	if ((CHK_PCI_PID(pcr, 0x525A)) || (CHK_PCI_PID(pcr, 0x5264)))
 		bar = 1;
 	len = pci_resource_len(pcidev, bar);
 	base = pci_resource_start(pcidev, bar);
drivers/misc/cardreader/rtsx_pcr.h +1 -0
index 37d1f316ae17..9215d66de00c 100644
@@ -74,6 +74,7 @@ void rtl8411b_init_params(struct rtsx_pcr *pcr);
 void rts5260_init_params(struct rtsx_pcr *pcr);
 void rts5261_init_params(struct rtsx_pcr *pcr);
 void rts5228_init_params(struct rtsx_pcr *pcr);
+void rts5264_init_params(struct rtsx_pcr *pcr);
 
 static inline u8 map_sd_drive(int idx)
 {
include/linux/rtsx_pci.h +8 -0
index 534038d962e4..4612ef09a0c7 100644
@@ -60,6 +60,7 @@
 #define   SD_EXIST			(1 << 16)
 #define   DELINK_INT			GPIO0_INT
 #define   MS_OC_INT			(1 << 23)
+#define   SD_OVP_INT		(1 << 23)
 #define   SD_OC_INT			(1 << 22)
 
 #define CARD_INT		(XD_INT | MS_INT | SD_INT)
@@ -80,6 +81,7 @@
 #define   OC_INT_EN			(1 << 23)
 #define   DELINK_INT_EN			GPIO0_INT_EN
 #define   MS_OC_INT_EN			(1 << 23)
+#define   SD_OVP_INT_EN			(1 << 23)
 #define   SD_OC_INT_EN			(1 << 22)
 
 #define RTSX_DUM_REG			0x1C
@@ -583,6 +585,7 @@
 #define   OBFF_DISABLE			0x00
 
 #define CDRESUMECTL			0xFE52
+#define CDGW				0xFE53
 #define WAKE_SEL_CTL			0xFE54
 #define PCLK_CTL			0xFE55
 #define   PCLK_MODE_SEL			0x20
@@ -764,6 +767,9 @@
 #define   SD_VIO_LDO_1V8		0x40
 #define   SD_VIO_LDO_3V3		0x70
 
+#define RTS5264_AUTOLOAD_CFG2		0xFF7D
+#define RTS5264_CHIP_RST_N_SEL		(1 << 6)
+
 #define RTS5260_AUTOLOAD_CFG4		0xFF7F
 #define   RTS5260_MIMO_DISABLE		0x8A
 /*RTS5261*/
@@ -1261,6 +1267,7 @@ struct rtsx_pcr {
 	u8				dma_error_count;
 	u8			ocp_stat;
 	u8			ocp_stat2;
+	u8			ovp_stat;
 	u8			rtd3_en;
 };
 
@@ -1271,6 +1278,7 @@ struct rtsx_pcr {
 #define PID_5260	0x5260
 #define PID_5261	0x5261
 #define PID_5228	0x5228
+#define PID_5264	0x5264
 
 #define CHK_PCI_PID(pcr, pid)		((pcr)->pci->device == (pid))
 #define PCI_VID(pcr)			((pcr)->pci->vendor)
Signature · 1 line
2.25.1
#1 lore raw
Quoted 2 lines · Ricky WU

In order to support new chip rts5264, the definitions of some internal registers and workflow have to be modified.

That is fine, but that should be a single patch, right?

Quoted 1 line

Added rts5264.c rts5264.h for independent functions of the new chip rts5264

And then add new support in a new patch, this is still too big as one patch to attempt to review it properly. Would you like to review this as-is?

thanks,

greg k-h

author
#2 lore raw
Quoted 5 lines
Quoted 2 lines

In order to support new chip rts5264, the definitions of some internal registers and workflow have to be modified.

That is fine, but that should be a single patch, right?

Sorry maybe about misunderstand, The modifications mentioned here, it talk about some judgment expressions add "PID 5264" to make judgement in rtsx_pcr.c, so only about 30 line modified in rtsx_pcr.c

Quoted 6 lines
Quoted 1 line

Added rts5264.c rts5264.h for independent functions of the new chip rts5264

And then add new support in a new patch, this is still too big as one patch to attempt to review it properly. Would you like to review this as-is?

Yes, thank you
Because rts5264.c rts5264.h only for rts5264 (new chip).
The past architecture of this driver was like this, and it will good for us to maintain the driver different chip maybe has different functions and register definitions we used to separate different .c .h

Quoted 3 lines

thanks,

greg k-h

#3 lore raw
Quoted 17 lines · Ricky WU
Quoted 5 lines
Quoted 2 lines

In order to support new chip rts5264, the definitions of some internal registers and workflow have to be modified.

That is fine, but that should be a single patch, right?

Sorry maybe about misunderstand, The modifications mentioned here, it talk about some judgment expressions add "PID 5264" to make judgement in rtsx_pcr.c, so only about 30 line modified in rtsx_pcr.c

Quoted 6 lines
Quoted 1 line

Added rts5264.c rts5264.h for independent functions of the new chip rts5264

And then add new support in a new patch, this is still too big as one patch to attempt to review it properly. Would you like to review this as-is?

Quoted 4 lines

Yes, thank you
Because rts5264.c rts5264.h only for rts5264 (new chip).
The past architecture of this driver was like this, and it will good for us to maintain the driver different chip maybe has different functions and register definitions we used to separate different .c .h

Sorry, I don't think I was clear, this needs to be broken up into smaller pieces to be able for us to review it properly. Please do so and resend a new version of the patch series.

thanks,

greg k-h

author
#4 lore raw
Quoted 25 lines · Ricky WU
Quoted 18 lines
Quoted 5 lines
Quoted 2 lines

In order to support new chip rts5264, the definitions of some internal registers and workflow have to be modified.

That is fine, but that should be a single patch, right?

Sorry maybe about misunderstand, The modifications mentioned here, it talk about some judgment expressions add "PID 5264" to make judgement in rtsx_pcr.c, so only about 30 line modified in rtsx_pcr.c

Quoted 7 lines
Quoted 2 lines

Added rts5264.c rts5264.h for independent functions of the new chip rts5264

And then add new support in a new patch, this is still too big as one patch to attempt to review it properly. Would you like to review this as-is?

Quoted 5 lines

Yes, thank you
Because rts5264.c rts5264.h only for rts5264 (new chip). The past architecture of this driver was like this, and it will good for us to maintain the driver different chip maybe has different functions and register definitions we used to separate different .c .h

Quoted 4 lines

Sorry, I don't think I was clear, this needs to be broken up into smaller pieces to be able for us to review it properly. Please do so and resend a new version of the patch series.

Hi Greg k-h,

I want to confirm with you first
I will have a new version for this patch, separate it into:
1. 2 new file and Makefile for new chip function and definition
2. rtsx_pcr.c and rtsx_pcr.h for driver judgement to call new chip function
3. mmc part

It is ok for you?

Thank you
Ricky

Quoted 3 lines

thanks,

greg k-h

#5 lore raw
Quoted 32 lines · Ricky WU
Quoted 25 lines · Ricky WU
Quoted 18 lines
Quoted 5 lines
Quoted 2 lines

In order to support new chip rts5264, the definitions of some internal registers and workflow have to be modified.

That is fine, but that should be a single patch, right?

Sorry maybe about misunderstand, The modifications mentioned here, it talk about some judgment expressions add "PID 5264" to make judgement in rtsx_pcr.c, so only about 30 line modified in rtsx_pcr.c

Quoted 7 lines
Quoted 2 lines

Added rts5264.c rts5264.h for independent functions of the new chip rts5264

And then add new support in a new patch, this is still too big as one patch to attempt to review it properly. Would you like to review this as-is?

Quoted 5 lines

Yes, thank you
Because rts5264.c rts5264.h only for rts5264 (new chip). The past architecture of this driver was like this, and it will good for us to maintain the driver different chip maybe has different functions and register definitions we used to separate different .c .h

Quoted 4 lines

Sorry, I don't think I was clear, this needs to be broken up into smaller pieces to be able for us to review it properly. Please do so and resend a new version of the patch series.

Hi Greg k-h,

Quoted 7 lines

I want to confirm with you first
I will have a new version for this patch, separate it into:
1. 2 new file and Makefile for new chip function and definition
2. rtsx_pcr.c and rtsx_pcr.h for driver judgement to call new chip function
3. mmc part

It is ok for you?

That's a good start, try it and see what that looks like.

Again, create patch series that you yourself would like to be able to review. Take some time to think about the reviewer's side of this as that's the most limited resource we currently have.

thanks,

greg k-h