Skip to contentSkip to conversation

mfd: rtsx: fix PM suspend for 5227 & 5249

PATCH Applied [email protected] 2 participants 7 messages Oct 10, 2014 – Oct 22, 2014 Multifunction devices (MFD)

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH v2 1/1 mfd: rtsx: fix PM suspend for 5227 & 5249

From: Micky Ching <[email protected]>

Fix rts5227&5249 failed send buffer cmd after suspend, PM_CTRL3 should reset before send any buffer cmd after suspend. Otherwise, buffer cmd will failed, this will lead resume fail.

Signed-off-by Micky Ching <[email protected]>
---
 drivers/mfd/Makefile         |  2 +-
 drivers/mfd/rts5227.c        |  6 ++++++
 drivers/mfd/rts5249.c        |  4 ++++
 drivers/mfd/rtsx_gops.c      | 37 +++++++++++++++++++++++++++++++++++++
 drivers/mfd/rtsx_pcr.h       |  3 +++
 include/linux/mfd/rtsx_pci.h | 28 ++++++++++++++++++++++++++++
 6 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 drivers/mfd/rtsx_gops.c
drivers/mfd/Makefile +1 -1
index f001487..7f45c06 100644
@@ -13,7 +13,7 @@ obj-$(CONFIG_MFD_CROS_EC)	+= cros_ec.o
 obj-$(CONFIG_MFD_CROS_EC_I2C)	+= cros_ec_i2c.o
 obj-$(CONFIG_MFD_CROS_EC_SPI)	+= cros_ec_spi.o
 
-rtsx_pci-objs			:= rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o
+rtsx_pci-objs			:= rtsx_pcr.o rtsx_gops.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o
 obj-$(CONFIG_MFD_RTSX_PCI)	+= rtsx_pci.o
 obj-$(CONFIG_MFD_RTSX_USB)	+= rtsx_usb.o
drivers/mfd/rts5227.c +6 -0
index 9c8eec8..3240740 100644
@@ -130,6 +130,12 @@ static int rts5227_extra_init_hw(struct rtsx_pcr *pcr)
 
 static int rts5227_optimize_phy(struct rtsx_pcr *pcr)
 {
+	int err;
+
+	err = rtsx_gops_pm_reset(pcr);
+	if (err < 0)
+		return err;
+
 	/* Optimize RX sensitivity */
 	return rtsx_pci_write_phy_register(pcr, 0x00, 0xBA42);
 }
drivers/mfd/rts5249.c +4 -0
index 573de7b..cf425cc 100644
@@ -130,6 +130,10 @@ static int rts5249_optimize_phy(struct rtsx_pcr *pcr)
 {
 	int err;
 
+	err = rtsx_gops_pm_reset(pcr);
+	if (err < 0)
+		return err;
+
 	err = rtsx_pci_write_phy_register(pcr, PHY_REG_REV,
 			PHY_REG_REV_RESV | PHY_REG_REV_RXIDLE_LATCHED |
 			PHY_REG_REV_P1_EN | PHY_REG_REV_RXIDLE_EN |
drivers/mfd/rtsx_gops.c new file +37 -0
new file mode 100644
index 0000000..b1a98c6
@@ -0,0 +1,37 @@
+/* Driver for Realtek PCI-Express card reader
+ *
+ * Copyright(c) 2009-2013 Realtek Semiconductor Corp. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2, or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Micky Ching <[email protected]>
+ */
+
+#include <linux/mfd/rtsx_pci.h>
+#include "rtsx_pcr.h"
+
+int rtsx_gops_pm_reset(struct rtsx_pcr *pcr)
+{
+	int err;
+
+	/* init aspm */
+	rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0xFF, 0x00);
+	err = rtsx_pci_update_cfg_byte(pcr, LCTLR, ~LCTLR_ASPM_CTL_MASK, 0x00);
+	if (err < 0)
+		return err;
+
+	/* reset PM_CTRL3 before send buffer cmd */
+	return rtsx_pci_write_register(pcr, PM_CTRL3, D3_DELINK_MODE_EN, 0x00);
+}
drivers/mfd/rtsx_pcr.h +3 -0
index 07e4c2e..fe2bbb6 100644
@@ -72,4 +72,7 @@ do {									\
 	pcr->ms_pull_ctl_disable_tbl = __device##_ms_pull_ctl_disable_tbl; \
 } while (0)
 
+/* generic operations */
+int rtsx_gops_pm_reset(struct rtsx_pcr *pcr);
+
 #endif
include/linux/mfd/rtsx_pci.h +28 -0
index 74346d5..1604dda 100644
@@ -707,6 +707,14 @@
 #define PM_CTRL1			0xFF44
 #define PM_CTRL2			0xFF45
 #define PM_CTRL3			0xFF46
+#define   SDIO_SEND_PME_EN		0x80
+#define   FORCE_RC_MODE_ON		0x40
+#define   FORCE_RX50_LINK_ON		0x20
+#define   D3_DELINK_MODE_EN		0x10
+#define   USE_PESRTB_CTL_DELINK		0x08
+#define   DELAY_PIN_WAKE		0x04
+#define   RESET_PIN_WAKE		0x02
+#define   PM_WAKE_EN			0x01
 #define PM_CTRL4			0xFF47
 
 /* Memory mapping */

@@ -752,6 +760,14 @@
 #define PHY_DUM_REG			0x1F
 
 #define LCTLR				0x80
+#define   LCTLR_EXT_SYNC		0x80
+#define   LCTLR_COMMON_CLOCK_CFG	0x40
+#define   LCTLR_RETRAIN_LINK		0x20
+#define   LCTLR_LINK_DISABLE		0x10
+#define   LCTLR_RCB			0x08
+#define   LCTLR_RESERVED		0x04
+#define   LCTLR_ASPM_CTL_MASK		0x03
+
 #define PCR_SETTING_REG1		0x724
 #define PCR_SETTING_REG2		0x814
 #define PCR_SETTING_REG3		0x747

@@ -967,4 +983,16 @@ static inline u8 *rtsx_pci_get_cmd_data(struct rtsx_pcr *pcr)
 	return (u8 *)(pcr->host_cmds_ptr);
 }
 
+static inline int rtsx_pci_update_cfg_byte(struct rtsx_pcr *pcr, int addr,
+		u8 mask, u8 append)
+{
+	int err;
+	u8 val;
+
+	err = pci_read_config_byte(pcr->pci, addr, &val);
+	if (err < 0)
+		return err;
+	return pci_write_config_byte(pcr->pci, addr, (val & mask) | append);
+}
+
 #endif
Signature · 1 line
1.9.1
#1 lore raw
Quoted 6 lines · On Fri, 10 Oct 2014, [email protected] wrote:

From: Micky Ching <[email protected]>

Fix rts5227&5249 failed send buffer cmd after suspend, PM_CTRL3 should reset before send any buffer cmd after suspend. Otherwise, buffer cmd will failed, this will lead resume fail.

Quoted 8 lines
Signed-off-by Micky Ching <[email protected]>
---
 drivers/mfd/Makefile         |  2 +-
 drivers/mfd/rts5227.c        |  6 ++++++
 drivers/mfd/rts5249.c        |  4 ++++
 drivers/mfd/rtsx_gops.c      | 37 +++++++++++++++++++++++++++++++++++++
 drivers/mfd/rtsx_pcr.h       |  3 +++
 include/linux/mfd/rtsx_pci.h | 28 ++++++++++++++++++++++++++++

These are Card Reader drivers right?

Do you know why these are in MFD?

Quoted 2 lines
 6 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 drivers/mfd/rtsx_gops.c
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
author
#2 lore raw
Quoted 16 lines · Lee Jones
Quoted 6 lines · On Fri, 10 Oct 2014, [email protected] wrote:

From: Micky Ching <[email protected]>

Fix rts5227&5249 failed send buffer cmd after suspend, PM_CTRL3 should reset before send any buffer cmd after suspend. Otherwise, buffer cmd will failed, this will lead resume fail.

Quoted 8 lines
Signed-off-by Micky Ching <[email protected]>
---
  drivers/mfd/Makefile         |  2 +-
  drivers/mfd/rts5227.c        |  6 ++++++
  drivers/mfd/rts5249.c        |  4 ++++
  drivers/mfd/rtsx_gops.c      | 37 +++++++++++++++++++++++++++++++++++++
  drivers/mfd/rtsx_pcr.h       |  3 +++
  include/linux/mfd/rtsx_pci.h | 28 ++++++++++++++++++++++++++++
Quoted 3 lines

These are Card Reader drivers right?

Do you know why these are in MFD?

Hi Lee,

Our chips support SD/MMC card and MS card, SD/MMC card driver is put into mmc/ subsystem, MS card driver is put into memstick/ subsystem. We put the common functions into mfd/ subsystem.

Quoted 4 lines
Quoted 3 lines
  6 files changed, 79 insertions(+), 1 deletion(-)

create mode 100644 drivers/mfd/rtsx_gops.c

Signature · 5 lines
Best Regards,
micky.
--------------------
Realsil Microelectronics Inc. PCBU swlinux.
Tel:86-512-6258-8966 Ext: 5806
#3 lore raw
In reply to [email protected]
Quoted 16 lines · On Fri, 10 Oct 2014, [email protected] wrote:

From: Micky Ching <[email protected]>

Fix rts5227&5249 failed send buffer cmd after suspend, PM_CTRL3 should reset before send any buffer cmd after suspend. Otherwise, buffer cmd will failed, this will lead resume fail.

Signed-off-by Micky Ching <[email protected]>
---
 drivers/mfd/Makefile         |  2 +-
 drivers/mfd/rts5227.c        |  6 ++++++
 drivers/mfd/rts5249.c        |  4 ++++
 drivers/mfd/rtsx_gops.c      | 37 +++++++++++++++++++++++++++++++++++++
 drivers/mfd/rtsx_pcr.h       |  3 +++
 include/linux/mfd/rtsx_pci.h | 28 ++++++++++++++++++++++++++++
 6 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 drivers/mfd/rtsx_gops.c

[...]

include/linux/mfd/rtsx_pci.h static inline u8 *rtsx_pci_get_cmd_data(struct rtsx_pcr *pcr) · line 997

Quoted 12 lines
include/linux/mfd/rtsx_pci.h +12 -0
+static inline int rtsx_pci_update_cfg_byte(struct rtsx_pcr *pcr, int addr,
+		u8 mask, u8 append)
+{
+	int err;
+	u8 val;
+
+	err = pci_read_config_byte(pcr->pci, addr, &val);
+	if (err < 0)
+		return err;
+	return pci_write_config_byte(pcr->pci, addr, (val & mask) | append);
+}
+

Why is this in here? Why not put it in the generic ops file?

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
author
#4 lore raw
Quoted 20 lines · Lee Jones
Quoted 16 lines · On Fri, 10 Oct 2014, [email protected] wrote:

From: Micky Ching <[email protected]>

Fix rts5227&5249 failed send buffer cmd after suspend, PM_CTRL3 should reset before send any buffer cmd after suspend. Otherwise, buffer cmd will failed, this will lead resume fail.

Signed-off-by Micky Ching <[email protected]>
---
  drivers/mfd/Makefile         |  2 +-
  drivers/mfd/rts5227.c        |  6 ++++++
  drivers/mfd/rts5249.c        |  4 ++++
  drivers/mfd/rtsx_gops.c      | 37 +++++++++++++++++++++++++++++++++++++
  drivers/mfd/rtsx_pcr.h       |  3 +++
  include/linux/mfd/rtsx_pci.h | 28 ++++++++++++++++++++++++++++
  6 files changed, 79 insertions(+), 1 deletion(-)

create mode 100644 drivers/mfd/rtsx_gops.c

[...]

Quoted 13 lines

include/linux/mfd/rtsx_pci.h static inline u8 *rtsx_pci_get_cmd_data(struct rtsx_pcr *pcr) · line 997

Quoted 12 lines
include/linux/mfd/rtsx_pci.h +12 -0
+static inline int rtsx_pci_update_cfg_byte(struct rtsx_pcr *pcr, int addr,
+		u8 mask, u8 append)
+{
+	int err;
+	u8 val;
+
+	err = pci_read_config_byte(pcr->pci, addr, &val);
+	if (err < 0)
+		return err;
+	return pci_write_config_byte(pcr->pci, addr, (val & mask) | append);
+}
+

Why is this in here? Why not put it in the generic ops file?

This function is a good interface, we will use it many times in the future.

generic ops file is only used to some operation can be used for different chip, some special chip may replace generic ops by provide their own ops. So generic ops file is just use to abstract the same code, not for good interface.

Quoted 1 line
Signature · 5 lines
Best Regards,
micky.
--------------------
Realsil Microelectronics Inc. PCBU swlinux.
Tel:86-512-6258-8966 Ext: 5806
author
#5 lore raw

Hi Lee,

I am wondering if you have accepted this patch?

Best Regards.
micky.

Quoted 46 lines · Micky Ching
Quoted 21 lines · Lee Jones
Quoted 17 lines · On Fri, 10 Oct 2014, [email protected] wrote:

From: Micky Ching <[email protected]>

Fix rts5227&5249 failed send buffer cmd after suspend, PM_CTRL3 should reset before send any buffer cmd after suspend. Otherwise, buffer cmd will failed, this will lead resume fail.

Signed-off-by Micky Ching <[email protected]>
---
  drivers/mfd/Makefile         |  2 +-
  drivers/mfd/rts5227.c        |  6 ++++++
  drivers/mfd/rts5249.c        |  4 ++++
  drivers/mfd/rtsx_gops.c      | 37 
+++++++++++++++++++++++++++++++++++++
  drivers/mfd/rtsx_pcr.h       |  3 +++
  include/linux/mfd/rtsx_pci.h | 28 ++++++++++++++++++++++++++++
  6 files changed, 79 insertions(+), 1 deletion(-)

create mode 100644 drivers/mfd/rtsx_gops.c

[...]

Quoted 15 lines
Quoted 12 lines

+static inline int rtsx_pci_update_cfg_byte(struct rtsx_pcr *pcr, int addr,

include/linux/mfd/rtsx_pci.h +9 -0
+        u8 mask, u8 append)
+{
+    int err;
+    u8 val;
+
+    err = pci_read_config_byte(pcr->pci, addr, &val);
+    if (err < 0)
+        return err;
+    return pci_write_config_byte(pcr->pci, addr, (val & mask) |

append);

include/linux/mfd/rtsx_pci.h static inline u8 *rtsx_pci_get_cmd_data(struct rtsx_pcr *pcr) · line 997

Quoted 2 lines
include/linux/mfd/rtsx_pci.h +2 -0
+}
+

Why is this in here? Why not put it in the generic ops file?

This function is a good interface, we will use it many times in the future.

generic ops file is only used to some operation can be used for different chip, some special chip may replace generic ops by provide their own ops. So generic ops file is just use to abstract the same code, not for good interface.

Quoted 1 line
Signature · 5 lines
Best Regards,
micky.
--------------------
Realsil Microelectronics Inc. PCBU swlinux.
Tel:86-512-6258-8966 Ext: 5806
Applied
#6 lore raw
In reply to [email protected]
Quoted 7 lines · On Fri, 10 Oct 2014, [email protected] wrote:

From: Micky Ching <[email protected]>

Fix rts5227&5249 failed send buffer cmd after suspend, PM_CTRL3 should reset before send any buffer cmd after suspend. Otherwise, buffer cmd will failed, this will lead resume fail.

Signed-off-by Micky Ching <[email protected]>
Quoted 9 lines
---
 drivers/mfd/Makefile         |  2 +-
 drivers/mfd/rts5227.c        |  6 ++++++
 drivers/mfd/rts5249.c        |  4 ++++
 drivers/mfd/rtsx_gops.c      | 37 +++++++++++++++++++++++++++++++++++++
 drivers/mfd/rtsx_pcr.h       |  3 +++
 include/linux/mfd/rtsx_pci.h | 28 ++++++++++++++++++++++++++++
 6 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 drivers/mfd/rtsx_gops.c

Applied, thanks.

Quoted 151 lines
drivers/mfd/Makefile +1 -1
index f001487..7f45c06 100644
@@ -13,7 +13,7 @@ obj-$(CONFIG_MFD_CROS_EC)	+= cros_ec.o
 obj-$(CONFIG_MFD_CROS_EC_I2C)	+= cros_ec_i2c.o
 obj-$(CONFIG_MFD_CROS_EC_SPI)	+= cros_ec_spi.o
 
-rtsx_pci-objs			:= rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o
+rtsx_pci-objs			:= rtsx_pcr.o rtsx_gops.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o
 obj-$(CONFIG_MFD_RTSX_PCI)	+= rtsx_pci.o
 obj-$(CONFIG_MFD_RTSX_USB)	+= rtsx_usb.o
drivers/mfd/rts5227.c +6 -0
index 9c8eec8..3240740 100644
@@ -130,6 +130,12 @@ static int rts5227_extra_init_hw(struct rtsx_pcr *pcr)
 
 static int rts5227_optimize_phy(struct rtsx_pcr *pcr)
 {
+	int err;
+
+	err = rtsx_gops_pm_reset(pcr);
+	if (err < 0)
+		return err;
+
 	/* Optimize RX sensitivity */
 	return rtsx_pci_write_phy_register(pcr, 0x00, 0xBA42);
 }
drivers/mfd/rts5249.c +4 -0
index 573de7b..cf425cc 100644
@@ -130,6 +130,10 @@ static int rts5249_optimize_phy(struct rtsx_pcr *pcr)
 {
 	int err;
 
+	err = rtsx_gops_pm_reset(pcr);
+	if (err < 0)
+		return err;
+
 	err = rtsx_pci_write_phy_register(pcr, PHY_REG_REV,
 			PHY_REG_REV_RESV | PHY_REG_REV_RXIDLE_LATCHED |
 			PHY_REG_REV_P1_EN | PHY_REG_REV_RXIDLE_EN |
drivers/mfd/rtsx_gops.c new file +37 -0
new file mode 100644
index 0000000..b1a98c6
@@ -0,0 +1,37 @@
+/* Driver for Realtek PCI-Express card reader
+ *
+ * Copyright(c) 2009-2013 Realtek Semiconductor Corp. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2, or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Micky Ching <[email protected]>
+ */
+
+#include <linux/mfd/rtsx_pci.h>
+#include "rtsx_pcr.h"
+
+int rtsx_gops_pm_reset(struct rtsx_pcr *pcr)
+{
+	int err;
+
+	/* init aspm */
+	rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0xFF, 0x00);
+	err = rtsx_pci_update_cfg_byte(pcr, LCTLR, ~LCTLR_ASPM_CTL_MASK, 0x00);
+	if (err < 0)
+		return err;
+
+	/* reset PM_CTRL3 before send buffer cmd */
+	return rtsx_pci_write_register(pcr, PM_CTRL3, D3_DELINK_MODE_EN, 0x00);
+}
drivers/mfd/rtsx_pcr.h +3 -0
index 07e4c2e..fe2bbb6 100644
@@ -72,4 +72,7 @@ do {									\
 	pcr->ms_pull_ctl_disable_tbl = __device##_ms_pull_ctl_disable_tbl; \
 } while (0)
 
+/* generic operations */
+int rtsx_gops_pm_reset(struct rtsx_pcr *pcr);
+
 #endif
include/linux/mfd/rtsx_pci.h +28 -0
index 74346d5..1604dda 100644
@@ -707,6 +707,14 @@
 #define PM_CTRL1			0xFF44
 #define PM_CTRL2			0xFF45
 #define PM_CTRL3			0xFF46
+#define   SDIO_SEND_PME_EN		0x80
+#define   FORCE_RC_MODE_ON		0x40
+#define   FORCE_RX50_LINK_ON		0x20
+#define   D3_DELINK_MODE_EN		0x10
+#define   USE_PESRTB_CTL_DELINK		0x08
+#define   DELAY_PIN_WAKE		0x04
+#define   RESET_PIN_WAKE		0x02
+#define   PM_WAKE_EN			0x01
 #define PM_CTRL4			0xFF47
 
 /* Memory mapping */

@@ -752,6 +760,14 @@
 #define PHY_DUM_REG			0x1F
 
 #define LCTLR				0x80
+#define   LCTLR_EXT_SYNC		0x80
+#define   LCTLR_COMMON_CLOCK_CFG	0x40
+#define   LCTLR_RETRAIN_LINK		0x20
+#define   LCTLR_LINK_DISABLE		0x10
+#define   LCTLR_RCB			0x08
+#define   LCTLR_RESERVED		0x04
+#define   LCTLR_ASPM_CTL_MASK		0x03
+
 #define PCR_SETTING_REG1		0x724
 #define PCR_SETTING_REG2		0x814
 #define PCR_SETTING_REG3		0x747

@@ -967,4 +983,16 @@ static inline u8 *rtsx_pci_get_cmd_data(struct rtsx_pcr *pcr)
 	return (u8 *)(pcr->host_cmds_ptr);
 }
 
+static inline int rtsx_pci_update_cfg_byte(struct rtsx_pcr *pcr, int addr,
+		u8 mask, u8 append)
+{
+	int err;
+	u8 val;
+
+	err = pci_read_config_byte(pcr->pci, addr, &val);
+	if (err < 0)
+		return err;
+	return pci_write_config_byte(pcr->pci, addr, (val & mask) | append);
+}
+
 #endif
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog