From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71B9AC43217 for ; Thu, 28 Oct 2021 05:54:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5378E6023B for ; Thu, 28 Oct 2021 05:54:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229788AbhJ1F4p (ORCPT ); Thu, 28 Oct 2021 01:56:45 -0400 Received: from mailgw01.mediatek.com ([60.244.123.138]:34426 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S229586AbhJ1F4n (ORCPT ); Thu, 28 Oct 2021 01:56:43 -0400 X-UUID: 239480cb99e147c4b7009459a10e5637-20211028 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=Nr8c5aHXlwibVnUmW5WuIOgCi8SwSdCWVI3tM+6NXBo=; b=i3RgqrlnGo13bJizqF/Vxt+fpiid41r9ZRpPd9N481LpjQlc5LppxpWGdmNqku/PbhBUkWTdty5Oe+MGABO1I2f51ux4rndXnZHzdTalWHjQjWgRJ2bIjy59XXLSX9eR5W7AqreMpq5nYE6ASXQpBQv5vMJ4cJabPXxzEP6QWvI=; X-UUID: 239480cb99e147c4b7009459a10e5637-20211028 Received: from mtkcas11.mediatek.inc [(172.21.101.40)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1214121677; Thu, 28 Oct 2021 13:54:14 +0800 Received: from mtkmbs10n1.mediatek.inc (172.21.101.34) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Thu, 28 Oct 2021 13:54:13 +0800 Received: from mhfsdcap04 (10.17.3.154) by mtkmbs10n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Thu, 28 Oct 2021 13:54:12 +0800 Message-ID: Subject: Re: [PATCH] mmc: mediatek: move cqhci init behind ungate clock From: Chaotian Jing To: Wenbin Mei , Ulf Hansson CC: Matthias Brugger , Chun-Hung Wu , Yong Mao , , , , , , Date: Thu, 28 Oct 2021 13:54:12 +0800 In-Reply-To: <20211028022049.22129-1-wenbin.mei@mediatek.com> References: <20211028022049.22129-1-wenbin.mei@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: base64 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org T24gVGh1LCAyMDIxLTEwLTI4IGF0IDEwOjIwICswODAwLCBXZW5iaW4gTWVpIHdyb3RlOg0KPiBX ZSBtdXN0IGVuYWJsZSBjbG9jayBiZWZvcmUgY3FoY2kgaW5pdCwgYmVjYXVzZSBjcnlwdG8gbmVl ZHMNCj4gcmVhZCBpbmZvcm1hdGlvbiBmcm9tIENRSENJIHJlZ2lzdGVycywgb3RoZXJ3aXNlLCBp dCB3aWxsIGhhbmcNCj4gaW4gTWVkaWFUZWsgbW1jIGhvc3QgY29udHJvbGxlci4NCj4gDQo+IFNp Z25lZC1vZmYtYnk6IFdlbmJpbiBNZWkgPHdlbmJpbi5tZWlAbWVkaWF0ZWsuY29tPg0KICBBY2tl ZC1ieTogQ2hhb3RpYW4gSmluZyA8Y2hhb3RpYW4uamluZ0BtZWRpYXRlay5jb20+DQo+IEZpeGVz OiA4OGJkNjUyYjNjNzQgKCJtbWM6IG1lZGlhdGVrOiBjb21tYW5kIHF1ZXVlIHN1cHBvcnQiKQ0K PiBDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZw0KPiAtLS0NCj4gIGRyaXZlcnMvbW1jL2hvc3Qv bXRrLXNkLmMgfCAzOCArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQ0KPiAtLS0N Cj4gIDEgZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkNCj4g DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL21tYy9ob3N0L210ay1zZC5jIGIvZHJpdmVycy9tbWMv aG9zdC9tdGstc2QuYw0KPiBpbmRleCBiMTI0Y2ZlZTA1YTEuLjk0Mzk0MGI0NGU4MyAxMDA2NDQN Cj4gLS0tIGEvZHJpdmVycy9tbWMvaG9zdC9tdGstc2QuYw0KPiArKysgYi9kcml2ZXJzL21tYy9o b3N0L210ay1zZC5jDQo+IEBAIC0yNjU2LDYgKzI2NTYsMjUgQEAgc3RhdGljIGludCBtc2RjX2Ry dl9wcm9iZShzdHJ1Y3QNCj4gcGxhdGZvcm1fZGV2aWNlICpwZGV2KQ0KPiAgCQlob3N0LT5kbWFf bWFzayA9IERNQV9CSVRfTUFTSygzMik7DQo+ICAJbW1jX2RldihtbWMpLT5kbWFfbWFzayA9ICZo b3N0LT5kbWFfbWFzazsNCj4gIA0KPiArCWhvc3QtPnRpbWVvdXRfY2xrcyA9IDMgKiAxMDQ4NTc2 Ow0KPiArCWhvc3QtPmRtYS5ncGQgPSBkbWFfYWxsb2NfY29oZXJlbnQoJnBkZXYtPmRldiwNCj4g KwkJCQkyICogc2l6ZW9mKHN0cnVjdCBtdF9ncGRtYV9kZXNjKSwNCj4gKwkJCQkmaG9zdC0+ZG1h LmdwZF9hZGRyLCBHRlBfS0VSTkVMKTsNCj4gKwlob3N0LT5kbWEuYmQgPSBkbWFfYWxsb2NfY29o ZXJlbnQoJnBkZXYtPmRldiwNCj4gKwkJCQlNQVhfQkRfTlVNICogc2l6ZW9mKHN0cnVjdA0KPiBt dF9iZG1hX2Rlc2MpLA0KPiArCQkJCSZob3N0LT5kbWEuYmRfYWRkciwgR0ZQX0tFUk5FTCk7DQo+ ICsJaWYgKCFob3N0LT5kbWEuZ3BkIHx8ICFob3N0LT5kbWEuYmQpIHsNCj4gKwkJcmV0ID0gLUVO T01FTTsNCj4gKwkJZ290byByZWxlYXNlX21lbTsNCj4gKwl9DQo+ICsJbXNkY19pbml0X2dwZF9i ZChob3N0LCAmaG9zdC0+ZG1hKTsNCj4gKwlJTklUX0RFTEFZRURfV09SSygmaG9zdC0+cmVxX3Rp bWVvdXQsIG1zZGNfcmVxdWVzdF90aW1lb3V0KTsNCj4gKwlzcGluX2xvY2tfaW5pdCgmaG9zdC0+ bG9jayk7DQo+ICsNCj4gKwlwbGF0Zm9ybV9zZXRfZHJ2ZGF0YShwZGV2LCBtbWMpOw0KPiArCW1z ZGNfdW5nYXRlX2Nsb2NrKGhvc3QpOw0KPiArCW1zZGNfaW5pdF9odyhob3N0KTsNCj4gKw0KPiAg CWlmIChtbWMtPmNhcHMyICYgTU1DX0NBUDJfQ1FFKSB7DQo+ICAJCWhvc3QtPmNxX2hvc3QgPSBk ZXZtX2t6YWxsb2MobW1jLT5wYXJlbnQsDQo+ICAJCQkJCSAgICAgc2l6ZW9mKCpob3N0LT5jcV9o b3N0KSwNCj4gQEAgLTI2NzYsMjUgKzI2OTUsNiBAQCBzdGF0aWMgaW50IG1zZGNfZHJ2X3Byb2Jl KHN0cnVjdA0KPiBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpDQo+ICAJCW1tYy0+bWF4X3NlZ19zaXpl ID0gNjQgKiAxMDI0Ow0KPiAgCX0NCj4gIA0KPiAtCWhvc3QtPnRpbWVvdXRfY2xrcyA9IDMgKiAx MDQ4NTc2Ow0KPiAtCWhvc3QtPmRtYS5ncGQgPSBkbWFfYWxsb2NfY29oZXJlbnQoJnBkZXYtPmRl diwNCj4gLQkJCQkyICogc2l6ZW9mKHN0cnVjdCBtdF9ncGRtYV9kZXNjKSwNCj4gLQkJCQkmaG9z dC0+ZG1hLmdwZF9hZGRyLCBHRlBfS0VSTkVMKTsNCj4gLQlob3N0LT5kbWEuYmQgPSBkbWFfYWxs b2NfY29oZXJlbnQoJnBkZXYtPmRldiwNCj4gLQkJCQlNQVhfQkRfTlVNICogc2l6ZW9mKHN0cnVj dA0KPiBtdF9iZG1hX2Rlc2MpLA0KPiAtCQkJCSZob3N0LT5kbWEuYmRfYWRkciwgR0ZQX0tFUk5F TCk7DQo+IC0JaWYgKCFob3N0LT5kbWEuZ3BkIHx8ICFob3N0LT5kbWEuYmQpIHsNCj4gLQkJcmV0 ID0gLUVOT01FTTsNCj4gLQkJZ290byByZWxlYXNlX21lbTsNCj4gLQl9DQo+IC0JbXNkY19pbml0 X2dwZF9iZChob3N0LCAmaG9zdC0+ZG1hKTsNCj4gLQlJTklUX0RFTEFZRURfV09SSygmaG9zdC0+ cmVxX3RpbWVvdXQsIG1zZGNfcmVxdWVzdF90aW1lb3V0KTsNCj4gLQlzcGluX2xvY2tfaW5pdCgm aG9zdC0+bG9jayk7DQo+IC0NCj4gLQlwbGF0Zm9ybV9zZXRfZHJ2ZGF0YShwZGV2LCBtbWMpOw0K PiAtCW1zZGNfdW5nYXRlX2Nsb2NrKGhvc3QpOw0KPiAtCW1zZGNfaW5pdF9odyhob3N0KTsNCj4g LQ0KPiAgCXJldCA9IGRldm1fcmVxdWVzdF9pcnEoJnBkZXYtPmRldiwgaG9zdC0+aXJxLCBtc2Rj X2lycSwNCj4gIAkJCSAgICAgICBJUlFGX1RSSUdHRVJfTk9ORSwgcGRldi0+bmFtZSwgaG9zdCk7 DQo+ICAJaWYgKHJldCkNCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30991C433EF for ; Thu, 28 Oct 2021 05:56:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E448B6023B for ; Thu, 28 Oct 2021 05:56:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E448B6023B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:CC:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=odQTl7pGydlzAZaqaGwc0lvyxezOhPUbM4LsGWyR6D8=; b=J1eIVWgD6xGqS7 /8hMGYzLfTMO+HEODt4IRG60IqVZZ0Ul1hOxKnSF0VkSOUfw5cAVZmLmJaIuyh0i0SrXq1k707rmo NA1q19LAe/LH/w1C3uqwqsch5GJLQinY+j/ZKgLzeeUjQnmR9deDHGx+LF6GYOHKnG0Y+ZYMhUYJj at2+YhDHjVPE2s9IUrJ5Y70lP9jto+/AblvmJDvh1tgIjoh1/m9PBxf45oOv51ZHKupfD0aVUjsy/ 1t+T+OBA80+58Z/FAtKByi5W8XTqoauJez44Nkr7E3dYFRxieARa5WKDqbNyQNbQNWLT3O8yWaxgs KBcjx4J/rHOSPdm4W59A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mfyOC-006wHQ-65; Thu, 28 Oct 2021 05:55:48 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mfyNm-006w9n-I4; Thu, 28 Oct 2021 05:55:24 +0000 X-UUID: 0c2a7f849aeb41119eb3a83f100ca19d-20211027 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=Nr8c5aHXlwibVnUmW5WuIOgCi8SwSdCWVI3tM+6NXBo=; b=i3RgqrlnGo13bJizqF/Vxt+fpiid41r9ZRpPd9N481LpjQlc5LppxpWGdmNqku/PbhBUkWTdty5Oe+MGABO1I2f51ux4rndXnZHzdTalWHjQjWgRJ2bIjy59XXLSX9eR5W7AqreMpq5nYE6ASXQpBQv5vMJ4cJabPXxzEP6QWvI=; X-UUID: 0c2a7f849aeb41119eb3a83f100ca19d-20211027 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1619101237; Wed, 27 Oct 2021 22:55:13 -0700 Received: from mtkmbs10n1.mediatek.inc (172.21.101.34) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 27 Oct 2021 22:54:14 -0700 Received: from mtkmbs10n1.mediatek.inc (172.21.101.34) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Thu, 28 Oct 2021 13:54:13 +0800 Received: from mhfsdcap04 (10.17.3.154) by mtkmbs10n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Thu, 28 Oct 2021 13:54:12 +0800 Message-ID: Subject: Re: [PATCH] mmc: mediatek: move cqhci init behind ungate clock From: Chaotian Jing To: Wenbin Mei , Ulf Hansson CC: Matthias Brugger , Chun-Hung Wu , Yong Mao , , , , , , Date: Thu, 28 Oct 2021 13:54:12 +0800 In-Reply-To: <20211028022049.22129-1-wenbin.mei@mediatek.com> References: <20211028022049.22129-1-wenbin.mei@mediatek.com> X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211027_225522_622594_E3DBA20F X-CRM114-Status: GOOD ( 16.06 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Thu, 2021-10-28 at 10:20 +0800, Wenbin Mei wrote: > We must enable clock before cqhci init, because crypto needs > read information from CQHCI registers, otherwise, it will hang > in MediaTek mmc host controller. > > Signed-off-by: Wenbin Mei Acked-by: Chaotian Jing > Fixes: 88bd652b3c74 ("mmc: mediatek: command queue support") > Cc: stable@vger.kernel.org > --- > drivers/mmc/host/mtk-sd.c | 38 +++++++++++++++++++---------------- > --- > 1 file changed, 19 insertions(+), 19 deletions(-) > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index b124cfee05a1..943940b44e83 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -2656,6 +2656,25 @@ static int msdc_drv_probe(struct > platform_device *pdev) > host->dma_mask = DMA_BIT_MASK(32); > mmc_dev(mmc)->dma_mask = &host->dma_mask; > > + host->timeout_clks = 3 * 1048576; > + host->dma.gpd = dma_alloc_coherent(&pdev->dev, > + 2 * sizeof(struct mt_gpdma_desc), > + &host->dma.gpd_addr, GFP_KERNEL); > + host->dma.bd = dma_alloc_coherent(&pdev->dev, > + MAX_BD_NUM * sizeof(struct > mt_bdma_desc), > + &host->dma.bd_addr, GFP_KERNEL); > + if (!host->dma.gpd || !host->dma.bd) { > + ret = -ENOMEM; > + goto release_mem; > + } > + msdc_init_gpd_bd(host, &host->dma); > + INIT_DELAYED_WORK(&host->req_timeout, msdc_request_timeout); > + spin_lock_init(&host->lock); > + > + platform_set_drvdata(pdev, mmc); > + msdc_ungate_clock(host); > + msdc_init_hw(host); > + > if (mmc->caps2 & MMC_CAP2_CQE) { > host->cq_host = devm_kzalloc(mmc->parent, > sizeof(*host->cq_host), > @@ -2676,25 +2695,6 @@ static int msdc_drv_probe(struct > platform_device *pdev) > mmc->max_seg_size = 64 * 1024; > } > > - host->timeout_clks = 3 * 1048576; > - host->dma.gpd = dma_alloc_coherent(&pdev->dev, > - 2 * sizeof(struct mt_gpdma_desc), > - &host->dma.gpd_addr, GFP_KERNEL); > - host->dma.bd = dma_alloc_coherent(&pdev->dev, > - MAX_BD_NUM * sizeof(struct > mt_bdma_desc), > - &host->dma.bd_addr, GFP_KERNEL); > - if (!host->dma.gpd || !host->dma.bd) { > - ret = -ENOMEM; > - goto release_mem; > - } > - msdc_init_gpd_bd(host, &host->dma); > - INIT_DELAYED_WORK(&host->req_timeout, msdc_request_timeout); > - spin_lock_init(&host->lock); > - > - platform_set_drvdata(pdev, mmc); > - msdc_ungate_clock(host); > - msdc_init_hw(host); > - > ret = devm_request_irq(&pdev->dev, host->irq, msdc_irq, > IRQF_TRIGGER_NONE, pdev->name, host); > if (ret) _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D27AC433EF for ; Thu, 28 Oct 2021 05:57:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D18AD61056 for ; Thu, 28 Oct 2021 05:57:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D18AD61056 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:CC:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UsDeC92YuUONbiSFQx0SE5u7zTlaoLXYOvQI90/wotk=; b=XQX3mwyIywYkCh clXgy+OdxOVqs0JPsE2kOJFPDsTIVafQg8AEfLuVVg9/FqyrpXSL//oSX0d6qIvw8pL6QZT+ParYH bCkVvvilNskNvkI7MMUwzQAx4dkXuAyHWd+0+sgiNczYWseJxRtJMWXPAowfhGZ7c3C+jyqRF1b5x qnYxnHNWCzsALUr524cHxM/Idz5hYkc04RmRtrs3QoL3nyICsPerbyPSFPkxqHWq1+FG8eid03uTw +iEDRh70EYpO/1HFq/34vf+OztCXeBpAwEdpTbINFlJy8ubiPEDxjlj4xlC9unVxmyZMEa8dLOlPY LFCunNez61UQRthVnB8A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mfyNz-006wD1-LD; Thu, 28 Oct 2021 05:55:35 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mfyNm-006w9n-I4; Thu, 28 Oct 2021 05:55:24 +0000 X-UUID: 0c2a7f849aeb41119eb3a83f100ca19d-20211027 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=Nr8c5aHXlwibVnUmW5WuIOgCi8SwSdCWVI3tM+6NXBo=; b=i3RgqrlnGo13bJizqF/Vxt+fpiid41r9ZRpPd9N481LpjQlc5LppxpWGdmNqku/PbhBUkWTdty5Oe+MGABO1I2f51ux4rndXnZHzdTalWHjQjWgRJ2bIjy59XXLSX9eR5W7AqreMpq5nYE6ASXQpBQv5vMJ4cJabPXxzEP6QWvI=; X-UUID: 0c2a7f849aeb41119eb3a83f100ca19d-20211027 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1619101237; Wed, 27 Oct 2021 22:55:13 -0700 Received: from mtkmbs10n1.mediatek.inc (172.21.101.34) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 27 Oct 2021 22:54:14 -0700 Received: from mtkmbs10n1.mediatek.inc (172.21.101.34) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Thu, 28 Oct 2021 13:54:13 +0800 Received: from mhfsdcap04 (10.17.3.154) by mtkmbs10n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Thu, 28 Oct 2021 13:54:12 +0800 Message-ID: Subject: Re: [PATCH] mmc: mediatek: move cqhci init behind ungate clock From: Chaotian Jing To: Wenbin Mei , Ulf Hansson CC: Matthias Brugger , Chun-Hung Wu , Yong Mao , , , , , , Date: Thu, 28 Oct 2021 13:54:12 +0800 In-Reply-To: <20211028022049.22129-1-wenbin.mei@mediatek.com> References: <20211028022049.22129-1-wenbin.mei@mediatek.com> X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211027_225522_622594_E3DBA20F X-CRM114-Status: GOOD ( 16.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, 2021-10-28 at 10:20 +0800, Wenbin Mei wrote: > We must enable clock before cqhci init, because crypto needs > read information from CQHCI registers, otherwise, it will hang > in MediaTek mmc host controller. > > Signed-off-by: Wenbin Mei Acked-by: Chaotian Jing > Fixes: 88bd652b3c74 ("mmc: mediatek: command queue support") > Cc: stable@vger.kernel.org > --- > drivers/mmc/host/mtk-sd.c | 38 +++++++++++++++++++---------------- > --- > 1 file changed, 19 insertions(+), 19 deletions(-) > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index b124cfee05a1..943940b44e83 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -2656,6 +2656,25 @@ static int msdc_drv_probe(struct > platform_device *pdev) > host->dma_mask = DMA_BIT_MASK(32); > mmc_dev(mmc)->dma_mask = &host->dma_mask; > > + host->timeout_clks = 3 * 1048576; > + host->dma.gpd = dma_alloc_coherent(&pdev->dev, > + 2 * sizeof(struct mt_gpdma_desc), > + &host->dma.gpd_addr, GFP_KERNEL); > + host->dma.bd = dma_alloc_coherent(&pdev->dev, > + MAX_BD_NUM * sizeof(struct > mt_bdma_desc), > + &host->dma.bd_addr, GFP_KERNEL); > + if (!host->dma.gpd || !host->dma.bd) { > + ret = -ENOMEM; > + goto release_mem; > + } > + msdc_init_gpd_bd(host, &host->dma); > + INIT_DELAYED_WORK(&host->req_timeout, msdc_request_timeout); > + spin_lock_init(&host->lock); > + > + platform_set_drvdata(pdev, mmc); > + msdc_ungate_clock(host); > + msdc_init_hw(host); > + > if (mmc->caps2 & MMC_CAP2_CQE) { > host->cq_host = devm_kzalloc(mmc->parent, > sizeof(*host->cq_host), > @@ -2676,25 +2695,6 @@ static int msdc_drv_probe(struct > platform_device *pdev) > mmc->max_seg_size = 64 * 1024; > } > > - host->timeout_clks = 3 * 1048576; > - host->dma.gpd = dma_alloc_coherent(&pdev->dev, > - 2 * sizeof(struct mt_gpdma_desc), > - &host->dma.gpd_addr, GFP_KERNEL); > - host->dma.bd = dma_alloc_coherent(&pdev->dev, > - MAX_BD_NUM * sizeof(struct > mt_bdma_desc), > - &host->dma.bd_addr, GFP_KERNEL); > - if (!host->dma.gpd || !host->dma.bd) { > - ret = -ENOMEM; > - goto release_mem; > - } > - msdc_init_gpd_bd(host, &host->dma); > - INIT_DELAYED_WORK(&host->req_timeout, msdc_request_timeout); > - spin_lock_init(&host->lock); > - > - platform_set_drvdata(pdev, mmc); > - msdc_ungate_clock(host); > - msdc_init_hw(host); > - > ret = devm_request_irq(&pdev->dev, host->irq, msdc_irq, > IRQF_TRIGGER_NONE, pdev->name, host); > if (ret) _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel