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 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 2FE2FC7EE22 for ; Mon, 15 May 2023 12:42:17 +0000 (UTC) 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:Content-ID:In-Reply-To: References:Message-ID:Date:Subject:CC:To:From:Reply-To:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7xrJxMmkDEnSCLzT/Td5djDp0krXz4cp+j0eRdHiKh4=; b=uBIGcVKvomtFIk USNmyFAxcLTIEBQrP/k+fbRaoPh9H463TkVyRLKRgkyEceMLR0wpVtPv/Jz4AreYF2O3ntx22fwtW bmx7vZnpRQ0nljjTrcijgpMZK3Krywz+kdZDMeLJgQuA0lPs929saIeKnti33kLkzuSr5Wvwg4oix TOwhsrAoLfOONF1GpiGwg7enuBU2V/wMe64uP2Iu3wyNwTJS1xzYH8SWPuzhR6pD7MfWn0JBVQnXZ JO5Vp1V7zuvoMe3cSuuihM9y/0jhM2LOOTdpqwZ+Ma4jOvraD+VBpFDIA7RYyvTGBH4hkh86qXOUV K+e9X7AsVtFpkLkXeBFw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyXWR-0029Ka-1D; Mon, 15 May 2023 12:41:51 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyXWO-0029Jh-0h; Mon, 15 May 2023 12:41:50 +0000 X-UUID: d90fb16af31d11ed912e1518a6540028-20230515 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=MIME-Version:Content-Transfer-Encoding:Content-ID:Content-Type:In-Reply-To:References:Message-ID:Date:Subject:CC:To:From; bh=dAey0wC0Mx98XFbKgX0ikjWCnRouSFDlygAAKyMWddw=; b=IpGH25ZrdnHVhzkKwO0x3SriplHNMoczDmKDiVHe1Pj551eVRU5CsLCPqMcCsBot/5UIiGLrXZxPq93hy0eEJ9UI4jxxfMQwwEG72kB0lhVuEW9uGNCAKILOut847E68iegvTgUt97Ik7KXfft0IOhlu3bNsTNBtpnsrf0FlTVA=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.24,REQID:bb9c23cb-a4b1-475e-918c-6fcbb97a5a11,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:178d4d4,CLOUDID:4635e5c0-e32c-4c97-918d-fbb3fc224d4e,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-UUID: d90fb16af31d11ed912e1518a6540028-20230515 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1686767151; Mon, 15 May 2023 05:41:43 -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.1118.26; Mon, 15 May 2023 20:31:09 +0800 Received: from APC01-PSA-obe.outbound.protection.outlook.com (172.21.101.237) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 15 May 2023 20:31:09 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WNiIG8t5U2HGifmlYC+eFWEa+3h8i4Wx9BAxrnfU2EpCos0LLLgV9GM9SOqyQI8AwDkMOi9PeM5TmkMhKrltgkSoIdtXfJ2v5gwgb00xrkL/TVShVPBmOfTXeIJrvXq2K7ouQb3P66wk58nOqcqgqTB06JwICG7vE+klRDpoMOMJ4ssu+Xe488JZmz7Zi52cWVcYuKGBX32M6R4K16I1vVIJ6EeQm7OHxl1z8F5WwsFwzGXUlPdaxR6Oy+w2uBQYKqDfbvTWW7wChouIHY2WEyGp5XSk1TttOQK1Uzs8WT/twTM2Gr8m9G7UvQjZ0wEcElIrptlibYwT4Qch5ZG+xw== 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=dAey0wC0Mx98XFbKgX0ikjWCnRouSFDlygAAKyMWddw=; b=Cb0rTjaJM+uOCzsmRo7KJ/x20LmHy4Dqr63NzxpauWlKRjP3eiCdpHsS55AJXHJx4UElzIUf7dyabhiJ4pl9Ob/8/ef/JosW3BglSacFXMggNvDjwZWCyMmFY7QF9skGTFZLLudQRj/msSTYGCf9fTVKKFsjR0NiCC/jEQ+fAzfOYFDy8OMheURUNl7B/N05ar4+X1bytdkmw9ak2LohUGix9NOfbUMRQ5IATtTaeU5nxOhU5bb+fPd2FVILPBnxiOM1qMXjeszMLipMltlBdeUz8jR9BDH1cNWz5kYsQKWewMEyn0ic6LNDYPGwyvUTDGsQgay5gi7Z2FcL0Qn9yw== 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=dAey0wC0Mx98XFbKgX0ikjWCnRouSFDlygAAKyMWddw=; b=X7Rtz2GVAUPvpMu0eBxLRa1b0C0oXdP9SXgTn1BlEn6OQ6RSRuAmHDWV6PB5IRiT6fg+ac5cK6AL+epVgshKH4zWko+fdsK2aytdXBgQ671OKDFN8dA/W3UaxRhHglOrvSm1kLjFeMXAHp7DoQT72JHiGPSASjE0m8REnSvny2c= Received: from SL2PR03MB4204.apcprd03.prod.outlook.com (2603:1096:100:53::15) by JH0PR03MB7934.apcprd03.prod.outlook.com (2603:1096:990:30::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Mon, 15 May 2023 12:31:05 +0000 Received: from SL2PR03MB4204.apcprd03.prod.outlook.com ([fe80::2648:bb51:77fb:125b]) by SL2PR03MB4204.apcprd03.prod.outlook.com ([fe80::2648:bb51:77fb:125b%4]) with mapi id 15.20.6387.030; Mon, 15 May 2023 12:31:05 +0000 From: =?utf-8?B?VGluZ0hhbiBTaGVuICjmsojlu7fnv7Ap?= To: "mathieu.poirier@linaro.org" CC: "linux-kernel@vger.kernel.org" , "robh+dt@kernel.org" , "linux-remoteproc@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-mediatek@lists.infradead.org" , "conor+dt@kernel.org" , Project_Global_Chrome_Upstream_Group , "linux-arm-kernel@lists.infradead.org" , "krzysztof.kozlowski+dt@linaro.org" , "matthias.bgg@gmail.com" , "andersson@kernel.org" , "angelogioacchino.delregno@collabora.com" Subject: Re: [PATCH v11 06/11] remoteproc: mediatek: Probe multi-core SCP Thread-Topic: [PATCH v11 06/11] remoteproc: mediatek: Probe multi-core SCP Thread-Index: AQHZgwoIWKxcmJiYDUK3yi+HI1wHNK9W8AsAgARcGoA= Date: Mon, 15 May 2023 12:31:04 +0000 Message-ID: <968894ff6a9ed9cfb71cd28eb3552047e4d298a6.camel@mediatek.com> References: <20230510063749.5127-1-tinghan.shen@mediatek.com> <20230510063749.5127-7-tinghan.shen@mediatek.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: 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: SL2PR03MB4204:EE_|JH0PR03MB7934:EE_ x-ms-office365-filtering-correlation-id: 269d1768-7b1c-4696-172c-08db55404058 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: jZbwQWr2/c+GrvMJheLkiQG9xITG9bQyZ58S9PXvjj8IPTCtjofh8WN4jClNS9ZamEZRRLXR1d3obY4A79o7L8XvbMQD9/gw9XkNZr9sf2wMLPfvQ+shfdQYMJ2GjlxTfJbgkTbU1b/qECjHga9KAP+sdVlX+0Z/yavS4uqwaHYsSEkmIDUY7cWvZwnbwgdUpReKqRiD4WtKmvy/LKBMaZr114olCWgUuZrzv9HNkFa2UjBtohapptTxYecOU7qlpHoepd2Rda2CxYAz1fk+KJ4feMqzPJGCV66i2qWqh1dbfP38p8vaZDO9mISAjQr6RIiGrZss2vEROKMn/uB5SbsA6yNEtz9u30q2xsVRYfUU/urKhWxyCr8DQ+3uhf+jVTjZJtoes2fATGnmQyhTjf2XoGpdz8nZBY+S+1/8v2Z+uobuKzP61aMC7UqiKfdUFcvb5rAUhcv3Hd/ULBLGmN1xpaYAA/pJV7pafxUjVCKTgi6592tdlXriupEJcNjUePp1c/VgB0C1do46REkKVCspXddaNXJAQ8dBARwtfCxdE5rYAZ3hdZBeCG60JvAd2qNgVGf33OWfEqewIftxULn/dUZMr6fidYrFiChR0Xf6OIT6OaVdKoRw1B3EKNH47G2aNlJc+u5kS2nXZwC1gKtAyhQrWKxx0rAp7/s18kA= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SL2PR03MB4204.apcprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(396003)(376002)(346002)(366004)(136003)(39860400002)(451199021)(66899021)(66446008)(64756008)(66946007)(66476007)(4326008)(6916009)(66556008)(478600001)(6486002)(76116006)(86362001)(91956017)(316002)(54906003)(85182001)(36756003)(83380400001)(186003)(26005)(6512007)(2616005)(6506007)(71200400001)(8936002)(5660300002)(8676002)(7416002)(2906002)(122000001)(41300700001)(38100700002)(38070700005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?dU51UFNLSkROcHRZU09XeGtUcVpWeVN6eTVUSUV6VmNpWGYwa216M09NTVlE?= =?utf-8?B?OUttNnFEV3lxYzBYdElNWDU3dTc4VEZySS9LNmgrRDJCWXNJclJGTzNZVjZG?= =?utf-8?B?M0t1ajdDQ252Nk1BN1JyZDUvbTNuT0tHVlBMNmFJQnJYeDNMbURnSXlqc0JZ?= =?utf-8?B?L3cyM1FtcVhwK1N3OUdOc0J5YXIzVWFEZUJpSUpScGlrQnlNNmpHTnJkQlVG?= =?utf-8?B?VEQ3dW4wUmRKOUQ3bnd4QXA1MVhGdWpNaFp5N1NyRmFnUFlBcHViVyt3YXp1?= =?utf-8?B?andnOFRuOVd2THBzbHRxbGphUGY1VXJHSWNtM1ZzNUdkWjVmOE9nUVBWa0xV?= =?utf-8?B?Z0hCa3I4dTJDZXIwT1FzYXg3ZUd1aDhJU2pvbERVRzhRMEtJRUlNa0UvN0JF?= =?utf-8?B?OENyYnJ3aStxOVFxWGxKb1V3M1R1ZVhBU1ZkRExrMkZra0RoZDV0TmJQTGs0?= =?utf-8?B?RDR6OVYxNUVZZzArSUdoc0MrSkVuMGZKNnc2ekVMTGtBZlQrODF4cmFCb05Q?= =?utf-8?B?UVJlQW1SUG9GMGJyS2w2N01sOTMzVURoRkVndkVyL1FROHhMcFJLczVuZCtU?= =?utf-8?B?MWZuMjhsblhGV29TR1RuNlBGcVZTbklNbzZhR2RsbnJHbGd2dUVwNncycEI5?= =?utf-8?B?ZmxuRCt2NHc1bDVUWTBIUGtTR0ovUmM1Vzk2YUhQdWgrS0tiQTZoTDVoRk9J?= =?utf-8?B?VUhpdHlLTTk0WmxwT2ZtM0hlWmczQkZreUJwaG54dmhjN1gvdGZaK1N0dXc3?= =?utf-8?B?MXlWWFY0eHErSDF6YWRMbEt0QXVJLzZYdUsyQVlPaW9SOWdROGJZbTJReDJa?= =?utf-8?B?SDcxTjdDWDJjWGhKUkI1TTQxUGVIS21GbmxjYnVVdWVUYmZDd1RDcjBMa2l6?= =?utf-8?B?VUxWemkwcndIdDk4WHgvN0tBYXNacW45ZVpEeGFyYWk2QzVXUDViNE1BbjZt?= =?utf-8?B?MGovNEE4RkFBeFltQU14cHpsOVc4S0YwRmhEZTRlZDEvTWlkcVViUlJQNzNh?= =?utf-8?B?aGdJblZFbnBCUGdOMlJSaHJpaUxobWQxRlVkc3R0b0MweGhzZVZBVzZUWFU3?= =?utf-8?B?aitRWmErVC8vbHljakRFVjAvMmJwN0dNbzVicU9nZjFYY0l4LzNLQjM4a1Nr?= =?utf-8?B?WElGVTI2eGtZcmQrUXo1azBwaHRaWWRYZ0pncDcyTExpWjV0V2NUU0xGWlFv?= =?utf-8?B?MGQ4MHJ3alUrMGF0SmNPekpETzVtWUxWU1IrRTdoVmlnRWF5SjZ1eGNWQ1py?= =?utf-8?B?ZWx1aDJrTFR5RmdYTGwwc0xEQ1c2YnJKN21RZUpCclJ6RGNnY3JTVTlxWG5V?= =?utf-8?B?bUtWT1h4RUQ0OGFtbTFoa2IzZDlYbW9pVlpwbUl6aVU5a2tiNTVMS2NpM295?= =?utf-8?B?d3JVT3JtYkpydUx2OUM1Sm96aTVhZnR5V2tRNWxiOEJlUmxjYkZSQkFneUNY?= =?utf-8?B?bWxCMWJVaWU5bnh0Mm13M2JMbkRuY2lIbm1VcXdSa3hXQlZuR3ZaMWFzeHZO?= =?utf-8?B?SGp3VXVDVVVONlBqZGxvYUR5ck9DNVVwaGp6WFZzK3Z5WUNFdXdodlR5SEdW?= =?utf-8?B?RU9VWG5ZWXhJWER6WFFaTXpLTFpYUS9NaXdYNkw4WkRxMU9RMFd0N1R3Qksz?= =?utf-8?B?WnF6NVdWdXArNy9wMWRlTTVKcm9KVUhWVmdvWW5xZXBad3dDQWZjbXV0VDlU?= =?utf-8?B?L3E3Mmh0NEN5a1U2Y3hKUVdIY3JmWVNXQlJmUXp0VGlqQ0cxVGVmMFdjQ3Rl?= =?utf-8?B?czA1dFdzT0grWXZWWmFJM3J6UjBKMFZRYjB2VklQSk5BVUNST3hMMlBRb1o0?= =?utf-8?B?ZXlqbzVQTmtaMXZ3Rm5xVUJZb2VtU2F1eE5nRk9yTlR0YkZzVC9XSGRVUG9D?= =?utf-8?B?dC84cHFHSkF3ajNpOHZES2xDQXBneWY0eHBwSkRNd0tnZXRyd2tMc3hTRTBH?= =?utf-8?B?QlBGeDRUS0xsWW5UdXZObnYrU0cza2g5cklOSjdkZWlKaXpTNUF3Z0Rjd1J6?= =?utf-8?B?ay9ZQUYvMmpEUjRrOW9BZlgza3hYNjdsdXFxN2s1R0V4dEpNdWg2UVpSeks4?= =?utf-8?B?akxwbzlpWjdSRTd6MTVGNUJ1cDdiMmhhMEwrUXBkaEJiYk80QlU0UjF3OERr?= =?utf-8?B?U2Z2V20xVmdoVEtXR0NKbUdRYjFQdlBEM1JSSEJnRVZUVS9aQVU0U2g1QlZp?= =?utf-8?B?dkE9PQ==?= Content-ID: <419E33211BB13043995A2BAF5475FF05@apcprd03.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SL2PR03MB4204.apcprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 269d1768-7b1c-4696-172c-08db55404058 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 May 2023 12:31:04.8590 (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: MPyiyfich0ZRQmBa3/MRQLUzzQ5aJdYj9qMyqQcnfQkRcsXbMtgZcItv/Y1yyz0hsJtYi5ak/AjxYg2OyXDlbil6thxItX7EYM+nY1TPRLg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: JH0PR03MB7934 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230515_054148_271796_7044C376 X-CRM114-Status: GOOD ( 24.51 ) 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 Hi Mathieu, On Fri, 2023-05-12 at 11:56 -0600, Mathieu Poirier wrote: > External email : Please do not click links or open attachments until you have verified the sender or the content. > > > On Wed, May 10, 2023 at 02:37:44PM +0800, Tinghan Shen wrote: > > The difference of single-core SCP and multi-core SCP device tree is > > the presence of child device nodes described SCP cores. The SCP > > driver populates the platform device and checks the child nodes > > to identify whether it's a single-core SCP or a multi-core SCP. > > > > Add the remoteproc instances of multi-core SCP to the SCP cluster list. > > When the SCP driver is removed, it cleanup resources by walking > > through the cluster list. > > > > Signed-off-by: Tinghan Shen > > --- > > drivers/remoteproc/mtk_scp.c | 135 ++++++++++++++++++++++++++++++----- > > 1 file changed, 117 insertions(+), 18 deletions(-) > > > > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > > index ff73c6dd9637..87215a0e145e 100644 > > --- a/drivers/remoteproc/mtk_scp.c > > +++ b/drivers/remoteproc/mtk_scp.c > > @@ -864,7 +864,8 @@ static void scp_remove_rpmsg_subdev(struct mtk_scp *scp) > > } > > > > static struct mtk_scp *scp_rproc_init(struct platform_device *pdev, > > - struct mtk_scp_of_cluster *scp_cluster) > > + struct mtk_scp_of_cluster *scp_cluster, > > + const struct mtk_scp_of_data *of_data) > > { > > struct device *dev = &pdev->dev; > > struct device_node *np = dev->of_node; > > @@ -887,7 +888,7 @@ static struct mtk_scp *scp_rproc_init(struct platform_device *pdev, > > scp = rproc->priv; > > scp->rproc = rproc; > > scp->dev = dev; > > - scp->data = of_device_get_match_data(dev); > > + scp->data = of_data; > > platform_device_add_data(pdev, &scp, sizeof(scp)); > > > > scp->reg_base = scp_cluster->reg_base; > > @@ -938,10 +939,6 @@ static struct mtk_scp *scp_rproc_init(struct platform_device *pdev, > > goto remove_subdev; > > } > > > > - ret = rproc_add(rproc); > > - if (ret) > > - goto remove_subdev; > > - > > This should have been done in the previous patch. Ok. > > > return scp; > > > > remove_subdev: > > @@ -956,19 +953,116 @@ static struct mtk_scp *scp_rproc_init(struct platform_device *pdev, > > return ERR_PTR(ret); > > } > > > > +static void scp_rproc_free(struct mtk_scp *scp) > > +{ > > + int i; > > + > > + scp_remove_rpmsg_subdev(scp); > > + scp_ipi_unregister(scp, SCP_IPI_INIT); > > + scp_unmap_memory_region(scp); > > + for (i = 0; i < SCP_IPI_MAX; i++) > > + mutex_destroy(&scp->ipi_desc[i].lock); > > + mutex_destroy(&scp->send_lock); > > +} > > + > > +static int scp_is_single_core(struct platform_device *pdev) > > +{ > > + struct device *dev = &pdev->dev; > > + struct device_node *np = dev_of_node(dev); > > + struct device_node *child; > > + > > + child = of_get_next_available_child(np, NULL); > > + if (!child) > > + return dev_err_probe(dev, -ENODEV, "No child node\n"); > > + > > + of_node_put(child); > > + return of_node_name_eq(child, "cros-ec-rpmsg"); > > +} > > + > > static int scp_cluster_init(struct platform_device *pdev) > > { > > - struct mtk_scp *scp; > > + struct mtk_scp *scp, *temp; > > struct mtk_scp_of_cluster *scp_cluster = platform_get_drvdata(pdev); > > struct list_head *cluster = &scp_cluster->mtk_scp_cluster; > > > > - scp = scp_rproc_init(pdev, scp_cluster); > > - if (IS_ERR(scp)) > > - return PTR_ERR(scp); > > + struct device *dev = &pdev->dev; > > + struct device_node *np = dev_of_node(dev); > > + struct platform_device *cpdev; > > + struct device_node *child; > > + const struct mtk_scp_of_data **cluster_of_data; > > + int core_id = 0; > > + int ret; > > + > > + ret = scp_is_single_core(pdev); > > + if (ret < 0) > > + return ret; > > + > > + if (ret) { > > + dev_dbg(dev, "single-core scp\n"); > > + > > + /* When using the SCP node phandle on exported SCP APIs, the drvdata > > + * is expected to be the mtk_scp object, and as a result, it is intended > > + * to be overwritten for single-core SCP usage. > > + */ > > Is this comment still relevant? No, I'll remove it. > > > + scp = scp_rproc_init(pdev, scp_cluster, of_device_get_match_data(dev)); > > + if (IS_ERR(scp)) > > + return PTR_ERR(scp); > > + > > + list_add_tail(&scp->elem, cluster); > > This is getting messy. Please add two new functions, i.e scp_add_single_core() > and scp_add_multi_core(). Ok. > > > + } else { > > + dev_dbg(dev, "multi-core scp\n"); > > + > > + cluster_of_data = (const struct mtk_scp_of_data **)of_device_get_match_data(dev); > > + > > + for_each_available_child_of_node(np, child) { > > + if (!cluster_of_data[core_id]) { > > + ret = -EINVAL; > > + dev_err(dev, "Not support core %d\n", core_id); > > + of_node_put(child); > > + goto init_fail; > > + } > > + > > + cpdev = of_find_device_by_node(child); > > + if (!cpdev) { > > + ret = -ENODEV; > > + dev_err(dev, "Not found platform device for core %d\n", core_id); > > + of_node_put(child); > > + goto init_fail; > > + } > > + > > + scp = scp_rproc_init(cpdev, scp_cluster, cluster_of_data[core_id]); > > + if (IS_ERR(scp)) { > > + dev_err(dev, "Failed to initialize core %d rproc\n", core_id); > > + put_device(&cpdev->dev); > > + of_node_put(child); > > + goto init_fail; > > + } > > + list_add_tail(&scp->elem, cluster); > > + put_device(&cpdev->dev); > > + > > + core_id++; > > + } > > + } > > > > - list_add_tail(&scp->elem, cluster); > > + list_for_each_entry_safe_reverse(scp, temp, cluster, elem) { > > + ret = rproc_add(scp->rproc); > > Call rproc_add() in the for_each_available_child_of_node() loop above. That way > it if fails you can call scp_rproc_free() right away and jump to init_fail to > deal with the other cores on the list. Ok, I'll update it in next version. > > > + if (ret) > > + goto add_fail; > > + } > > > > return 0; > > + > > +add_fail: > > + list_for_each_entry_continue(scp, cluster, elem) { > > + rproc_del(scp->rproc); > > + } > > +init_fail: > > + list_for_each_entry_safe_reverse(scp, temp, cluster, elem) { > > + list_del(&scp->elem); > > + scp_rproc_free(scp); > > + } > > + > > There are a serious problems with the code in both labels above. I will let you > think about that and I will stop here for this revision. > > Mathieu May be the problem is the possible null access of *scp? Or, the resources bound with cpdev should be released at here? > > > + return ret; > > } > > > > static int scp_probe(struct platform_device *pdev) > > @@ -1005,6 +1099,10 @@ static int scp_probe(struct platform_device *pdev) > > INIT_LIST_HEAD(&scp_cluster->mtk_scp_cluster); > > platform_set_drvdata(pdev, scp_cluster); > > > > + ret = devm_of_platform_populate(dev); > > + if (ret) > > + return dev_err_probe(dev, ret, "Failed to populate platform devices\n"); > > + > > ret = scp_cluster_init(pdev); > > if (ret) > > return ret; > > @@ -1016,17 +1114,11 @@ static int scp_remove(struct platform_device *pdev) > > { > > struct mtk_scp_of_cluster *scp_cluster = platform_get_drvdata(pdev); > > struct mtk_scp *scp, *temp; > > - int i; > > > > list_for_each_entry_safe_reverse(scp, temp, &scp_cluster->mtk_scp_cluster, elem) { > > list_del(&scp->elem); > > rproc_del(scp->rproc); > > - scp_remove_rpmsg_subdev(scp); > > - scp_ipi_unregister(scp, SCP_IPI_INIT); > > - scp_unmap_memory_region(scp); > > - for (i = 0; i < SCP_IPI_MAX; i++) > > - mutex_destroy(&scp->ipi_desc[i].lock); > > - mutex_destroy(&scp->send_lock); > > + scp_rproc_free(scp); > > } > > > > return 0; > > @@ -1106,12 +1198,19 @@ static const struct mtk_scp_of_data mt8195_of_data_c1 = { > > .host_to_scp_int_bit = MT8195_CORE1_HOST_IPC_INT_BIT, > > }; > > > > +static const struct mtk_scp_of_data *mt8195_of_data_cores[] = { > > + &mt8195_of_data, > > + &mt8195_of_data_c1, > > + NULL > > +}; > > + > > static const struct of_device_id mtk_scp_of_match[] = { > > { .compatible = "mediatek,mt8183-scp", .data = &mt8183_of_data }, > > { .compatible = "mediatek,mt8186-scp", .data = &mt8186_of_data }, > > { .compatible = "mediatek,mt8188-scp", .data = &mt8188_of_data }, > > { .compatible = "mediatek,mt8192-scp", .data = &mt8192_of_data }, > > { .compatible = "mediatek,mt8195-scp", .data = &mt8195_of_data }, > > + { .compatible = "mediatek,mt8195-scp-dual", .data = &mt8195_of_data_cores }, > > {}, > > }; > > MODULE_DEVICE_TABLE(of, mtk_scp_of_match); > > -- > > 2.18.0 > > -- Best regards, TingHan _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel