From patchwork Thu Nov 29 21:29:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 152460 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2887831ljp; Thu, 29 Nov 2018 13:29:53 -0800 (PST) X-Google-Smtp-Source: AFSGD/VtFuS1zhBs12ynjPEmRsf/XpxFxdy/eRoRHBmzgkqkCVaKmbo8maa5dPd1MCXwJIzBpTPV X-Received: by 2002:aa7:80d7:: with SMTP id a23mr2962411pfn.86.1543526993159; Thu, 29 Nov 2018 13:29:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543526993; cv=none; d=google.com; s=arc-20160816; b=qjYKJal6wyPMjQ38n778B2Qq02kydytWEKvPDMJ+J5oFkxv+3wNBkW3ljHD+Zuhsbf 8AIGG7rHT8N3K7nPAT/np8XwHOcczsZIicY16x8zLyBnGqAS0Q+naX+aZceIIk1z4PLQ PlxmPVSLJdQl3pAYl9eH0sBERkhmebNnaZSMhlewYP6rIPksKTloocpfN4U6eoK+EJDT if13iFqCUVOTKUDGn60wkvpQ9B74q+jBIUwOxwZGB8UF1KCgS368b/8CP7W3MQKYiIDj qm0NXfdQzUlN0s9IoeB9EGeLDX0Hs+z5zDZ4pYzUxbZI4/58dWFhmvxrSz+ua5cOQiwp LaGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=yunOxm7f641ArikQSrc8dqmBdmRcvehu5Wg1kzPhb0o=; b=n2oFOudRt1yHFMk1LUhcKyrqrD/weoLeLiUrE5+a2mtHNamnswTGnwYtKIOBILU00L 6UX6Rissvz6TRIzCtgdlBDsdQhrAkpz0NQaX5m3mulk97wHGgjURage4iYNYMmUIApxE nuTQloMTzN2L92vqbmWBvbFLqI27rU3g1/ARZS5gItwxSlacJMovpBsKANZotdMoeEYn C3dl+fvP3S79b7ws2drUGPPSUcV71XKO1sz8hy4ip6Y9pblXHCMVl8ZbpOxWT7S7rsOS A/cv77KgqW4CAFg5RGyN9cgecuDz7tn3IuisylZ5KQTJIVj9Og9G63aAcJGPyZOt7OsZ xaIA== 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 n3si3266365pld.36.2018.11.29.13.29.52; Thu, 29 Nov 2018 13:29: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 S1726648AbeK3Igh (ORCPT + 32 others); Fri, 30 Nov 2018 03:36:37 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:6599 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726932AbeK3Igh (ORCPT ); Fri, 30 Nov 2018 03:36:37 -0500 Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id wATLSxo6023175; Thu, 29 Nov 2018 22:29:46 +0100 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2nxw02wvrb-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 29 Nov 2018 22:29:46 +0100 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 6E80A468; Thu, 29 Nov 2018 22:29:16 +0000 (GMT) Received: from Webmail-eu.st.com (Safex1hubcas21.st.com [10.75.90.44]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id A7EFD5981; Thu, 29 Nov 2018 21:29:45 +0000 (GMT) Received: from SAFEX1HUBCAS24.st.com (10.75.90.95) by SAFEX1HUBCAS21.st.com (10.75.90.44) with Microsoft SMTP Server (TLS) id 14.3.361.1; Thu, 29 Nov 2018 22:29:45 +0100 Received: from localhost (10.129.6.191) by webmail-ga.st.com (10.75.90.48) with Microsoft SMTP Server (TLS) id 14.3.361.1; Thu, 29 Nov 2018 22:29:44 +0100 From: Loic Pallardy To: , CC: , , , , , Loic Pallardy Subject: [PATCH 2/7] remoteproc: fix rproc_da_to_va in case of unallocated carveout Date: Thu, 29 Nov 2018 22:29:23 +0100 Message-ID: <1543526968-56091-3-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543526968-56091-1-git-send-email-loic.pallardy@st.com> References: <1543526968-56091-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Originating-IP: [10.129.6.191] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-11-29_13:, , signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With introduction of rproc_alloc_registered_carveouts() which delays carveout allocation just before the start of the remote processor, rproc_da_to_va() could be called before all carveouts are allocated. This patch adds a check in rproc_da_to_va() to return NULL if carveout is not allocated. Fixes: d7c51706d095 ("remoteproc: add alloc ops in rproc_mem_entry struct") Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.4 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index c1a66e25b173..28df71cb3fef 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -204,6 +204,10 @@ void *rproc_da_to_va(struct rproc *rproc, u64 da, int len) list_for_each_entry(carveout, &rproc->carveouts, node) { int offset = da - carveout->da; + /* Verify that carveout is allocated */ + if (!carveout->va) + continue; + /* try next carveout if da is too small */ if (offset < 0) continue;