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 BB977C7EE23 for ; Wed, 7 Jun 2023 08:02:03 +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=T0z28xubkwfNzbZLvP5CN/V9K3E2GDEohuu6aFekPSU=; b=AxQuwxa3HL10VH pnTCIPzgFPC0BCS+YJeSB7Tlrqn1ovyPv1Ouc0QNQaW1O1AodNAV4lCMu1aXwXNMxJ3+6Q9vhXfx8 ghrOzOFYm+5FRfCW7YaMI7NtUz246wtQch9FVwMid6ENeo8G4kQZ2oTLdK7XJfqFuKr3vT4EoVPT6 DmMMHhzedbfFVswtL/toZddZiDlEA7DH6JUKWT2y0M24hQEJphNZyV0mAmsXAI/r6KvhLx+KVshkg f86m5k8JunSEsKswCMDnGvDUEx8h1XlJXfqmgbvGqeKqgR1BlGLxdn9R+bL9ldW69ZUa+A2pLm5IU itKqCf/JOxeNmbl/kIMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6o6H-004qNt-14; Wed, 07 Jun 2023 08:01:01 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q6o6E-004qNE-13; Wed, 07 Jun 2023 08:00:59 +0000 X-UUID: 6d5bb68c050911ee83ed1395ce914268-20230607 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=4EQMpPx40f+DauxwTmfm/2R/LVxHvwVsq8EbnTpqhqU=; b=bycK+/wifu8U1Qx22cOy1G+2bv3XcPC2j3vlUoYJ6Gbfo8htRXrSzOyGMReR324Jqbm1POhC4zrftxvK8mJqFLbBB9N9x1mqTwXOMH4dNdy/w4m2ynXy0AxHOdHF8Lxx1Huha8ubDK5wkI9CAwqgXeg1Xns+Yr5IG+DpmCTnIYo=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.25,REQID:5cb1db44-6861-433a-95e5-da8b82e18319,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:d5b0ae3,CLOUDID:64ffa63d-de1e-4348-bc35-c96f92f1dcbb,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: 6d5bb68c050911ee83ed1395ce914268-20230607 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 862854155; Wed, 07 Jun 2023 01:00:54 -0700 Received: from mtkmbs10n2.mediatek.inc (172.21.101.183) by mtkmbs13n2.mediatek.inc (172.21.101.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 7 Jun 2023 16:00:17 +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; Wed, 7 Jun 2023 16:00:16 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BzU9nM1+F3VX43b8PJMNOBN8Du4YigyQ/eOkb34pS8KYbwtf55WkaoqBWzaI0T0mgLLmFRRax4zUPYbzvd/ZvrbKuPbTeWPvEHpM+8GejjPeAeCaswNYyKZHZ3pKdPXvCxaia9L6mUZXv6a+jZ0UaOGP7NOn7eHOIdVQxoDPHQGdtEWDhfqAaOsUGlKbtkU2Ahs/PO+q+njDXq43AEF1WBOONeLQOcoMPul4f+PNa0y22ywoDLYi0I+50niqDdHktkE6tLTnM4VuERZCT8UuIPk1HT8cUF+Xfpcg3VCsdbjT/8Pi+256Bzv/MxqEXklzLr49aTO1XCuSVEuk0qbLVg== 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=4EQMpPx40f+DauxwTmfm/2R/LVxHvwVsq8EbnTpqhqU=; b=J3HigUqokp7pzbsQBzCXz2RFEo9YEtACLkjCSndh8iqW32ih0EI8fTUbk1CTBRTNNZR1HVFIVr1vDCkD1VcZvGVh7LPASWsJxEhc5mv82fSPF1B1loNyMceL8N35oXh8na66W14Pdl4/mhHwUObAAGz4vMngJHFokhfUd91jJijtShlg3yxyP5z+aMgEPFGK5OGjZ8usNBMBvqez1UN5YCqgjYIwiFP5R1wV2a/Hv6pEslP7NsUpUBZTTJQ9RLl9Z9bIjhRVcjenCNNiMhBoCkemMtcB/ivuM5vXz3++l9O5cAZ+SwxFA88Yt9TRGJwTsi/mwcpMlQOrusgZiFZZLQ== 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=4EQMpPx40f+DauxwTmfm/2R/LVxHvwVsq8EbnTpqhqU=; b=cu+lB+txRxgYnDLqez8Ha0wxuBy/x0ESc3pqPtRcjscSpa7Il/xEtJn7ILvOJURxGsIHEDSUndGYAg3sds0b0h6fvKKE2ZGxxmf1yFUWtmRlx9ggJ5fzF/F6zZjt5EUOzz5zFh4ikZEichzNlyUY2Hvkxzj1+btDHGNtQkcm5ew= Received: from SL2PR03MB4204.apcprd03.prod.outlook.com (2603:1096:100:53::15) by TYZPR03MB7929.apcprd03.prod.outlook.com (2603:1096:400:458::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.31; Wed, 7 Jun 2023 08:00:14 +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.6455.030; Wed, 7 Jun 2023 08:00:14 +0000 From: =?utf-8?B?VGluZ0hhbiBTaGVuICjmsojlu7fnv7Ap?= To: "mathieu.poirier@linaro.org" , "conor+dt@kernel.org" , "matthias.bgg@gmail.com" , "angelogioacchino.delregno@collabora.com" , "andersson@kernel.org" , "robh+dt@kernel.org" , "krzysztof.kozlowski+dt@linaro.org" CC: "linux-remoteproc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-mediatek@lists.infradead.org" , "linux-arm-kernel@lists.infradead.org" , "devicetree@vger.kernel.org" , Project_Global_Chrome_Upstream_Group Subject: Re: [PATCH v13 05/11] remoteproc: mediatek: Introduce cluster on single-core SCP Thread-Topic: [PATCH v13 05/11] remoteproc: mediatek: Introduce cluster on single-core SCP Thread-Index: AQHZmREWM9sf5lt/10GGmQUprBIKY69+9UIAgAAEyIA= Date: Wed, 7 Jun 2023 08:00:14 +0000 Message-ID: <9c710fca38ba53da3ba1aaf32a2221676eb584be.camel@mediatek.com> References: <20230607072222.8628-1-tinghan.shen@mediatek.com> <20230607072222.8628-6-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_|TYZPR03MB7929:EE_ x-ms-office365-filtering-correlation-id: a75fb6a1-cc76-4cfb-a96c-08db672d39e2 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: nZ+uiT63pPh7oWwH6aP7PDylHPhZGIc/2ciAYBj2j3QAJNgkEb011mxMEwbo1q3gIlXRrNGWm0ad+9mohbgdNXamyMuU2TQegCe9RI1/h3KZMtnqteP9g93W5LKvNGpbXr5uxz8zUPAJaQatL+zXUGpGrEeNY1A8nR65NJ2/4ShKvCa9juTjqtWM4/Fupz+bJxv0mGBbLeM5/DwMufQOlZn3TXAVi5D+3iwFzQ41Lk2/BqVdy63TFi3KFIdmFpDHQobSL5ofnow4r9yMhcVNw/TBySzdOkcer9DYqfuQHrOPG88PGSkopI7DhjekjE/aFPRHqLu4iMgI8wlovX55utD4a92olTr9y4UYVe8PsEFc9V9KdVGQPfpkp2Dd523tbYYLEjOybYj2tpwaocdpVn8c9CVJd/UbwQFMcNbmkbFcEIv5tCmH/qLrXWezAO20tPhG13fqEw892iRzc6O5Jlq0U7iDvYX077Ka3OjlF3L9xPL+hHHkFAkvgACdJTsowzpQn6EqxAcU1x1QFBlLLcRmxvZa2L3GEpJCdji/bxnUs0DscCQh3RTH0YdO0KA+KA/4IrR2rQ9uT4OV95ILWVFCPTPXe+ZlEnNCAZXPLzyI47zxDMtkqduuAEMPt7jmglRiPsEYaxOIPm7h8y0KqZan2hMt+zgKehYU36QXRu6f6dhbwnW7ycKQM+G+AoIROndY6Wgzzhp0zvNsQrS0QQ== 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)(346002)(366004)(376002)(39860400002)(136003)(396003)(451199021)(7416002)(107886003)(6512007)(26005)(6506007)(122000001)(83380400001)(5660300002)(2906002)(186003)(85182001)(41300700001)(36756003)(8936002)(316002)(2616005)(8676002)(38070700005)(86362001)(91956017)(66476007)(64756008)(66946007)(4326008)(38100700002)(54906003)(66556008)(66446008)(71200400001)(110136005)(478600001)(76116006)(6486002)(414714003)(473944003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?NVd5K2R4SzVtWjg2TkpsVklsZEFldWFCQ3RNdEFuNTVkRXgyTmFneVB2bExj?= =?utf-8?B?NkZGSmd2Ty9PMFpsaGxCTDBUMVpSdkRqQmhJVkJVRE1udEcva2toV0xobTgv?= =?utf-8?B?S2N2SDZXbXpBUm9VVnM1Z0t5V1RtTFJPQzlhaFBtdjZabWx6K0JBdzBZYjhT?= =?utf-8?B?Rkl1d1Y3MDJSWVRxLzFhQThPZk1iNGJUOVBwRFFmVCs4VVU3c2RzRHZVNXla?= =?utf-8?B?NE5oazkwZXhlZDlZZ2NJNytuTjU0NmZwa0NpRlVDZnBIUldXU1BvVC8ybFNs?= =?utf-8?B?ZDRwdFR4cWJYNHhEMnZUdXlrazdJeVVONDJuWUxIMnFsMjlXQ3MrcitDNlB2?= =?utf-8?B?Y1hjdUJKMVNSZlBhTXhxRU1sU1BPRURkb3VMVU04cVZlVkNFREl3R0Y3TXEz?= =?utf-8?B?dmY1cXQrbVFTNXVUYVR3ellsQTVCdWlGdGVPR29ReTJjbjArWGlWaUVSSTNr?= =?utf-8?B?WjI1MmhEUUV0VGd2a08vLzFkN3ByVEtHSy81V0JEdGg2b1NvTnRoVjllY2Rn?= =?utf-8?B?amlJNGh6WERXUlBWbjNINmc4RGRRelN6bTR5Vjh4TGlCdnNuYTZmckhvNHdy?= =?utf-8?B?RmgycmhoNEJMUGxhU1kyRkk1eVpzaWRvcUk3TFNXZzZYZWF6RzZNcVVUQXlo?= =?utf-8?B?Uk82YnNVMGRUc1FmZWxERGhuNHZodXJ1L1ZTd0FjZnU5dFpCQXR6NHFyOHdp?= =?utf-8?B?T3FKZWU5b2ZJdjcyV0hYYlJGNDAvdkhoOWR4bXdaT3pWZFZDN1luZU13TFdP?= =?utf-8?B?S2RRQTMyaUxYYk0za3pwdG1NaFdmaVhHbFp1eWZ4U0YvRzhxN1VlN3Vsb2pS?= =?utf-8?B?Q2d4QnY3bFVoZVZ5RHF6TEFjcjdHTnVETkY5UVBiSisrUmg1aDFVRXREaDJ0?= =?utf-8?B?cDAzeGZod2tIbGl4cjQzaFdZSU5vWnRMV1pHeDluOG8vTTVGVkhZN011bE0y?= =?utf-8?B?aFpGQWRPSFk4eGRYOXZLU2hRRHZjbmFIMUVUTEVuL3hpN3l6bmprT1I1RDVM?= =?utf-8?B?L0lyYktZU3dYY0JuYWUwZDFwU3lNNjZDWkxZbFVHV3JlMDByRUphT2lUVTgw?= =?utf-8?B?ZkRNWWVvZWllSS9mb1BRZmQ1WHA3NkJacmo4UkM0ZDg5eFFMeXkyZ0pOeU1s?= =?utf-8?B?dFJhQTVWYVRqVS9YRC8rZXJ1OUhYKzhLRTl2NHlNZkhmUWtsNGhPQlMrRHhx?= =?utf-8?B?SkR5YkVrL1pINCtsZWVzUXZXNjBYOW0ySDdFNjFTdHBqeHZxNVRwbHdDK09z?= =?utf-8?B?a3JUT29EaGhSZXNMdTBvMGw2S1FZVWFDRXhWcDFIWlV3QTJsQlRqN3Z0ZWwz?= =?utf-8?B?SXhjMmd5OEtZNStBcG5VL1FyYnIxSlNhVXpZY3ZQWEpDOGJWWjVWNWhDUXN5?= =?utf-8?B?SEIreERjeURkd1Zsc1NBejJ0ZisraFoyV3dOaGhrQnpEV01vK3dVSWJING1V?= =?utf-8?B?eTdRYTJGcS90ejY5Z2I4cFE0V2ZVcjNHK010S0xsWis3cVYycG83Slk2YUo2?= =?utf-8?B?ZC9GcVgwV01WR1pmbTBPaFhFMWd1NVN4M3lDbE54eXRKVi9ZSEh5Mnh5c05P?= =?utf-8?B?SDNFY09LRmZXcEJyenhDeDVUWFVQY3FuWGVmYXV6emhtY2dmL1NJQkkwcUt6?= =?utf-8?B?R2NqWjNJbzFoc0lQTy9LT1BPMmhsY3dWRVZjaUVLR2xqUURqelJQWDdoTm8y?= =?utf-8?B?b29sM3NWU0N3TnJ4WmZqVUdpK1UyYUFnVVB2ZXo3dXZxVzluKzhxZ25RZ0xB?= =?utf-8?B?RGg0dnhRQ050dFdrWkpsT3U2czBrNEZkRjhBWE1CY0VMc1BndW9IVkU3WTJp?= =?utf-8?B?Z0VQajJzay9CVERiZnVBOEtjR2RoK3hNazhBT0lGb1lTK3ZNNkgwSi8rOXNo?= =?utf-8?B?eWFDcVVBMUJ0Y3pzbE5HMlBiZ1BxcCtVa0JDMlF0bEZ6MkFpUDRZbndmVjU5?= =?utf-8?B?Q1hHZU9HOEM1YjAydzV1L3V4M1hPQjZUWTJDb0cwRnZHWk5WRzB0dHphcGF6?= =?utf-8?B?UWxjbWgzWXhzNHlKL1BPU2tac0NlZy9MOEs1V0ZRTFRRK2xqcGdxalBUbWY2?= =?utf-8?B?WjZ1V1JCdGdXK3ZsWVN3VGFBUWpNREdRRkpyQ3pvS2VYbzM5ZVZQOFVSRkZk?= =?utf-8?B?YzJFMDNHRlZFRkc0dWF1ZGxpVTJWb1pIK0lsdHNFVHFJZ0RvcGJDbk5QYzJY?= =?utf-8?B?R3c9PQ==?= Content-ID: 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: a75fb6a1-cc76-4cfb-a96c-08db672d39e2 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Jun 2023 08:00:14.5168 (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: +i/N6BwsOH3LjwSbJpAD1uO/+dA15qY2UE5EN7Edlo2pXW8WTTo+czUvyurrXcK3Oi3GWPUl+jBiLRjZkwJnWWgYPIVpczqLQQpfBlKkAPE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR03MB7929 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230607_010058_377844_6F78ACD2 X-CRM114-Status: GOOD ( 24.63 ) 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 Angelo, On Wed, 2023-06-07 at 09:43 +0200, AngeloGioacchino Del Regno wrote: > Il 07/06/23 09:22, Tinghan Shen ha scritto: > > This is the preliminary step for probing multi-core SCP. > > The initialization procedure for remoteproc is similar for both > > single-core and multi-core architectures and is reusing to avoid > > redundant code. > > > > Rewrite the probing flow of single-core SCP to adapt with the 'cluster' > > concept needed by probing the multi-core SCP. The main differences > > are, > > - the SCP core object(s) is maintained at the cluster list instead of at > > the platofmr device driver data property. > > s/platofmr/platform/g > > > - save the cluster information at the platofmr device driver data property. > > - In order to keep the compatibility of exported SCP APIs which getting > > the SCP core object by SCP node phandle, move the SCP core object > > pointers to the platform device platform data property. > > > > The registers of config and l1tcm are shared for multi-core > > SCP. Reuse the mapped addresses for all cores. > > > > Signed-off-by: Tinghan Shen > > --- > > drivers/remoteproc/mtk_common.h | 2 + > > drivers/remoteproc/mtk_scp.c | 151 +++++++++++++++++++++++--------- > > 2 files changed, 112 insertions(+), 41 deletions(-) > > > > diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h > > index c0905aec3b4b..56395e8664cb 100644 > > --- a/drivers/remoteproc/mtk_common.h > > +++ b/drivers/remoteproc/mtk_common.h > > @@ -128,6 +128,8 @@ struct mtk_scp { > > size_t dram_size; > > > > struct rproc_subdev *rpmsg_subdev; > > + > > + struct list_head elem; > > }; > > > > /** > > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > > index d66822dad943..c8fc6b46f82b 100644 > > --- a/drivers/remoteproc/mtk_scp.c > > +++ b/drivers/remoteproc/mtk_scp.c > > @@ -23,6 +23,14 @@ > > #define MAX_CODE_SIZE 0x500000 > > #define SECTION_NAME_IPI_BUFFER ".ipi_buffer" > > > > +struct mtk_scp_of_cluster { > > + void __iomem *reg_base; > > + void __iomem *l1tcm_base; > > + size_t l1tcm_size; > > + phys_addr_t l1tcm_phys; > > + struct list_head mtk_scp_list; > > +}; > > + > > /** > > * scp_get() - get a reference to SCP. > > * > > @@ -51,7 +59,7 @@ struct mtk_scp *scp_get(struct platform_device *pdev) > > return NULL; > > } > > > > - return platform_get_drvdata(scp_pdev); > > + return *(struct mtk_scp **)dev_get_platdata(&scp_pdev->dev); > > } > > EXPORT_SYMBOL_GPL(scp_get); > > > > @@ -810,14 +818,14 @@ static void scp_unmap_memory_region(struct mtk_scp *scp) > > static int scp_register_ipi(struct platform_device *pdev, u32 id, > > ipi_handler_t handler, void *priv) > > { > > - struct mtk_scp *scp = platform_get_drvdata(pdev); > > + struct mtk_scp *scp = *(struct mtk_scp **)dev_get_platdata(&pdev->dev); > > > > return scp_ipi_register(scp, id, handler, priv); > > } > > > > static void scp_unregister_ipi(struct platform_device *pdev, u32 id) > > { > > - struct mtk_scp *scp = platform_get_drvdata(pdev); > > + struct mtk_scp *scp = *(struct mtk_scp **)dev_get_platdata(&pdev->dev); > > > > scp_ipi_unregister(scp, id); > > } > > @@ -825,7 +833,7 @@ static void scp_unregister_ipi(struct platform_device *pdev, u32 id) > > static int scp_send_ipi(struct platform_device *pdev, u32 id, void *buf, > > unsigned int len, unsigned int wait) > > { > > - struct mtk_scp *scp = platform_get_drvdata(pdev); > > + struct mtk_scp *scp = *(struct mtk_scp **)dev_get_platdata(&pdev->dev); > > > > return scp_ipi_send(scp, id, buf, len, wait); > > } > > @@ -855,7 +863,8 @@ static void scp_remove_rpmsg_subdev(struct mtk_scp *scp) > > } > > } > > > > -static int scp_probe(struct platform_device *pdev) > > +static struct mtk_scp *scp_rproc_init(struct platform_device *pdev, > > + struct mtk_scp_of_cluster *scp_cluster) > > { > > struct device *dev = &pdev->dev; > > struct device_node *np = dev->of_node; > > @@ -867,52 +876,42 @@ static int scp_probe(struct platform_device *pdev) > > > > ret = rproc_of_parse_firmware(dev, 0, &fw_name); > > if (ret < 0 && ret != -EINVAL) > > - return ret; > > + return ERR_PTR(ret); > > > > rproc = devm_rproc_alloc(dev, np->name, &scp_ops, fw_name, sizeof(*scp)); > > - if (!rproc) > > - return dev_err_probe(dev, -ENOMEM, "unable to allocate remoteproc\n"); > > + if (!rproc) { > > + dev_err(dev, "unable to allocate remoteproc\n"); > > + return ERR_PTR(-ENOMEM); > > Why are you converting those dev_err_probe to dev_err->return?! > > Regards, > Angelo It's because the return type of this function changed from "int" to "struct mtk_scp *". Maybe I should change them to "ERR_PTR(dev_err_probe(...))" ? -- Best regards, TingHan _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel