From patchwork Wed Dec 18 11:17:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 181978 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp503806ile; Wed, 18 Dec 2019 03:17:53 -0800 (PST) X-Google-Smtp-Source: APXvYqwkqWn4JcDLCxRC0T3D7CGrxHns9KgaEYNaakADZWgxLLWIIFtfNofId9ZCjzgN6Shuz5HW X-Received: by 2002:a9d:7593:: with SMTP id s19mr1898652otk.219.1576667873408; Wed, 18 Dec 2019 03:17:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576667873; cv=none; d=google.com; s=arc-20160816; b=tdNqLsSa1DxI3yAh7uVXYCllVo86fvJuiCxfFaQEt4CEYhiGtmbJS45JPYUOcuDZRj I7lRwcS/MD82Dn1oPgt15c7LDIKaSFzymtdXdMC6Z72WWsPSzt2gMHeN7ZLBesZ/eV7z bTvhafLngZNSTJgi+Rd6DtOgOQxmfwpnhcM5d6unaGvvl0FSLSi5J7/FnzBYRPJCQ76O 9wGqMDp7oeSI7UA1DtpEi/N4UL4xMaQm50Qpnvhw/33NTrDuCvzdkKSoNx9D+HvQFgrL 4uF5VULDzL222wmIuY6E1NknVmyCTzV1LaGIopZuWCRcOwdG6wSYSoY3bwFAuHHEcio+ VpjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=LKkUV1u920pJWNl5R7HSy02LkfSrnnHp6Q7QOLL4MPY=; b=SAOGfKu6DDZ8y5XfQd5FyBD+iGcBTo+rP7t2gHbv7O75aIJVSpM4G0byoPjMdBIFFt 622zahEggasAq+Nv1v6/J5asaFdmZpwX5/Z452tre4UC9B0ifDFhT67qJi2tGuuzijyT 9u2Nt/NBda0ddBybFqdasUExvw5sy2N5e/X6l0zluOZ/WkCFEwgvkQF3pQnTCa2QMof+ 3pdzLvR06jLPHsg+rGLGhgb3dQDZCEn3Fuh3zx4myxqS0cdgxGAxzmg5NJDF5yyLyHTp Qjb8rlgzPXL9fATd8oFT9Q1V15VOaG9pZ3ae8CbaFkJkL0TQxyIXiWfigb6k/1tuPPed cyWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e23si1101679otj.239.2019.12.18.03.17.53; Wed, 18 Dec 2019 03:17:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726799AbfLRLRv (ORCPT + 27 others); Wed, 18 Dec 2019 06:17:51 -0500 Received: from foss.arm.com ([217.140.110.172]:42348 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726141AbfLRLRu (ORCPT ); Wed, 18 Dec 2019 06:17:50 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6E4CB113E; Wed, 18 Dec 2019 03:17:49 -0800 (PST) Received: from usa.arm.com (e107155-lin.cambridge.arm.com [10.1.196.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B606B3F6CF; Wed, 18 Dec 2019 03:17:48 -0800 (PST) From: Sudeep Holla To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Cristian Marussi Subject: [PATCH v2 02/11] firmware: arm_scmi: Skip scmi mbox channel setup for addtional devices Date: Wed, 18 Dec 2019 11:17:33 +0000 Message-Id: <20191218111742.29731-3-sudeep.holla@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191218111742.29731-1-sudeep.holla@arm.com> References: <20191218111742.29731-1-sudeep.holla@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the scmi bus supports adding multiple devices per protocol, and since scmi_create_protocol_device calls scmi_mbox_chan_setup, we must avoid allocating and initialising the mbox channel if it is already initialised. Reviewed-by: Cristian Marussi Signed-off-by: Sudeep Holla --- drivers/firmware/arm_scmi/driver.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.17.1 diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index dee7ce3bd815..2952fcd8dd8a 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -735,6 +735,11 @@ static int scmi_mbox_chan_setup(struct scmi_info *info, struct device *dev, idx = tx ? 0 : 1; idr = tx ? &info->tx_idr : &info->rx_idr; + /* check if already allocated, used for multiple device per protocol */ + cinfo = idr_find(idr, prot_id); + if (cinfo) + return 0; + if (scmi_mailbox_check(np, idx)) { cinfo = idr_find(idr, SCMI_PROTOCOL_BASE); if (unlikely(!cinfo)) /* Possible only if platform has no Rx */