From patchwork Mon Mar 19 16:06:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132064 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp3069600edb; Mon, 19 Mar 2018 10:24:49 -0700 (PDT) X-Google-Smtp-Source: AG47ELu9nBC+zdoNCbuX1lRw6MSxAukW2nU2I3MPBwt63V0LCsMmeh3HhvhlpwrdVhVqbXzmqh3T X-Received: by 2002:a17:902:5328:: with SMTP id b37-v6mr13532033pli.332.1521480289810; Mon, 19 Mar 2018 10:24:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521480289; cv=none; d=google.com; s=arc-20160816; b=pQLo7AfXbz6yYJCrlyv4PEpoKk25XFQggbN+dHWJupT1Os2XMyG+6/fz6fvvDKTlEp G+isP+VNX26LzofTC5nTDuDRjY9itbRPymj+/J8q4CvQjaK61+HaXWr1R1f11TKXVN98 re18tl55H+5ZpHSk1qbePgLqGnSYhRSL3KjbqlsW84YyAEW8h3sVaa0sw4geCfJVRc/B sOREqhgUk5UnqXBOXKSSbz5GRCJiJn5yPaEt83rwojDTsuVZZ8umjWsPgGHHZ5XS9oPt IJ3S+ZTa3krW2sdEVBQu3eswYdbYVoIhfcEHyIUnp2Wel93R/+rFw0Cvt7XW8v6sCtrb nEig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=Kjpzc9ffYBr2qQJcuWfbKWXUcNhcRVB6zvK0Gq3DqG8=; b=whYqgmi5DVIrL9InVRSTguOrCQCyhWmdYG9R3M17syhQoOZB3944NiNJfYtmxtDf6j CwEv0sVhF8GPm23NfXCq4PFawYSxGHKMzQ/tmT+zxBIVYcdNC1Isp9ZA1/nBkMXx3QgO Jgq71z/LKS4QaIER0eWPVA9b9SKtjbY4xDq6/4+2tYQLHkohVOg0ctt46qldNpCtEBUa CGWWHqRe6kZr1in1TjoflxNnHGPKfXSUmlioUIWsZIX1dzTQanYhjR8xRW5uXH/Ct+ub Q6YGLt3Ke2JU+kae9wxivWQrgh1zJTO8zYIq0tkc0vw9fFzMmeFOL/Ta/Re9VScDTzcg p70Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=id7ycGpI; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i2si263452pgn.226.2018.03.19.10.24.49; Mon, 19 Mar 2018 10:24:49 -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=@microsoft.com header.s=selector1 header.b=id7ycGpI; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967977AbeCSRYp (ORCPT + 28 others); Mon, 19 Mar 2018 13:24:45 -0400 Received: from mail-dm3nam03on0096.outbound.protection.outlook.com ([104.47.41.96]:30671 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966306AbeCSQIc (ORCPT ); Mon, 19 Mar 2018 12:08:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Kjpzc9ffYBr2qQJcuWfbKWXUcNhcRVB6zvK0Gq3DqG8=; b=id7ycGpI8g/UiFomwc3NY88CTd8CiYB0dZcMP6+FCvvgMgC7cL7U38nOKG3mIrrz35prGExuTJ77Z/Y56G1WYYv8D/Pk1Mt2RXf+X9YpgilyL9oXsXDiVA4VBlbRPst39/DRc+rRqnQwYPKPw8jVKWV9uc8lVKDempYXlJM5UPk= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0805.namprd21.prod.outlook.com (10.167.105.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.2; Mon, 19 Mar 2018 16:08:23 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 16:08:23 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Suman Anna , Sekhar Nori , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 060/167] ARM: davinci: da8xx: Create DSP device only when assigned memory Thread-Topic: [PATCH AUTOSEL for 4.4 060/167] ARM: davinci: da8xx: Create DSP device only when assigned memory Thread-Index: AQHTv5xBTvQEAGhTv0SX3KhfeUG7bg== Date: Mon, 19 Mar 2018 16:06:36 +0000 Message-ID: <20180319160513.16384-60-alexander.levin@microsoft.com> References: <20180319160513.16384-1-alexander.levin@microsoft.com> In-Reply-To: <20180319160513.16384-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0805; 7:lOtiBPOSPOR+3f/DtdCwIL0u6kQeN4qqRBiGl+jizkBUGM1H7YpKvoe4yctjqdrGrX+VQk6QRNxe6noLcZNTB7tyP//duaZH9dzRIQa+HSfMow4hM0k4HOK1FwtaYEPuGBsd9BVdp6SeLghu/dU4QYQoRWDSWwKFg0+ERKHXYDRQZA1FIYqEH0EktkIWqTkLQiE/CjyXC4frrkno4RuKlhxcfJTiljYkXe/mxT797swNsDMl0ELE9PydJzRCP/m5; 20:B+iYnCC48HMUSB8D6yCK6U9sXXVHX2gkudqQ0L7wAw+wjsjnlHLfimenKWKSnIRkVy7Cote9tQlAf4AJan1OLk3k9MSjNucB05W57CH2GeNFWKL4roi1dO31ZOz4kUQyOVCzgAfZsOOtKcmfWqs1IeXomAQJ5x9nK3pI7jpyx7U= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 90012802-5629-4ece-9ac9-08d58db3a462 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0805; x-ms-traffictypediagnostic: DM5PR2101MB0805: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(31051911155226)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231221)(944501300)(52105095)(3002001)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB0805; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0805; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39380400002)(376002)(346002)(366004)(396003)(39860400002)(199004)(189003)(2950100002)(305945005)(186003)(86362001)(6506007)(3660700001)(6666003)(5660300001)(6116002)(8936002)(3846002)(1076002)(26005)(7736002)(6486002)(2900100001)(6436002)(2906002)(86612001)(68736007)(81166006)(81156014)(10090500001)(102836004)(8676002)(14454004)(105586002)(107886003)(25786009)(478600001)(2501003)(5250100002)(53936002)(3280700002)(316002)(54906003)(4326008)(6512007)(72206003)(66066001)(22452003)(10290500003)(99286004)(76176011)(36756003)(97736004)(106356001)(110136005)(22906009)(32563001)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0805; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: llyp7qLht/S7P2vrikKZsxqSUBXgA14hd/8kj19f9LsbgmOQw+ftMPQrVVQY/1mf2qA0/b35Zo6S1SLUqNsBykmGcSTtuz0AK8uVNZK6J5PkStT+OwOySjVMVrNelgDyg+ElGUwKf3xtYp9DDtttQ/PyOQ0IZ2dBcpahMRInPRD1BQjizVxFFoSSbVww6MS47oLGskxRQwFA4mM4bGhVDsjIW0UVv8X/ZFHc0XwO/5oXn48nk4CrdA6Vn4lIhz07xflZH5b9Bc0ZpXGCWastdVhO7LJi07Kz6eZyNKGfYYgtlHA7yirfLFz5ChV1Py+s4JqTN9dWi9t1EUomQXVyEQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 90012802-5629-4ece-9ac9-08d58db3a462 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:06:36.1477 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0805 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suman Anna [ Upstream commit f97f03578b997a8ec2b9bc4928f958a865137268 ] The DSP device on Davinci platforms does not have an MMU and requires specific DDR memory to boot. This memory is reserved using the rproc_mem kernel boot parameter and is assigned to the device on non-DT boots. The remoteproc core uses the DMA API and so will fall back to assigning random memory if this memory is not assigned to the device, but the DSP remote processor boot will not be successful in such cases. So, check that memory has been reserved and assigned to the device specifically before even creating the DSP device. Signed-off-by: Suman Anna Signed-off-by: Sekhar Nori Signed-off-by: Sasha Levin --- arch/arm/mach-davinci/devices-da8xx.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.14.1 diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 28c90bc372bd..78d325f3245a 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -795,6 +795,8 @@ static struct platform_device da8xx_dsp = { .resource = da8xx_rproc_resources, }; +static bool rproc_mem_inited __initdata; + #if IS_ENABLED(CONFIG_DA8XX_REMOTEPROC) static phys_addr_t rproc_base __initdata; @@ -833,6 +835,8 @@ void __init da8xx_rproc_reserve_cma(void) ret = dma_declare_contiguous(&da8xx_dsp.dev, rproc_size, rproc_base, 0); if (ret) pr_err("%s: dma_declare_contiguous failed %d\n", __func__, ret); + else + rproc_mem_inited = true; } #else @@ -847,6 +851,12 @@ int __init da8xx_register_rproc(void) { int ret; + if (!rproc_mem_inited) { + pr_warn("%s: memory not reserved for DSP, not registering DSP device\n", + __func__); + return -ENOMEM; + } + ret = platform_device_register(&da8xx_dsp); if (ret) pr_err("%s: can't register DSP device: %d\n", __func__, ret);