From patchwork Fri Sep 13 10:39:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Tseng X-Patchwork-Id: 13803280 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 87470FA3741 for ; Fri, 13 Sep 2024 10:52:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:CC:To:From:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dbFE54p5YQWTJB15O5Q9PNu5uByvL0/k1s8swtLuwZ8=; b=WkhbOxcPx75qjX39ScctPlalKV qkHiclnZmKj29AWbmkuGJu7QK2XDUTRJ8TF1VNUJF1kqA6CN3V3HIc5d1IDiceprRwuzAmqnMCm/k aXk/VWOk5ViLXbfTzJLi+PZQNrCGP/3t+5qGCnU7AZToIXSDNxlSN7yUREi+jb4uucarm8l1s83um DI1QIrwBUXoMiRImPJdgdRHa00uAZZt35PEd1D3mpKn+zpyzSFL7rw/cSAvHQk+GXykpnSvoCml84 Ri1UPeXS7obKyvYrBeHklu+seRQ/lkTHppFgdyDfUwvvQNVMI2e6YWeLK5xf1H9M89QvPK+DmvDys nryd4E1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sp3ua-0000000Fg1q-3uOd; Fri, 13 Sep 2024 10:52:24 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sp3s0-0000000Ffcg-3cgt; Fri, 13 Sep 2024 10:49:46 +0000 X-UUID: e1f06ef871bd11efba0aef63c0775dbf-20240913 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=dbFE54p5YQWTJB15O5Q9PNu5uByvL0/k1s8swtLuwZ8=; b=XHy+qyJMcPvPp//VBBy0WH0mFbSx91oHXvyXzR5NTAdY8Wj/hIsCnoPN8qGHLM1X/gdVvuFLHcF3yN3jzMDs2TcyfWjyRFL1OMr7t4BbyGyrQb8k1DiYop6ur9gJOpg9MrJ2g2mMHIHGcr0s3g4XoC6H1DqqTIQJ2nu9wDclWRQ=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.41,REQID:2038894e-dc93-4e5c-957a-7a3b1383efaa,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:6dc6a47,CLOUDID:ed0decbf-d7af-4351-93aa-42531abf0c7b,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: e1f06ef871bd11efba0aef63c0775dbf-20240913 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 912220900; Fri, 13 Sep 2024 03:49:42 -0700 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) 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.1118.26; Fri, 13 Sep 2024 18:39:37 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Fri, 13 Sep 2024 18:39:37 +0800 From: Mark Tseng To: "Rafael J . Wysocki" , Viresh Kumar , MyungJoo Ham , "Kyungmin Park" , Chanwoo Choi , Matthias Brugger , AngeloGioacchino Del Regno CC: , , , , , Subject: [PATCH v1 1/2] PM / devfreq: mediatek: protect oop in critical session Date: Fri, 13 Sep 2024 18:39:32 +0800 Message-ID: <20240913103933.30895-2-chun-jen.tseng@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240913103933.30895-1-chun-jen.tseng@mediatek.com> References: <20240913103933.30895-1-chun-jen.tseng@mediatek.com> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--4.484100-8.000000 X-TMASE-MatchedRID: LAlCrEnopVXUzvcPSorAlFz+axQLnAVBtGonEOW5g+agaf0+XUrNk3kk h754FS8n6DB7yJ7eUTP0VyIrxg+OJcZEoJx1HltluIwLnB3Aqp25+1figft3Lg5SzgJNSArLkVq DBn//HhImL4e5hLr+f0mZgncXR4mgGAdnzrnkM48URSScn+QSXt0H8LFZNFG7doMssNsUwYVV2Y FKivUXnovjZuoPNVwq7Ouc1TlJj0nz/pMg4hZ1PL27cYXrOln+oV7D15FntQdDvz+t8eVtJ0AAL As+DNqOStqwsbgFR/qAhOcaQrQ0U1GyRcoeF18qmKP0zzpTAeGwod8xOMKmvA1Aka/KIp/p X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--4.484100-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: FC2A249B0FAC5904A78B645CACC39F666E4A44308525607319F5BE191941A9442000:8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240913_034944_922413_279B7DD0 X-CRM114-Status: GOOD ( 15.07 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org mtk_ccifreq_target() & mtk_ccifreq_opp_notifier() is re-enter funtion when cpufreq governor is more than one. It should add global mutex to protect OPP , avoid get wrong frequency & voltage. Signed-off-by: Mark Tseng --- drivers/devfreq/mtk-cci-devfreq.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/devfreq/mtk-cci-devfreq.c b/drivers/devfreq/mtk-cci-devfreq.c index 7ad5225b0381..293cf81e53fe 100644 --- a/drivers/devfreq/mtk-cci-devfreq.c +++ b/drivers/devfreq/mtk-cci-devfreq.c @@ -29,13 +29,14 @@ struct mtk_ccifreq_drv { struct clk *inter_clk; int inter_voltage; unsigned long pre_freq; - /* Avoid race condition for regulators between notify and policy */ - struct mutex reg_lock; struct notifier_block opp_nb; const struct mtk_ccifreq_platform_data *soc_data; int vtrack_max; }; +/* Avoid race condition for regulators between notify and policy */ +static DEFINE_MUTEX(reg_lock); + static int mtk_ccifreq_set_voltage(struct mtk_ccifreq_drv *drv, int new_voltage) { const struct mtk_ccifreq_platform_data *soc_data = drv->soc_data; @@ -125,22 +126,20 @@ static int mtk_ccifreq_set_voltage(struct mtk_ccifreq_drv *drv, int new_voltage) static int mtk_ccifreq_target(struct device *dev, unsigned long *freq, u32 flags) { - struct mtk_ccifreq_drv *drv = dev_get_drvdata(dev); + struct mtk_ccifreq_drv *drv; struct clk *cci_pll; struct dev_pm_opp *opp; unsigned long opp_rate; int voltage, pre_voltage, inter_voltage, target_voltage, ret; + mutex_lock(®_lock); + + drv = dev_get_drvdata(dev); if (!drv) return -EINVAL; - if (drv->pre_freq == *freq) - return 0; - - mutex_lock(&drv->reg_lock); - - inter_voltage = drv->inter_voltage; cci_pll = clk_get_parent(drv->cci_clk); + inter_voltage = drv->inter_voltage; opp_rate = *freq; opp = devfreq_recommended_opp(dev, &opp_rate, 1); @@ -206,7 +205,7 @@ static int mtk_ccifreq_target(struct device *dev, unsigned long *freq, } drv->pre_freq = *freq; - mutex_unlock(&drv->reg_lock); + mutex_unlock(®_lock); return 0; @@ -214,21 +213,23 @@ static int mtk_ccifreq_target(struct device *dev, unsigned long *freq, mtk_ccifreq_set_voltage(drv, pre_voltage); out_unlock: - mutex_unlock(&drv->reg_lock); + mutex_unlock(®_lock); return ret; } static int mtk_ccifreq_opp_notifier(struct notifier_block *nb, unsigned long event, void *data) { - struct dev_pm_opp *opp = data; + struct dev_pm_opp *opp; struct mtk_ccifreq_drv *drv; unsigned long freq, volt; + mutex_lock(®_lock); + + opp = data; drv = container_of(nb, struct mtk_ccifreq_drv, opp_nb); if (event == OPP_EVENT_ADJUST_VOLTAGE) { - mutex_lock(&drv->reg_lock); freq = dev_pm_opp_get_freq(opp); /* current opp item is changed */ @@ -236,8 +237,8 @@ static int mtk_ccifreq_opp_notifier(struct notifier_block *nb, volt = dev_pm_opp_get_voltage(opp); mtk_ccifreq_set_voltage(drv, volt); } - mutex_unlock(&drv->reg_lock); } + mutex_unlock(®_lock); return 0; } @@ -262,7 +263,6 @@ static int mtk_ccifreq_probe(struct platform_device *pdev) drv->dev = dev; drv->soc_data = (const struct mtk_ccifreq_platform_data *) of_device_get_match_data(&pdev->dev); - mutex_init(&drv->reg_lock); platform_set_drvdata(pdev, drv); drv->cci_clk = devm_clk_get(dev, "cci"); From patchwork Fri Sep 13 10:39:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Tseng X-Patchwork-Id: 13803268 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D7922FA3742 for ; Fri, 13 Sep 2024 10:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:CC:To:From:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pS/YBV545XadShzl+JV3iEXwq0ukjSd6qB95fLU6jtM=; b=b5dBeas+JzGdnnB4DNMZ1M9fw8 KyWjrbs+7BHHf15w4be2XOt1ruSO4OxIH/dz5stNm/vuKmukSRJiqs3JNZBYMp9aEPFtcNE3FMkt9 xT6s6Idh3XH4T8JQoQ+FquGFJ/0p+MMJtWbiN47J3JEmN53VVzqlFpKFFEg0AZ1iiowtmL1admWzH 6Y+yMgVu1MWevex3gMVA8/Wh+r4UBHb6fr2Aq2xSiRyinAJ8R3Mcc2lSVHXeogJF6kb81qIpJMnJ1 7x7YxNLNuUMGD77mJjdUm7byEn+rFTreW1Ng8OZ14m89ApCWj0gqSv2A/nzGbTSOKk/EENfHe+My9 sjyvoemg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sp3jQ-0000000FeZy-2FAx; Fri, 13 Sep 2024 10:40:52 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sp3iM-0000000FeKj-0Ks2; Fri, 13 Sep 2024 10:39:47 +0000 X-UUID: 7bd8606871bc11efba0aef63c0775dbf-20240913 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=pS/YBV545XadShzl+JV3iEXwq0ukjSd6qB95fLU6jtM=; b=Mra8e86eMMtRYc3VYJRBmjPMikAnzYwCqhF/jlOFcoLVhVyDiZZPm/zL494DcvDxfpKBIBquXe+FPuvyDnN468WuNKjKQCJw5jvIF9igUdPOA0g0uXHh4eG7T1JAlIq7U4yis5+q7gWMzWbksv9r1pLJwnBlXTG6JJKV1qN6YaQ=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.41,REQID:d83b787a-cc3d-424a-81f0-d5a82c29af13,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:6dc6a47,CLOUDID:8fdaf8b6-8c4d-4743-b649-83c6f3b849d4,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES :1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_ULN X-UUID: 7bd8606871bc11efba0aef63c0775dbf-20240913 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1399959907; Fri, 13 Sep 2024 03:39:41 -0700 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Fri, 13 Sep 2024 18:39:37 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Fri, 13 Sep 2024 18:39:37 +0800 From: Mark Tseng To: "Rafael J . Wysocki" , Viresh Kumar , MyungJoo Ham , "Kyungmin Park" , Chanwoo Choi , Matthias Brugger , AngeloGioacchino Del Regno CC: , , , , , Subject: [PATCH v1 2/2] cpufreq: mediatek: Fixed cpufreq has 2 policy will cause concurrency Date: Fri, 13 Sep 2024 18:39:33 +0800 Message-ID: <20240913103933.30895-3-chun-jen.tseng@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240913103933.30895-1-chun-jen.tseng@mediatek.com> References: <20240913103933.30895-1-chun-jen.tseng@mediatek.com> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--13.646400-8.000000 X-TMASE-MatchedRID: NRO3hbO9xfYsJluZlyHlY8AmcZEx8XHJnQkHrAHoKqYA6s2mIXI3kAQH T64gg+vfhbvmKbpIiCZEzxsFM1euZkzhWNnvpqvYXP5rFAucBUEjs7F41+YP7NSVUkz9BPXec1B UAZEsVDboMHvInt5RM8tR/vbsBoBQ7DvDbr7RMEril2r2x2PwtQrefVId6fzVdxcn1spsVVkoSp oF9H5fPdQPqLBIkXdW57+d6CGh74J/Kgj3tMS/EMFHAfWALUlhAn4P7FuKVFAiPSULBgbDb+g6D D179VtATIPFmUsu9TBMwbPxIFtiF7MywGOaB4QQngIgpj8eDcAZ1CdBJOsoY8RB0bsfrpPIXzYx eQR1Dvteoc8+S50jzaLdGITE8Df+vw7wTiLlKfCj07KR8K62ZL1knp3UBvYm X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--13.646400-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: 5968523419A560E3B6635D9CEC4A214E18E49A95633F58B26A814CDDCA359DDB2000:8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240913_033946_150467_4E9BB155 X-CRM114-Status: GOOD ( 19.00 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org mtk_cpufreq_set_target() is re-enter function but the mutex lock decalre in mtk_cpu_dvfs_info structure for each policy. It should change to global variable for critical session avoid policy get wrong OPP. SoC with CCI architecture should set transition_delay to 10 ms because cpufreq need to call devfreq notifier in async mode. if delay less than 10ms may get wrong OPP-level in CCI driver. Add CPUFREQ_ASYNC_NOTIFICATION flages for cpufreq policy because some of process will get CPU frequency by cpufreq sysfs node. It may get wrong frequency then call cpufreq_out_of_sync() to fixed frequency. Signed-off-by: Mark Tseng --- drivers/cpufreq/mediatek-cpufreq.c | 65 ++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 16 deletions(-) diff --git a/drivers/cpufreq/mediatek-cpufreq.c b/drivers/cpufreq/mediatek-cpufreq.c index 663f61565cf7..3303b6d72ea7 100644 --- a/drivers/cpufreq/mediatek-cpufreq.c +++ b/drivers/cpufreq/mediatek-cpufreq.c @@ -49,8 +49,6 @@ struct mtk_cpu_dvfs_info { bool need_voltage_tracking; int vproc_on_boot; int pre_vproc; - /* Avoid race condition for regulators between notify and policy */ - struct mutex reg_lock; struct notifier_block opp_nb; unsigned int opp_cpu; unsigned long current_freq; @@ -59,6 +57,9 @@ struct mtk_cpu_dvfs_info { bool ccifreq_bound; }; +/* Avoid race condition for regulators between notify and policy */ +static DEFINE_MUTEX(mtk_policy_lock); + static struct platform_device *cpufreq_pdev; static LIST_HEAD(dvfs_info_list); @@ -200,20 +201,29 @@ static bool is_ccifreq_ready(struct mtk_cpu_dvfs_info *info) static int mtk_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index) { - struct cpufreq_frequency_table *freq_table = policy->freq_table; - struct clk *cpu_clk = policy->clk; - struct clk *armpll = clk_get_parent(cpu_clk); - struct mtk_cpu_dvfs_info *info = policy->driver_data; - struct device *cpu_dev = info->cpu_dev; + struct cpufreq_frequency_table *freq_table; + struct clk *cpu_clk; + struct clk *armpll; + struct mtk_cpu_dvfs_info *info; + struct device *cpu_dev; struct dev_pm_opp *opp; long freq_hz, pre_freq_hz; int vproc, pre_vproc, inter_vproc, target_vproc, ret; + struct cpufreq_freqs freqs; - inter_vproc = info->intermediate_voltage; + mutex_lock(&mtk_policy_lock); - pre_freq_hz = clk_get_rate(cpu_clk); + freq_table = policy->freq_table; + cpu_clk = policy->clk; + armpll = clk_get_parent(cpu_clk); + info = policy->driver_data; + cpu_dev = info->cpu_dev; + inter_vproc = info->intermediate_voltage; + pre_freq_hz = policy->cur * 1000; - mutex_lock(&info->reg_lock); + freqs.old = policy->cur; + freqs.new = freq_table[index].frequency; + cpufreq_freq_transition_begin(policy, &freqs); if (unlikely(info->pre_vproc <= 0)) pre_vproc = regulator_get_voltage(info->proc_reg); @@ -308,7 +318,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy, info->current_freq = freq_hz; out: - mutex_unlock(&info->reg_lock); + cpufreq_freq_transition_end(policy, &freqs, false); + mutex_unlock(&mtk_policy_lock); return ret; } @@ -316,19 +327,20 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy, static int mtk_cpufreq_opp_notifier(struct notifier_block *nb, unsigned long event, void *data) { - struct dev_pm_opp *opp = data; + struct dev_pm_opp *opp; struct dev_pm_opp *new_opp; struct mtk_cpu_dvfs_info *info; unsigned long freq, volt; struct cpufreq_policy *policy; int ret = 0; + mutex_lock(&mtk_policy_lock); + opp = data; info = container_of(nb, struct mtk_cpu_dvfs_info, opp_nb); if (event == OPP_EVENT_ADJUST_VOLTAGE) { freq = dev_pm_opp_get_freq(opp); - mutex_lock(&info->reg_lock); if (info->current_freq == freq) { volt = dev_pm_opp_get_voltage(opp); ret = mtk_cpufreq_set_voltage(info, volt); @@ -336,7 +348,6 @@ static int mtk_cpufreq_opp_notifier(struct notifier_block *nb, dev_err(info->cpu_dev, "failed to scale voltage: %d\n", ret); } - mutex_unlock(&info->reg_lock); } else if (event == OPP_EVENT_DISABLE) { freq = dev_pm_opp_get_freq(opp); @@ -361,6 +372,7 @@ static int mtk_cpufreq_opp_notifier(struct notifier_block *nb, } } } + mutex_unlock(&mtk_policy_lock); return notifier_from_errno(ret); } @@ -495,7 +507,6 @@ static int mtk_cpu_dvfs_info_init(struct mtk_cpu_dvfs_info *info, int cpu) info->intermediate_voltage = dev_pm_opp_get_voltage(opp); dev_pm_opp_put(opp); - mutex_init(&info->reg_lock); info->current_freq = clk_get_rate(info->cpu_clk); info->opp_cpu = cpu; @@ -597,6 +608,9 @@ static int mtk_cpufreq_init(struct cpufreq_policy *policy) policy->driver_data = info; policy->clk = info->cpu_clk; + if (info->soc_data->ccifreq_supported) + policy->transition_delay_us = 10000; + return 0; } @@ -607,13 +621,32 @@ static void mtk_cpufreq_exit(struct cpufreq_policy *policy) dev_pm_opp_free_cpufreq_table(info->cpu_dev, &policy->freq_table); } +static unsigned int mtk_cpufreq_get(unsigned int cpu) +{ + struct mtk_cpu_dvfs_info *info; + unsigned long current_freq; + + mutex_lock(&mtk_policy_lock); + info = mtk_cpu_dvfs_info_lookup(cpu); + if (!info) { + mutex_unlock(&mtk_policy_lock); + return 0; + } + + current_freq = info->current_freq / 1000; + mutex_unlock(&mtk_policy_lock); + + return current_freq; +} + static struct cpufreq_driver mtk_cpufreq_driver = { .flags = CPUFREQ_NEED_INITIAL_FREQ_CHECK | CPUFREQ_HAVE_GOVERNOR_PER_POLICY | + CPUFREQ_ASYNC_NOTIFICATION | CPUFREQ_IS_COOLING_DEV, .verify = cpufreq_generic_frequency_table_verify, .target_index = mtk_cpufreq_set_target, - .get = cpufreq_generic_get, + .get = mtk_cpufreq_get, .init = mtk_cpufreq_init, .exit = mtk_cpufreq_exit, .register_em = cpufreq_register_em_with_opp,