From patchwork Mon Oct 28 12:42:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 177913 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3339160ill; Mon, 28 Oct 2019 05:43:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqxp6LJNKH/IexBxGE3bwy2BQGVAEp4iYT/oG6UPTRjPIUoyDjX0ZL6e0wA66LpULqzZksTu X-Received: by 2002:a17:906:a3d4:: with SMTP id ca20mr16519279ejb.212.1572266588932; Mon, 28 Oct 2019 05:43:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572266588; cv=none; d=google.com; s=arc-20160816; b=x9RNOGOaNkF7Q0Cuymaf8R2LIRaOFs0qqpRR8/GMJtaYjBKFqEUNwQurHyJFVCqesa vyslj9tliaC6S6xZa96PeaIgOj5AffTRg/3UdliIL9F9j9auXIwr4xRlHjb7MF8wbLOf b4UIWp5qdq67Kt3YBKIOus+5lIiIXQ17tOBOxKI7Ek1HDeikdRoO3upqUf9ka3hPMdpf suhgBddjcznCLv+sKK5870c+XzHxd4CbyYYFN3VCLIpgcqOsmvynj6yWgBQVmF3Q05K0 YuWXrJn2jnzVxSONxUIhzOO08nCk6R6Ks1l+k3GIo/I4vxnAqmdGdQlMfw5B8e/5/l0p SD0w== 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:dkim-signature; bh=ELlXTMe6zCSoapNhxhIUf5j2RgroU8X7YRwSmGhTVvs=; b=zR9o2co8vyXUN8lHuuaoqTZ648u/biyS4Njvdjge0jMKBA2UCTLK4p9KHWkQtuEKP5 kdvAum8UcFT9z37NUcs0F8y2pw5zbjest/EHuQlJPCaZy7sHrQaB1PzpgGTKD8hnj8+D bAk6miz81/Mr1uI3V1l8Pb4kyDNPY0KDCE2lS5gz8+3joXTSswCtSm2YLvO5jclOzbRv 2ZspNz3BO4WefGZwRDq7GWau8m2IByStwRjRUf3VwBEDuPxbDWK0bFk9NnJSPSmDxKkZ eGuGs6xP2LxQFrv2euAu6Q3Fikl6p/BzWyP8SAya4JilR9633C7AVtEfFDknt5fks4I1 MVCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=rAJlk+Pb; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a7si6238715ejj.288.2019.10.28.05.43.08; Mon, 28 Oct 2019 05:43:08 -0700 (PDT) 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; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=rAJlk+Pb; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389293AbfJ1MnG (ORCPT + 26 others); Mon, 28 Oct 2019 08:43:06 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:37238 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389270AbfJ1MnE (ORCPT ); Mon, 28 Oct 2019 08:43:04 -0400 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id x9SCh3Ox033808; Mon, 28 Oct 2019 07:43:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1572266583; bh=ELlXTMe6zCSoapNhxhIUf5j2RgroU8X7YRwSmGhTVvs=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=rAJlk+PbPIC+lU7oX5RPPKD+Tc3MEelTCCqza4UnlYLbLjaAQkM57WJ2FEkEtC45B uHzhVy0/hDhVBPmRe41nyhz0Fj6uqxxiJzN1ZgxJ/qJQcHcOzcyaVwsK078Bz2h1ua jPPquWD0HB4n6p+JE0zD9iAh+aDG/YEqLqWQAhzI= Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x9SCh2lY039563 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 28 Oct 2019 07:43:02 -0500 Received: from DLEE115.ent.ti.com (157.170.170.26) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Mon, 28 Oct 2019 07:42:50 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Mon, 28 Oct 2019 07:43:01 -0500 Received: from sokoban.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id x9SCgogu063574; Mon, 28 Oct 2019 07:43:00 -0500 From: Tero Kristo To: , , CC: , , , Tero Kristo Subject: [PATCH 04/17] remoteproc/omap: Add a sanity check for DSP boot address alignment Date: Mon, 28 Oct 2019 14:42:25 +0200 Message-ID: <20191028124238.19224-5-t-kristo@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191028124238.19224-1-t-kristo@ti.com> References: <20191028124238.19224-1-t-kristo@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suman Anna The DSP remote processors on OMAP SoCs require a boot register to be programmed with a boot address, and this boot address needs to be on a 1KB boundary. The current code is simply masking the boot address appropriately without performing any sanity checks before releasing the resets. An unaligned boot address results in an undefined execution behavior and can result in various bus errors like MMU Faults or L3 NoC errors. Such errors are hard to debug and can be easily avoided by adding a sanity check for the alignment before booting a DSP remote processor. Signed-off-by: Suman Anna Signed-off-by: Tero Kristo --- drivers/remoteproc/omap_remoteproc.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) -- 2.17.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c index cd776189d20b..a10377547533 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -124,13 +124,22 @@ static void omap_rproc_kick(struct rproc *rproc, int vqid) * * Set boot address for a supported DSP remote processor. */ -static void omap_rproc_write_dsp_boot_addr(struct rproc *rproc) +static int omap_rproc_write_dsp_boot_addr(struct rproc *rproc) { + struct device *dev = rproc->dev.parent; struct omap_rproc *oproc = rproc->priv; struct omap_rproc_boot_data *bdata = oproc->boot_data; u32 offset = bdata->boot_reg; + if (rproc->bootaddr & (SZ_1K - 1)) { + dev_err(dev, "invalid boot address 0x%x, must be aligned on a 1KB boundary\n", + rproc->bootaddr); + return -EINVAL; + } + regmap_write(bdata->syscon, offset, rproc->bootaddr); + + return 0; } /* @@ -147,8 +156,11 @@ static int omap_rproc_start(struct rproc *rproc) int ret; struct mbox_client *client = &oproc->client; - if (oproc->boot_data) - omap_rproc_write_dsp_boot_addr(rproc); + if (oproc->boot_data) { + ret = omap_rproc_write_dsp_boot_addr(rproc); + if (ret) + return ret; + } client->dev = dev; client->tx_done = NULL;