Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Chevron Li (WH)" <chevron.li@bayhubtech.com>
To:     Chevron Li <chevron_li@126.com>,
        "adrian.hunter@intel.com" <adrian.hunter@intel.com>,
        "ulf.hansson@linaro.org" <ulf.hansson@linaro.org>,
        "linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     "Shaper Liu (WH)" <shaper.liu@bayhubtech.com>,
        "XiaoGuang Yu (WH)" <xiaoguang.yu@bayhubtech.com>,
        "Shirley Her(SC)" <shirley.her@bayhubtech.com>
Subject: RE: [PATCH V1 2/2] mmc: sdhci-pci-o2micro: add Bayhub new chip GG8
 support
Thread-Topic: [PATCH V1 2/2] mmc: sdhci-pci-o2micro: add Bayhub new chip GG8
 support
Thread-Index: AQHZmOI3qtW2kpQpJU2AwcuZlT56W6+JkK3A
Date:   Wed, 14 Jun 2023 01:45:40 +0000
Message-ID: <PH7PR16MB50105407A5CB76FCDE2FC261EA5AA@PH7PR16MB5010.namprd16.prod.outlook.com>
References: <20230607014812.30104-1-chevron_li@126.com>
 <20230607014812.30104-2-chevron_li@126.com>
In-Reply-To: <20230607014812.30104-2-chevron_li@126.com>
Accept-Language: zh-CN, en-US
Content-Language: zh-CN
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?BAzVJG+OtWaanjRUhiSgyS6UPDdJbBHbz4p9zf8hnwDg/nhsZEvm00uSCFWL?=
 =?us-ascii?Q?9sEa6qB0GdgsCXBtciyXrLuID7E/QOJnypEZ6FUau1aAa7go6ZYmTe6ukb7X?=
 =?us-ascii?Q?B4qCTqphHrrPgpu2x9GRNaNiWbX7byZPHwVGipBeRfnVCDJM87vchvlXIovn?=
 =?us-ascii?Q?weZ/bBFP/ndlHSySeOndFTl665CGQP4TjqXLJk7H4HM9aB44vQMHX3iki5Yv?=
 =?us-ascii?Q?euKyAoiJLMf3ixkOlcpCrRLumcpdGvO6f8WSSUQJNbQx6xw+DSJAftaa15/0?=
 =?us-ascii?Q?NyPXBUdCeWn6Yap2KZfjnleKBKaX271Levxqx6b5PWgrOICUoc7D4aBttWFL?=
 =?us-ascii?Q?yKp3GDz57xygoIuSjZAzAsB6BN1A571Q0Fqhl0wi0YKJIB69VnDWP53lGn3k?=
 =?us-ascii?Q?wgK4IgmSpcCdKSCi8FbWCOdFecK/ggdOcc6J/KDhvrSb42AUDbWAqwWr2skt?=
 =?us-ascii?Q?iDLn9NyUyd5hFp1dpAEZHebcIjl0DFDVPNBH/x5ueA4jQARdiju3zp1lpIft?=
 =?us-ascii?Q?p2f0wJtLnjpzU2at7K410roXI7sAVKztlQaRGHiaNOi5/ITrYgy3TG8C6xbY?=
 =?us-ascii?Q?Gj8A9FF0OIRR84LlgaYfKV4Iso4Kd4yc4l7Mq8BcJAuLVUOLXQR8w85stV2y?=
 =?us-ascii?Q?gYMGxCwA3xynah5/PqaunVud6hgTqFuJQQQB7LP5Xcxm6U1b5/o6J/J0DAXf?=
 =?us-ascii?Q?mzeaFe2y49aWYG513t0wuz0+xk3KddMjlKaniFbaHV4Q8O29pU8MlBDkZPy7?=
 =?us-ascii?Q?xigqd6HTRYj9w70sOS+r1f1CiP212eIl9AlPQJY7053dWw7JAs8uCHxPlzFn?=
 =?us-ascii?Q?o5pHisDLEaSfRMq2UFYly53uNOT/cwy9f8OptqXCDUfSgxXV9bStsImOuhNw?=
 =?us-ascii?Q?kU4LQWqyCUi1dmAfpozA+gYa/Xk4Rbxg5DhEsBcZO1xV/n1adnuiVfSkGpba?=
 =?us-ascii?Q?WVE8ZPHafKz3AClmtfXK73GMhxL5eTYn9xfieKH/BJm/cYtlRX33DE9z2615?=
 =?us-ascii?Q?4ZpWEIHhmSQvrIdF3sA4X6i1fSBaJqialZvasCC3WeaCsFClLHxeoKm1UFxm?=
 =?us-ascii?Q?06SmiEfBsnKllGhtakcR39JhNfr2r66d8mV+8L3TeJq4yZbVKiGb+XDoQBfO?=
 =?us-ascii?Q?sUUj3wj7LQMNJRq6wwL3RZzZ12siZAIMofPAAoIG570utGF22YeSRuuw9sx0?=
 =?us-ascii?Q?c8bARAhwez5lD9DkGKcaRglWTiWfa3uPZbxapE2cemZdV8JPeztnZfZxNM9+?=
 =?us-ascii?Q?jP/pNp9oCwQ+BUPFjoTUr0qbiZTLEXYgr01RUQTaUWNiujEApRfNG181WOlX?=
 =?us-ascii?Q?K49rSw/J6AtjL9lK4d3VcOuKGRuj6mEylnrRrzk4AcxARSEjOWqNMmSDtgT7?=
 =?us-ascii?Q?xpBhHqAgwztIaDwUgeam/LfEP5rE7AL6KnVgn7yi1mTQSWsgBbPPBig+UV3v?=
 =?us-ascii?Q?r5IbVYD4LaJTsrEv7iYCymPo1wpXojnoZdPLf75aKgFVZPAL1hTubQagyN9V?=
 =?us-ascii?Q?0A+c6zrf1kyDJ1HTqW2uK/gDuvNnaRFFflQvFdEEjjcTzaHmjTwu2ZLNdkpZ?=
 =?us-ascii?Q?9a/tPCCCVxiqt5venHz5cBBmqj3xDD3UzRaYYoi0?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: bayhubtech.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: PH7PR16MB5010.namprd16.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d54f20d7-a890-4ff5-bdf7-08db6c790f32
X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jun 2023 01:45:40.4298
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 0a7aae2b-8f2e-44df-ba2f-42de7f93c642
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 1sFC6Wmq3y/9qC6cGBdXToDK1sFJZYj7QPLPTe7LeNn9vReg5gAAKugI6hpGakybjI16kCxri7QsYmBePa+Drqaa2OBl5Iz95npWtYsCCLk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR16MB5371
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi, Adrian/Ulf,

May I know the patch progress?
Look forward your response.

BR,
Chevron

-----Original Message-----
From: Chevron Li <chevron_li@126.com>=20
Sent: Wednesday, June 7, 2023 9:48
To: adrian.hunter@intel.com; ulf.hansson@linaro.org; linux-mmc@vger.kernel.=
org; linux-kernel@vger.kernel.org
Cc: Shaper Liu (WH) <shaper.liu@bayhubtech.com>; XiaoGuang Yu (WH) <xiaogua=
ng.yu@bayhubtech.com>; Shirley Her(SC) <shirley.her@bayhubtech.com>; Chevro=
n Li (WH) <chevron.li@bayhubtech.com>
Subject: [PATCH V1 2/2] mmc: sdhci-pci-o2micro: add Bayhub new chip GG8 sup=
port

From: Chevron Li <chevron.li@bayhubtech.com>

Add Bayhub new chip GG8 support for SD express card.
This patch depends on patch 1/2.

Signed-off-by: Chevron Li <chevron.li@bayhubtech.com>
---
Change in V1:
1.Implement the SD express card callback routine.
2.Add SD express card support for Bayhub GG8 chip.
---
 drivers/mmc/host/sdhci-pci-o2micro.c | 61 +++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-=
pci-o2micro.c
index 8243a63b3c81..b2d8ddbb4095 100644
--- a/drivers/mmc/host/sdhci-pci-o2micro.c
+++ b/drivers/mmc/host/sdhci-pci-o2micro.c
@@ -21,6 +21,7 @@
  * O2Micro device registers
  */
=20
+#define O2_SD_PCIE_SWITCH	0x54
 #define O2_SD_MISC_REG5		0x64
 #define O2_SD_LD0_CTRL		0x68
 #define O2_SD_DEV_CTRL		0x88
@@ -631,6 +632,63 @@ static void sdhci_pci_o2_set_clock(struct sdhci_host *=
host, unsigned int clock)
 	sdhci_o2_enable_clk(host, clk);
 }
=20
+static u8 sdhci_o2_sd_express_clkq_assert(struct sdhci_host *host) {
+	return sdhci_readb(host, O2_SD_EXP_INT_REG); }
+
+static int sdhci_pci_o2_init_sd_express(struct mmc_host *mmc, struct=20
+mmc_ios *ios) {
+	struct sdhci_host *host =3D mmc_priv(mmc);
+	struct sdhci_pci_slot *slot =3D sdhci_priv(host);
+	struct sdhci_pci_chip *chip =3D slot->chip;
+	u8 scratch8 =3D 0;
+	u16 scratch16 =3D 0;
+	bool ret =3D false;
+
+	/* Disable clock */
+	sdhci_writeb(host, 0, SDHCI_CLOCK_CONTROL);
+
+	/* Set VDD2 voltage*/
+	scratch8 =3D sdhci_readb(host, SDHCI_POWER_CONTROL);
+	scratch8 &=3D 0x0F;
+	if ((host->mmc->ios.timing =3D=3D MMC_TIMING_SD_EXP_1_2V) &&
+		(host->mmc->caps2 & MMC_CAP2_SD_EXP_1_2V)) {
+		scratch8 |=3D BIT(4) | BIT(7);
+	} else
+		scratch8 |=3D BIT(4) | BIT(5) | BIT(7);
+	sdhci_writeb(host, scratch8, SDHCI_POWER_CONTROL);
+
+	/* UnLock WP */
+	pci_read_config_byte(chip->pdev, O2_SD_LOCK_WP, &scratch8);
+	scratch8 &=3D 0x7f;
+	pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch8);
+
+	ret =3D readx_poll_timeout(sdhci_o2_sd_express_clkq_assert, host,
+		scratch8, !(scratch8 & BIT(0)), 1, 30000) =3D=3D 0 ? 0 : 1;
+
+	if (!ret) {
+		/* switch to PCIe mode */
+		scratch16 =3D sdhci_readw(host, O2_SD_PCIE_SWITCH);
+		scratch16 |=3D BIT(8);
+		sdhci_writew(host, scratch16, O2_SD_PCIE_SWITCH);
+	} else {
+		/* keep mode as USHI */
+		pci_read_config_word(chip->pdev,
+						O2_SD_PARA_SET_REG1, &scratch16);
+		scratch16 &=3D ~BIT(11);
+		pci_write_config_word(chip->pdev,
+						O2_SD_PARA_SET_REG1, scratch16);
+	}
+	/* Lock WP */
+	pci_read_config_byte(chip->pdev,
+					O2_SD_LOCK_WP, &scratch8);
+	scratch8 |=3D 0x80;
+	pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch8);
+
+	return ret;
+}
+
 static int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)  {
 	struct sdhci_pci_chip *chip;
@@ -703,10 +761,11 @@ static int sdhci_pci_o2_probe_slot(struct sdhci_pci_s=
lot *slot)
 	case PCI_DEVICE_ID_O2_GG8_9861:
 	case PCI_DEVICE_ID_O2_GG8_9862:
 	case PCI_DEVICE_ID_O2_GG8_9863:
-		host->mmc->caps2 |=3D MMC_CAP2_NO_SDIO;
+		host->mmc->caps2 |=3D MMC_CAP2_NO_SDIO | MMC_CAP2_SD_EXP |=20
+MMC_CAP2_SD_EXP_1_2V;
 		host->mmc->caps |=3D MMC_CAP_HW_RESET;
 		host->quirks2 |=3D SDHCI_QUIRK2_PRESET_VALUE_BROKEN;
 		slot->host->mmc_host_ops.get_cd =3D sdhci_o2_get_cd;
+		host->mmc_host_ops.init_sd_express =3D sdhci_pci_o2_init_sd_express;
 		break;
 	default:
 		break;
--
2.25.1