From patchwork Tue Dec 26 06:56:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?WXUtY2hhbmcgTGVlICjmnY7nprnnkosp?= X-Patchwork-Id: 13504797 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 48E44C46CD3 for ; Tue, 26 Dec 2023 07:06:59 +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:MIME-Version:Content-Type: 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:In-Reply-To:References:List-Owner; bh=OJoyHrf0D3K++str3ssDJhC8pF0tH/s7Tnp+ymo2S+s=; b=JNVb08EyxuECci/dwIDVB3rWrC S1sQgKvpClJHAx7jeed7ETkHfpPWpN7J/DVyKtpJZLteD5xxz2F1nYg2Vta9R//kr5aEf4RXGPpap QylGfUMSmvtu1bNK0lZs8yT59DiGCaanwmwzqKvNX2zh9BcShMaHyMH9qd1zyZmV42IorNfa8XeyP irUb+OXvF9XDzgICXLTZGv6pD3aa1abPSb8Ptm9b+dM6uHeLiQnLFNGzPX/kfyCCUHAase+ERD1RW fVBoisDWyzib/apKU/K2HKberM2XIsWcN42prw1QNW8D0dayr6o093zqSK0NiIys/zAkY3xqwRqMP i8enxQVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rI1Wj-00Bpw8-2W; Tue, 26 Dec 2023 07:06:57 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rI1We-00BpvR-12; Tue, 26 Dec 2023 07:06:55 +0000 X-UUID: 557020bea3bd11ee9a662f17bb45267e-20231226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=MIME-Version:Content-Type:Message-ID:Date:Subject:CC:To:From; bh=OJoyHrf0D3K++str3ssDJhC8pF0tH/s7Tnp+ymo2S+s=; b=FY0AWicoYLiHB4qXbiNkZ+NhVZ8hZVjQQdKdCsPwIDYwQe7+f0DDXs7+XU4rzaNuTUstUQT1Pq84945VVLBxNleAMPH1AFTbfLoX9wuxN+bV7yvuiotVluKYY4s4hsvczErrlLPCkgPlm5HAN35KFTBgyno/XfmnfFuZVZgq/+c=; X-QC-Scan-Result: 0 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.35,REQID:471f76af-62d8-4353-a34f-706662e74773,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:5,BULK:0,RULE:Release_Ham,ACTION: release,TS:5 X-CID-META: VersionHash:5d391d7,CLOUDID:6f227e2e-1ab8-4133-9780-81938111c800,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:2,Bulk:nil,QS:0,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR: 0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 557020bea3bd11ee9a662f17bb45267e-20231226 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 1706019583; Tue, 26 Dec 2023 00:06:47 -0700 Received: from mtkmbs10n2.mediatek.inc (172.21.101.183) by MTKMBS14N1.mediatek.inc (172.21.101.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Tue, 26 Dec 2023 14:56:43 +0800 Received: from APC01-SG2-obe.outbound.protection.outlook.com (172.21.101.237) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Tue, 26 Dec 2023 14:56:43 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Iqvk21ctF1pYsY6S3L4NgTry2coT/nGpOH7994S287akKYFuEB01BzLzdf0g8QNolIiQVcvOaCiNB01DTJfedanO40faHDtXfI2bZ6zirauupcOYQJh76XaujX+9PGFef3C7C8nl/O35WnWh2/MvmDD/P+l56mFrChnnPVkpJug5MBpzMPtzXgaWzRQNqx1JXn2vnHAIbp5l/ibcULSzjv468Yi/NmaADI5ZLE6RaFtWDR3JTNN6pmopkqLONIiXLualt8AmRVxy76SdSHHRxjsrsDFeHTqgZzYsktqiQ/Tg0dc11DcziL3vsgOv2IM2aJAFRETHT9HosUb07sAqzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QqbUMHdPNu61hJeTdatnH9DcsjVuZEl7ELPQmSSho3c=; b=CsL2DYInImBmVLMG0du2jvojuUq6ET4RRN8YgmZtn8fzhETsjk7yTHguJ5WxMHmantzyGhVDqQnhlPK1lWy7h2pWZYS1x60O7t5C7qZCR6huZ1xjj/eAjG6DMUcBcLsiiwusFD3PYizjv3BwLe0sCWiMylTl7vlbgkNmPbdfDiYXpMX9EqqzCkWDeQ1H6MmK2cCiAo0YLDjGzC8x2eXHP7pKVAa8APPUKdliio1+K3TSDQUuvX9d65ZobmZZyQUXmYA73Q/4c377e2TmhnrBHOVlE6wJgZpoByEfRd3+IY8vynTQGUq6loRd9vrX+1i+vclFKEfcgnaWUS3u0BSjrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mediatek.com; dmarc=pass action=none header.from=mediatek.com; dkim=pass header.d=mediatek.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mediateko365.onmicrosoft.com; s=selector2-mediateko365-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QqbUMHdPNu61hJeTdatnH9DcsjVuZEl7ELPQmSSho3c=; b=o3VsgAwwC2rFsmHXN0xeeUqkWN9hpGvPpjoYbgNdHNJb8nSCYACYfNKOZUQDxP+k4viR1VoHgHk2QZl6zzzKqpfhpE4eDK/Eu2R2jZV/j/4jDwJac0ZqZvBU3TDI2zApfp4pogmtJXOpMJB2Ny9v09xUNQjw3RJfJELMmkms61g= Received: from KL1PR03MB7366.apcprd03.prod.outlook.com (2603:1096:820:ea::9) by SEYPR03MB7587.apcprd03.prod.outlook.com (2603:1096:101:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.27; Tue, 26 Dec 2023 06:56:40 +0000 Received: from KL1PR03MB7366.apcprd03.prod.outlook.com ([fe80::abaa:4817:8b51:4e2f]) by KL1PR03MB7366.apcprd03.prod.outlook.com ([fe80::abaa:4817:8b51:4e2f%3]) with mapi id 15.20.7113.026; Tue, 26 Dec 2023 06:56:40 +0000 From: =?utf-8?b?WXUtY2hhbmcgTGVlICjmnY7nprnnkosp?= To: "msp@baylibre.com" CC: "fparent@baylibre.com" , "linux-mediatek@lists.infradead.org" , =?utf-8?b?QmVuIExvayAo6Zm45b+X5oGGKQ==?= , =?utf-8?b?Q2hyaXMtcWogQ2hlbiAo6Zmz5aWH6YCyKQ==?= , =?utf-8?b?TG91aXMgWXUgKOa4uOaUv+mMlSk=?= , =?utf-8?b?QmVhciBXYW5nICjokKnljp/mg5/lvrcp?= , =?utf-8?b?TWFuZHlKSCBMaXUgKOWKieS6uuWDlik=?= , "amergnat@baylibre.com" , "afgros@baylibre.com" , =?utf-8?b?WGl1ZmVuZyBMaSAo5p2O?= =?utf-8?b?56eA5bOwKQ==?= , "linux-arm-kernel@lists.infradead.org" , "matthias.bgg@gmail.com" , =?utf-8?b?RmFuIENoZW4g?= =?utf-8?b?KOmZs+WHoSk=?= , "abailon@baylibre.com" , "angelogioacchino.delregno@collabora.com" Subject: Need help to validate power domain driver modification on mt8365 Thread-Topic: Need help to validate power domain driver modification on mt8365 Thread-Index: AQHaN8itlxdkW9VeIk6FQ7TvGfDyJg== Date: Tue, 26 Dec 2023 06:56:39 +0000 Message-ID: Accept-Language: zh-TW, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mediatek.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: KL1PR03MB7366:EE_|SEYPR03MB7587:EE_ x-ms-office365-filtering-correlation-id: ee76ba8f-d2ad-4d7f-a698-08dc05dfcfa8 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 8l5HY8zfYiG1a5+tVErVRlf0cRaHC0Tmpis6NtceExw6CaHnye0bAlezvGo+do0FCgR4wNVHaOz95TKSIKC/8/wcmdOb3RtECgw0TKVh9nv2FfGZwwbgVJMNoE2kM6qvNVBz0Vw3OS9bDNBZCpiQTPA7OeIAeR4Yjm5QJsqaaLGFKlUpXhwlXhgfSSHRCSqe+UfGlEB4DVHwJguwKPF0yLQ3JwsPcnEHz19BBJFcuT4m6b8dM0rXDsnMJSQI5uyWfpIdDM5nxQWPzxhn53H6VgYBY6JMq20EzA2a5iforW8rmbVm6PETrqgvZezI5R7GWvbrnjcF4ScEIqTfzASl6cQg388KNq7jel9rbj2+dPQp2to/gJCRq4KEK2GDzp3nmjH3ougy8a8ZaoQ3DEjCSC6dq0zhhHVyJE7Jw5BuCFeOMczrUHeP/X8CsNYDKBFeUFj16vbzm2mwet6dKeaNsy4WvHKxk0555+EJUVVoFUOv0AxCUJBVTYWEUtFQlgsKw3MxHf0eGkjHUumbmho/jlpTzGNEDMg0Vc31JD+z1Hq+YqPDLnf+wtfodBZGaTAkvb6YRf1lJyQjaN1s3DZpIUH8C1XyaMU7PVGJOCgtwjP4dsoSTNoJg4QC6Q8sk8KJE+osHud2yoYjS2oEz6scuYEtAGH89ICAxPuH1n5QJpg= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:KL1PR03MB7366.apcprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(366004)(39860400002)(396003)(136003)(346002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(8936002)(8676002)(6512007)(6506007)(4326008)(5660300002)(4744005)(2906002)(6486002)(478600001)(54906003)(6916009)(64756008)(66446008)(91956017)(76116006)(66556008)(66946007)(316002)(66899024)(66476007)(38100700002)(41300700001)(99936003)(122000001)(85182001)(86362001)(36756003)(38070700009)(26005)(2616005)(83380400001)(71200400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?dAGt+RUV+FKHNzt8eAbyF+1e1Rp5?= =?utf-8?q?kf3tfjdFWZHkmUvyThvd2N+ztdk6Xu3eG8ezCHCUZarfZDGyqx+kJEhuVgo367Wgv?= =?utf-8?q?/0Ad2LIxyEhkaNrjktC8yGpIMErOmRPQdjbx0fzACiSOLJSbqR/iKLKI1N71VNeT2?= =?utf-8?q?yz1mm51lofMPGmLyxH5X9rXGpKwNBRidc1yFVP/NurAMErpPv+iAX73978wESoJUu?= =?utf-8?q?ig0iWCFch9Yxr2BxelRQY0qArHchnHkCxMkmizjEr/soaTKVCcLizUZn9lELA3m1H?= =?utf-8?q?wtM5EvHtENMNzJ/YxOu9OpQe+VDmEMW3XH6TS17o2r3k0qT2t8pGk24CR69MoSrld?= =?utf-8?q?nROwXi5ggcePnRhkAwINTeLA5zNNVkAT9Qww+m3snVOdJ+kvCdM5St7EtvW2V6WUM?= =?utf-8?q?CxpN736rS58y8ip5Xq8m4lnAQsDaQ8GpCUaSt5AK4LRMZXMZ8N1eCFWJC5r2Rws4L?= =?utf-8?q?JJJyNEu9RfhvRou3Qyqenyv6Y2cQeXauKHuXFpH8hA0Qx+cyeRLHsl3DL7WPIc9Tq?= =?utf-8?q?qKIRI0d2+/nzQ7ltwTiceuH6i3iez35K4+ACr4nbSz/OmJ2CzfZYVXlJhCji9DIzk?= =?utf-8?q?NRZr9ZgfaDNbUmU3f9z7uKEM7ul1gdRP0yndfx8ZpVuVWAyWTWBTh4MfsZnRXTFPD?= =?utf-8?q?q67N8rKKYnRR367PkPdmueymLeq0E5BSZn+hz8stN9ZVmUuAVopBx97LrIo30AeI5?= =?utf-8?q?xpCdWoZRewMuZqoir2tjIq8KAjbOFF7ycobn/O2mHx1vS3XCpEggpH80sAyiglLFU?= =?utf-8?q?fiaVz1KrsDt8BTP/Agcmgl8+uY1kLsmSWe+lQf+lGRAefNLWRU/9JU+jYUiQtIKix?= =?utf-8?q?LGNMIxJk30kdtLobahWqZEeMadP1v7HNUtYEn1t7gb9Q+frnxEBFZASTTxw3DCDHU?= =?utf-8?q?TUGeNuhaDzHGzpTF3k1PAMp8GPkb6fL6Q20vtFOq5ju/DrhdnDDU1/UeAEGU9BDs1?= =?utf-8?q?GrZH/Khk0aTr9J74+WCVadC3ZvzUnidGPPGCAmcu7Crd3fyJF13omBNBCcbA2QsgE?= =?utf-8?q?viIP4rnBfQ3xeUj3ZsRKG/UtzwkEJQcnjXI/K4JxUvuVvUwEGrVSw9ZbvkGr5LWOc?= =?utf-8?q?tSBx43QHTgqhECdFIpNO5GUxm4qmpDzWFB98FyxsepS+z/+1KKzLhuYHL8TbaZijs?= =?utf-8?q?HDGK4FCdmyEryEQVPNS8tj7gd3InQXQKXkhnQcZYliG6viGLlHalnVW8gHuVF3yuX?= =?utf-8?q?wjWBzjeRbwaSd5A1M/fj0aKhOkjK4S7qKwacng1VRrkh6ijHWEOCnMInCjzfbW/xg?= =?utf-8?q?PC4whyPTV26rArOY+kkZjtWAxKHb8TnOOO2dHUTQgaDkiVOupYvuGZLBnllhI8MAP?= =?utf-8?q?kw+IxDNIeCHAnwCYDbkdhyNKCCYe8X2O4RaZ20RIl/gLT4EoCBbAGyYTIaJ68pTRc?= =?utf-8?q?4CFq51ncg4gD4gOLsv0hFOsZKcrazAboGebz6qZqO4JdjTHggDi8btIedxSMfEzmC?= =?utf-8?q?Iv4Fh/0jiP3760V7gILB2pfUz4AuWRdv6/ZqXlqBpnzRlv44cAi+QlBgffUIUg3vu?= =?utf-8?q?jP14iKT5KX/20kvUIgE94YYp7mNfIxu3Hg=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: KL1PR03MB7366.apcprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee76ba8f-d2ad-4d7f-a698-08dc05dfcfa8 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Dec 2023 06:56:39.9265 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a7687ede-7a6b-4ef6-bace-642f677fbe31 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: egkKNtlfff1vMa2WqaT4eg518V4jW1TmB5rABtwNBtMRl5Oqfl8foS5vD1DsYp+r3Pdp8mLU8IqXPT68rrT/UkvZ+v9Uq/cqTBYnN84W6ic= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR03MB7587 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--9.504000-8.000000 X-TMASE-MatchedRID: BFQSNthdAqLpmAewyH7lA7Ke1KMOtvrhcfU+0yIKuYW7+NPPxj+R6k1e BpiBy1knkNWx005+tmpZKgjvZO8wobqUgEs+NGTph2VzUlo4HVNMkOX0UoduuekoI0YuCvcorcm mD7/hK18VR7DQWX/WkSAtDqHg/4QmoCWHJePfRxLZs3HUcS/scH4gKq42LRYkJATzIpmrzS06Px 5jIwosTnKSUajnPw+TqcuSP2EQvdl+3BndfXUhXQ== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--9.504000-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: 27376410DAE1C9F9D68AA2020D4EFC3A7954B929A41B16EB688405712D1C6C392000:8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231225_230652_383599_0334795B X-CRM114-Status: GOOD ( 13.46 ) 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: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Hi Markus, Attachment 0003 is the proposal I make for the clamp protection issue we last discussed and others are some dependency patch. Since smi has have two type of protection but in different stage. So I eventually decide to separate it. May you help test these patch on mt8365, I test it a bit on mt8188 and it work fine. Still any advice and modification are welcome! SMI protection type 1. clamp 2. bus protection For example: power on "clamp protection enable" (smi, with clamp flag) -> regulator enable ... -> clamp protection disaled (smi, with clamp flag) -> bus protection disabled (smi -> infra) For example: power off "clamp protection enable" (smi, with clamp flag) -> bus protection enable (infra -> smi) Best Regards, Yu-chang.lee From 083c373c3b43936e4d598ee8ae4b096029b75e8e Mon Sep 17 00:00:00 2001 From: "yu-chang.lee" Date: Mon, 25 Dec 2023 13:17:42 +0800 Subject: [PATCH 3/3] soc: mediatek: pm-domains: support clamp protection Change-Id: I710ca2cedc3cff4f6310a81b4b1fa4b003b46539 Signed-off-by: yu-chang.lee --- drivers/pmdomain/mediatek/mt8183-pm-domains.h | 52 +++++---- drivers/pmdomain/mediatek/mt8188-pm-domains.h | 41 ++++++- drivers/pmdomain/mediatek/mt8365-pm-domains.h | 12 +- drivers/pmdomain/mediatek/mtk-pm-domains.c | 133 +++++++++++++++++++---- drivers/pmdomain/mediatek/mtk-pm-domains.h | 2 + 5 files changed, 190 insertions(+), 50 deletions(-) mode change 100644 => 100755 drivers/pmdomain/mediatek/mt8183-pm-domains.h mode change 100644 => 100755 drivers/pmdomain/mediatek/mt8365-pm-domains.h mode change 100644 => 100755 drivers/pmdomain/mediatek/mtk-pm-domains.c diff --git a/drivers/pmdomain/mediatek/mt8183-pm-domains.h b/drivers/pmdomain/mediatek/mt8183-pm-domains.h old mode 100644 new mode 100755 index c4c1b63d85b1..04fca4a1e8f3 --- a/drivers/pmdomain/mediatek/mt8183-pm-domains.h +++ b/drivers/pmdomain/mediatek/mt8183-pm-domains.h @@ -103,6 +103,13 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), + .clamp_smi = { + BUS_PROT_WR(SMI, + MT8183_SMI_COMMON_SMI_CLAMP_DISP, + MT8183_SMI_COMMON_CLAMP_EN_SET, + MT8183_SMI_COMMON_CLAMP_EN_CLR, + MT8183_SMI_COMMON_CLAMP_EN), + }, .bp_cfg = { BUS_PROT_WR(INFRA, MT8183_TOP_AXI_PROT_EN_1_DISP, @@ -114,11 +121,6 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { MT8183_TOP_AXI_PROT_EN_SET, MT8183_TOP_AXI_PROT_EN_CLR, MT8183_TOP_AXI_PROT_EN_STA1), - BUS_PROT_WR(SMI, - MT8183_SMI_COMMON_SMI_CLAMP_DISP, - MT8183_SMI_COMMON_CLAMP_EN_SET, - MT8183_SMI_COMMON_CLAMP_EN_CLR, - MT8183_SMI_COMMON_CLAMP_EN), }, }, [MT8183_POWER_DOMAIN_CAM] = { @@ -129,6 +131,13 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), + .clamp_smi = { + BUS_PROT_WR(SMI, + MT8183_SMI_COMMON_SMI_CLAMP_CAM, + MT8183_SMI_COMMON_CLAMP_EN_SET, + MT8183_SMI_COMMON_CLAMP_EN_CLR, + MT8183_SMI_COMMON_CLAMP_EN), + }, .bp_cfg = { BUS_PROT_WR(INFRA, MT8183_TOP_AXI_PROT_EN_MM_CAM, @@ -145,11 +154,6 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { MT8183_TOP_AXI_PROT_EN_MM_SET, MT8183_TOP_AXI_PROT_EN_MM_CLR, MT8183_TOP_AXI_PROT_EN_MM_STA1), - BUS_PROT_WR(SMI, - MT8183_SMI_COMMON_SMI_CLAMP_CAM, - MT8183_SMI_COMMON_CLAMP_EN_SET, - MT8183_SMI_COMMON_CLAMP_EN_CLR, - MT8183_SMI_COMMON_CLAMP_EN), }, }, [MT8183_POWER_DOMAIN_ISP] = { @@ -160,6 +164,13 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), + .clamp_smi = { + BUS_PROT_WR(SMI, + MT8183_SMI_COMMON_SMI_CLAMP_ISP, + MT8183_SMI_COMMON_CLAMP_EN_SET, + MT8183_SMI_COMMON_CLAMP_EN_CLR, + MT8183_SMI_COMMON_CLAMP_EN), + }, .bp_cfg = { BUS_PROT_WR(INFRA, MT8183_TOP_AXI_PROT_EN_MM_ISP, @@ -171,11 +182,6 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { MT8183_TOP_AXI_PROT_EN_MM_SET, MT8183_TOP_AXI_PROT_EN_MM_CLR, MT8183_TOP_AXI_PROT_EN_MM_STA1), - BUS_PROT_WR(SMI, - MT8183_SMI_COMMON_SMI_CLAMP_ISP, - MT8183_SMI_COMMON_CLAMP_EN_SET, - MT8183_SMI_COMMON_CLAMP_EN_CLR, - MT8183_SMI_COMMON_CLAMP_EN), }, }, [MT8183_POWER_DOMAIN_VDEC] = { @@ -186,7 +192,7 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .bp_cfg = { + .clamp_smi = { BUS_PROT_WR(SMI, MT8183_SMI_COMMON_SMI_CLAMP_VDEC, MT8183_SMI_COMMON_CLAMP_EN_SET, @@ -202,7 +208,7 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .bp_cfg = { + .clamp_smi = { BUS_PROT_WR(SMI, MT8183_SMI_COMMON_SMI_CLAMP_VENC, MT8183_SMI_COMMON_CLAMP_EN_SET, @@ -218,6 +224,13 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), + .clamp_smi = { + BUS_PROT_WR(SMI, + MT8183_SMI_COMMON_SMI_CLAMP_VPU_TOP, + MT8183_SMI_COMMON_CLAMP_EN_SET, + MT8183_SMI_COMMON_CLAMP_EN_CLR, + MT8183_SMI_COMMON_CLAMP_EN), + }, .bp_cfg = { BUS_PROT_WR(INFRA, MT8183_TOP_AXI_PROT_EN_MM_VPU_TOP, @@ -234,11 +247,6 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { MT8183_TOP_AXI_PROT_EN_MM_SET, MT8183_TOP_AXI_PROT_EN_MM_CLR, MT8183_TOP_AXI_PROT_EN_MM_STA1), - BUS_PROT_WR(SMI, - MT8183_SMI_COMMON_SMI_CLAMP_VPU_TOP, - MT8183_SMI_COMMON_CLAMP_EN_SET, - MT8183_SMI_COMMON_CLAMP_EN_CLR, - MT8183_SMI_COMMON_CLAMP_EN), }, }, [MT8183_POWER_DOMAIN_VPU_CORE0] = { diff --git a/drivers/pmdomain/mediatek/mt8188-pm-domains.h b/drivers/pmdomain/mediatek/mt8188-pm-domains.h index f91312c4be81..9a0e5d14f1ba 100644 --- a/drivers/pmdomain/mediatek/mt8188-pm-domains.h +++ b/drivers/pmdomain/mediatek/mt8188-pm-domains.h @@ -578,6 +578,18 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8188[] = { .pwr_sta2nd_offs = 0x170, .sram_pdn_bits = BIT(8), .sram_pdn_ack_bits = BIT(12), + .clamp_smi = { + BUS_PROT_WR(SMI, + MT8188_SMI_COMMON_SMI_CLAMP_DIP_TO_VDO0, + MT8188_SMI_COMMON_CLAMP_EN_SET, + MT8188_SMI_COMMON_CLAMP_EN_CLR, + MT8188_SMI_COMMON_CLAMP_EN_STA), + BUS_PROT_WR(SMI, + MT8188_SMI_COMMON_SMI_CLAMP_DIP_TO_VPP1, + MT8188_SMI_COMMON_CLAMP_EN_SET, + MT8188_SMI_COMMON_CLAMP_EN_CLR, + MT8188_SMI_COMMON_CLAMP_EN_STA), + }, .reset_smi = { SMI_RESET_WR(MT8188_SMI_LARB10_RESET, MT8188_SMI_LARB10_RESET_ADDR), @@ -590,7 +602,7 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8188[] = { SMI_RESET_WR(MT8188_SMI_LARB15_RESET, MT8188_SMI_LARB15_RESET_ADDR), }, - .caps = MTK_SCPD_KEEP_DEFAULT_OFF, + .caps = MTK_SCPD_KEEP_DEFAULT_OFF | MTK_SCPD_CLAMP_PROTECTION, }, [MT8188_POWER_DOMAIN_IPE] = { .name = "ipe", @@ -600,11 +612,18 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8188[] = { .pwr_sta2nd_offs = 0x170, .sram_pdn_bits = BIT(8), .sram_pdn_ack_bits = BIT(12), + .clamp_smi = { + BUS_PROT_WR(SMI, + MT8188_SMI_COMMON_SMI_CLAMP_IPE_TO_VPP1, + MT8188_SMI_COMMON_CLAMP_EN_SET, + MT8188_SMI_COMMON_CLAMP_EN_CLR, + MT8188_SMI_COMMON_CLAMP_EN_STA), + }, .reset_smi = { SMI_RESET_WR(MT8188_SMI_LARB12_RESET, MT8188_SMI_LARB12_RESET_ADDR), }, - .caps = MTK_SCPD_KEEP_DEFAULT_OFF, + .caps = MTK_SCPD_KEEP_DEFAULT_OFF | MTK_SCPD_CLAMP_PROTECTION, }, [MT8188_POWER_DOMAIN_CAM_VCORE] = { .name = "cam_vcore", @@ -684,13 +703,20 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8188[] = { .pwr_sta2nd_offs = 0x170, .sram_pdn_bits = BIT(8), .sram_pdn_ack_bits = BIT(12), + .clamp_smi = { + BUS_PROT_WR(SMI, + MT8188_SMI_COMMON_SMI_CLAMP_CAM_SUBA_TO_VPP0, + MT8188_SMI_COMMON_CLAMP_EN_SET, + MT8188_SMI_COMMON_CLAMP_EN_CLR, + MT8188_SMI_COMMON_CLAMP_EN_STA), + }, .reset_smi = { SMI_RESET_WR(MT8188_SMI_LARB16A_RESET, MT8188_SMI_LARB16A_RESET_ADDR), SMI_RESET_WR(MT8188_SMI_LARB17A_RESET, MT8188_SMI_LARB17A_RESET_ADDR), }, - .caps = MTK_SCPD_KEEP_DEFAULT_OFF, + .caps = MTK_SCPD_KEEP_DEFAULT_OFF | MTK_SCPD_CLAMP_PROTECTION, }, [MT8188_POWER_DOMAIN_CAM_SUBB] = { .name = "cam_subb", @@ -700,13 +726,20 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8188[] = { .pwr_sta2nd_offs = 0x170, .sram_pdn_bits = BIT(8), .sram_pdn_ack_bits = BIT(12), + .clamp_smi = { + BUS_PROT_WR(SMI, + MT8188_SMI_COMMON_SMI_CLAMP_CAM_SUBB_TO_VDO0, + MT8188_SMI_COMMON_CLAMP_EN_SET, + MT8188_SMI_COMMON_CLAMP_EN_CLR, + MT8188_SMI_COMMON_CLAMP_EN_STA), + }, .reset_smi = { SMI_RESET_WR(MT8188_SMI_LARB16B_RESET, MT8188_SMI_LARB16B_RESET_ADDR), SMI_RESET_WR(MT8188_SMI_LARB17B_RESET, MT8188_SMI_LARB17B_RESET_ADDR), }, - .caps = MTK_SCPD_KEEP_DEFAULT_OFF, + .caps = MTK_SCPD_KEEP_DEFAULT_OFF | MTK_SCPD_CLAMP_PROTECTION, }, }; diff --git a/drivers/pmdomain/mediatek/mt8365-pm-domains.h b/drivers/pmdomain/mediatek/mt8365-pm-domains.h old mode 100644 new mode 100755 index 3d83d49eaa7c..f9813cdcd3aa --- a/drivers/pmdomain/mediatek/mt8365-pm-domains.h +++ b/drivers/pmdomain/mediatek/mt8365-pm-domains.h @@ -76,7 +76,7 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8365[] = { .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .bp_cfg = { + .clamp_smi = { MT8365_BUS_PROT_SMI_WR_CLAMP_EN_PORT(1), }, }, @@ -138,10 +138,12 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8365[] = { .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), + .clamp_smi = { + MT8365_BUS_PROT_SMI_WR_CLAMP_EN_PORT(2), + }, .bp_cfg = { MT8365_BUS_PROT_INFRA_WR_TOPAXI_1( MT8365_INFRA_TOPAXI_PROTECTEN_1_CAM2MM_AXI_GALS_MST), - MT8365_BUS_PROT_SMI_WR_CLAMP_EN_PORT(2), }, }, [MT8365_POWER_DOMAIN_VDEC] = { @@ -152,7 +154,7 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8365[] = { .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .bp_cfg = { + .clamp_smi = { MT8365_BUS_PROT_SMI_WR_CLAMP_EN_PORT(3), }, }, @@ -164,11 +166,13 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8365[] = { .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(14, 8), .sram_pdn_ack_bits = GENMASK(21, 15), + .clamp_smi = { + MT8365_BUS_PROT_SMI_WR_CLAMP_EN_PORT(4), + }, .bp_cfg = { MT8365_BUS_PROT_INFRA_WR_TOPAXI_1( MT8365_INFRA_TOPAXI_PROTECTEN_1_APU2AP | MT8365_INFRA_TOPAXI_PROTECTEN_1_APU_CBIP_GALS_MST), - MT8365_BUS_PROT_SMI_WR_CLAMP_EN_PORT(4), }, }, [MT8365_POWER_DOMAIN_DSP] = { diff --git a/drivers/pmdomain/mediatek/mtk-pm-domains.c b/drivers/pmdomain/mediatek/mtk-pm-domains.c old mode 100644 new mode 100755 index 3b0d7e8304a8..c7614fe48174 --- a/drivers/pmdomain/mediatek/mtk-pm-domains.c +++ b/drivers/pmdomain/mediatek/mtk-pm-domains.c @@ -47,9 +47,10 @@ struct scpsys_domain { struct clk_bulk_data *subsys_clks; struct regmap *infracfg_nao; struct regmap *infracfg; - struct regmap *smi; + struct regmap **smi; struct regmap **larb; int num_larb; + int num_smi; struct regulator *supply; }; @@ -78,6 +79,71 @@ static bool scpsys_domain_is_on(struct scpsys_domain *pd) return status && status2; } +static int _scpsys_clamp_bus_protection_enable(const struct scpsys_bus_prot_data bpd, + struct regmap *regmap) +{ + u32 val = 0, mask = bpd.bus_prot_sta_mask; + + if (!mask) + return 0; + + if (bpd.flags & BUS_PROT_REG_UPDATE) + regmap_set_bits(regmap, bpd.bus_prot_set, mask); + else + regmap_write(regmap, bpd.bus_prot_set, mask); + + return regmap_read_poll_timeout(regmap, bpd.bus_prot_sta, + val, (val & mask) == mask, + MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT); +} + +static int scpsys_clamp_bus_protection_enable(struct scpsys_domain *pd) +{ + int ret, i; + + for (i = 0; i < pd->num_smi; i++) { + ret = _scpsys_clamp_bus_protection_enable(pd->data->clamp_smi[i], pd->smi[i]); + if (ret) + return ret; + } + + return 0; +} + +static int _scpsys_clamp_bus_protection_disable(const struct scpsys_bus_prot_data bpd, + struct regmap *regmap) +{ + u32 val = 0, mask = bpd.bus_prot_sta_mask; + + if (!mask) + return 0; + + if (bpd.flags & BUS_PROT_REG_UPDATE) + regmap_clear_bits(regmap, bpd.bus_prot_clr, mask); + else + regmap_write(regmap, bpd.bus_prot_clr, mask); + + if (bpd.flags & BUS_PROT_IGNORE_CLR_ACK) + return 0; + + return regmap_read_poll_timeout(regmap, bpd.bus_prot_sta, + val, !(val & mask), + MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT); +} + +static int scpsys_clamp_bus_protection_disable(struct scpsys_domain *pd) +{ + int ret, i; + + for (i = pd->num_smi - 1 ; i >= 0; i--) { + ret = _scpsys_clamp_bus_protection_disable(pd->data->clamp_smi[i], pd->smi[i]); + if (ret) + return ret; + } + + return 0; +} + static int scpsys_sram_enable(struct scpsys_domain *pd) { u32 pdn_ack = pd->data->sram_pdn_ack_bits; @@ -122,14 +188,6 @@ static int scpsys_sram_disable(struct scpsys_domain *pd) MTK_POLL_TIMEOUT); } -static struct regmap *scpsys_bus_protect_get_regmap(struct scpsys_domain *pd, - const struct scpsys_bus_prot_data *bpd) -{ - if (bpd->flags & BUS_PROT_COMPONENT_SMI) - return pd->smi; - else - return pd->infracfg; -} static struct regmap *scpsys_bus_protect_get_sta_regmap(struct scpsys_domain *pd, const struct scpsys_bus_prot_data *bpd) @@ -137,14 +195,14 @@ static struct regmap *scpsys_bus_protect_get_sta_regmap(struct scpsys_domain *pd if (bpd->flags & BUS_PROT_STA_COMPONENT_INFRA_NAO) return pd->infracfg_nao; else - return scpsys_bus_protect_get_regmap(pd, bpd); + return pd->infracfg; } static int scpsys_bus_protect_clear(struct scpsys_domain *pd, const struct scpsys_bus_prot_data *bpd) { struct regmap *sta_regmap = scpsys_bus_protect_get_sta_regmap(pd, bpd); - struct regmap *regmap = scpsys_bus_protect_get_regmap(pd, bpd); + struct regmap *regmap = pd->infracfg; u32 sta_mask = bpd->bus_prot_sta_mask; u32 expected_ack; u32 val; @@ -168,7 +226,7 @@ static int scpsys_bus_protect_set(struct scpsys_domain *pd, const struct scpsys_bus_prot_data *bpd) { struct regmap *sta_regmap = scpsys_bus_protect_get_sta_regmap(pd, bpd); - struct regmap *regmap = scpsys_bus_protect_get_regmap(pd, bpd); + struct regmap *regmap = pd->infracfg; u32 sta_mask = bpd->bus_prot_sta_mask; u32 val; @@ -199,14 +257,20 @@ static int scpsys_bus_protect_enable(struct scpsys_domain *pd) return ret; } - return 0; + return scpsys_clamp_bus_protection_enable(pd); } + static int scpsys_bus_protect_disable(struct scpsys_domain *pd) { + int ret; + + ret = scpsys_clamp_bus_protection_disable(pd); + if (ret) + return ret; + for (int i = SPM_MAX_BUS_PROT_DATA - 1; i >= 0; i--) { const struct scpsys_bus_prot_data *bpd = &pd->data->bp_cfg[i]; - int ret; if (!bpd->bus_prot_set_clr_mask) continue; @@ -272,6 +336,12 @@ static int scpsys_power_on(struct generic_pm_domain *genpd) bool tmp; int ret; + if (MTK_SCPD_CAPS(pd, MTK_SCPD_CLAMP_PROTECTION)) { + ret = scpsys_clamp_bus_protection_enable(pd); + if (ret) + return ret; + } + ret = scpsys_regulator_enable(pd->supply); if (ret) return ret; @@ -318,6 +388,12 @@ static int scpsys_power_on(struct generic_pm_domain *genpd) if (ret < 0) goto err_disable_subsys_clks; + if (MTK_SCPD_CAPS(pd, MTK_SCPD_CLAMP_PROTECTION)) { + ret = scpsys_clamp_bus_protection_disable(pd); + if (ret) + return ret; + } + ret = scpsys_bus_protect_disable(pd); if (ret < 0) goto err_disable_sram; @@ -353,6 +429,12 @@ static int scpsys_power_off(struct generic_pm_domain *genpd) bool tmp; int ret; + if (MTK_SCPD_CAPS(pd, MTK_SCPD_CLAMP_PROTECTION)) { + ret = scpsys_clamp_bus_protection_enable(pd); + if (ret) + return ret; + } + ret = scpsys_bus_protect_enable(pd); if (ret < 0) return ret; @@ -450,12 +532,23 @@ generic_pm_domain *scpsys_add_one_domain(struct scpsys *scpsys, struct device_no if (IS_ERR(pd->infracfg)) return ERR_CAST(pd->infracfg); - smi_node = of_parse_phandle(node, "mediatek,smi", 0); - if (smi_node) { - pd->smi = device_node_to_regmap(smi_node); - of_node_put(smi_node); - if (IS_ERR(pd->smi)) - return ERR_CAST(pd->smi); + pd->num_smi = of_count_phandle_with_args(node, "mediatek,smi", NULL); + if (pd->num_smi > 0) { + pd->smi = devm_kcalloc(scpsys->dev, pd->num_smi, sizeof(*pd->smi), GFP_KERNEL); + if (!pd->smi) + return ERR_PTR(-ENOMEM); + + for (i = 0; i < pd->num_smi; i++) { + smi_node = of_parse_phandle(node, "mediatek,smi", i); + if (!smi_node) + return ERR_PTR(-EINVAL); + + pd->smi[i] = syscon_node_to_regmap(smi_node); + if (IS_ERR(pd->smi[i])) + return ERR_CAST(pd->smi[i]); + } + } else { + pd->num_smi = 0; } pd->num_larb = of_count_phandle_with_args(node, "mediatek,larb", NULL); diff --git a/drivers/pmdomain/mediatek/mtk-pm-domains.h b/drivers/pmdomain/mediatek/mtk-pm-domains.h index 31c2a1bb500f..f903e2943f0e 100644 --- a/drivers/pmdomain/mediatek/mtk-pm-domains.h +++ b/drivers/pmdomain/mediatek/mtk-pm-domains.h @@ -13,6 +13,7 @@ #define MTK_SCPD_EXT_BUCK_ISO BIT(6) #define MTK_SCPD_HAS_INFRA_NAO BIT(7) #define MTK_SCPD_STRICT_BUS_PROTECTION BIT(8) +#define MTK_SCPD_CLAMP_PROTECTION BIT(9) #define MTK_SCPD_CAPS(_scpd, _x) ((_scpd)->data->caps & (_x)) #define SPM_VDE_PWR_CON 0x0210 @@ -120,6 +121,7 @@ struct scpsys_domain_data { int ext_buck_iso_offs; u32 ext_buck_iso_mask; u16 caps; + const struct scpsys_bus_prot_data clamp_smi[SPM_MAX_BUS_PROT_DATA]; const struct scpsys_bus_prot_data bp_cfg[SPM_MAX_BUS_PROT_DATA]; const struct smi_reset_data reset_smi[SPM_MAX_SMI_RESET_DATA]; int pwr_sta_offs; -- 2.18.0