From patchwork Tue Nov 19 14:16:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 179746 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp697059ilf; Tue, 19 Nov 2019 06:17:12 -0800 (PST) X-Google-Smtp-Source: APXvYqytdXmRq9E2mjGrxfsaw+X90HBl+DVRzgUgSEgd9krXNenMncfDd61sb1akjVlFDA7D6Tp0 X-Received: by 2002:a2e:9bc3:: with SMTP id w3mr4251942ljj.94.1574173032176; Tue, 19 Nov 2019 06:17:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574173032; cv=none; d=google.com; s=arc-20160816; b=pP/1mC+YWd5rRFpIJhMW4OK6JsmL+3gyrRbosXaj6HREQnGV4TCDjgWZX5rgOLeBQW aDuNK5xtYmwmOLYbNSx2Gvwjpw1HdhwbR1sATmYul2Kf/T4cHamc2YSSCAUoXojOL882 lD4fc+culZEhJV6iYzeov38gsaqi3GpDuENk5f3KMtNhW20nrR3xdIfuGUKopuEvr/dK 1FZTLtWNFzRIJR9V7s6seZsnR4ENiCtzIYURwFIpFlCJG+q7ntVsdSpMZCsTtqhaYuCN jVRsD9n9KN11qkrmE9iuqtcVULlhEddjvtJLZnosyPBl44TblMlHqyKkqNA/J/0UAnDO ub6A== 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=Z0UZgul79dMd1dzpnJXaYuVp++fe7lVa0f6QkAu6WoM=; b=k1kaJQtdzFyBEstDspLmLrb1m1omTGUgYF8m8oLlXtoLJ/w9HLcA4lXuP/qTp1W30g zcAGUtNRn+/1GE5uuUz93PFMEiQRT549HRcvgXKo4uWIR7gfmY4HiVIw4gv0bkz5vlDt 2CiGk8bZzfxPji9aRZSmUaX8t72VEHjSVJ2+C3lgsmdBCa5aO+hi/rjemwEcpewifF/T jonKYmsgMO+85I8DZOd9jWsLn/Raexu2kyrbpHASmJMYZRvWfG4zCe39zDs9/Bd0Tvr8 6n07K9Z3mxuyxOzxDTJAztTBXHkiQbLkMKQvVVUKnWR/tlPBkiEa8r7Idt0chSzv1f4Y qvKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=QVZjfxW9; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-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 ov27si13744486ejb.197.2019.11.19.06.17.12; Tue, 19 Nov 2019 06:17:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-omap-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=QVZjfxW9; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-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 S1727894AbfKSORI (ORCPT + 5 others); Tue, 19 Nov 2019 09:17:08 -0500 Received: from fllv0016.ext.ti.com ([198.47.19.142]:58498 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726682AbfKSORH (ORCPT ); Tue, 19 Nov 2019 09:17:07 -0500 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id xAJEH6q2117134; Tue, 19 Nov 2019 08:17:06 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1574173026; bh=Z0UZgul79dMd1dzpnJXaYuVp++fe7lVa0f6QkAu6WoM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=QVZjfxW9ULGfXKF8XF4tuXJ7b3Z0aJWH47Hpji8XU+dUKRDxVBsgSo3gk0BEvSUR+ 3o+mDxlyz++wxJ5AQyC7H3tPG+EldengTjAqMHg8QtTqu+JwKNtts/hXlVc9hPwPle VLmLvqNEWDXSmr+4zPOu8ruOoJi7IR+kIXroCnrY= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id xAJEH6ws022581 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 19 Nov 2019 08:17:06 -0600 Received: from DLEE115.ent.ti.com (157.170.170.26) 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.1847.3; Tue, 19 Nov 2019 08:17:05 -0600 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.1847.3 via Frontend Transport; Tue, 19 Nov 2019 08:17:05 -0600 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 xAJEGvYu027070; Tue, 19 Nov 2019 08:17:04 -0600 From: Tero Kristo To: , , CC: , , , Tero Kristo Subject: [PATCHv2 03/15] remoteproc/omap: Add a sanity check for DSP boot address alignment Date: Tue, 19 Nov 2019 16:16:33 +0200 Message-ID: <20191119141645.19777-4-t-kristo@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191119141645.19777-1-t-kristo@ti.com> References: <20191119141645.19777-1-t-kristo@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@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 Reviewed-by: Bjorn Andersson --- 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 558634624590..d80f5d7b5931 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;