From patchwork Mon Mar 19 16:12:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132055 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp2994695edb; Mon, 19 Mar 2018 09:12:58 -0700 (PDT) X-Google-Smtp-Source: AG47ELsG9iHLn2iMZhquoSQcN+jsu/A8sG+9LOsBq5/hIwVyo5F7THABQXZNAnV0zsG0l59QWo66 X-Received: by 2002:a17:902:2468:: with SMTP id m37-v6mr12783720plg.388.1521475978790; Mon, 19 Mar 2018 09:12:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521475978; cv=none; d=google.com; s=arc-20160816; b=xBPmL/aJ73WpXjcSfDfzVGnct06lkd3+y8m0QV0LIZ8WMQayvKC2TnT4QyIAupP26v lCTjHuxHqPLxw3Oo16XKDr+VJQFiJUtTeHCDyr3TWpCyg5Z0z8I6IEi4JXobyLp73Vo9 A0HG0k1k95omimdCxqLWNzfo4FS+Gq6Qh8+Bm29ICt4a9YQptJ9D/wP/iRIO1ndZLJFE tppom4WWvu0IyLNMSzBpb4wjgGkpkYm4IV9N+mK6pgtsVHtiCRC9aXYLOxglq4Jb8q7x Rsvu8fcncku6rQ4mTjAFZ0gYBSrqmSNzOe7L2lz88V+PqZxo/p4v4xcbdRnlAjJ9CcNH oZsg== 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=ugclcwzuy6hx1YMIxMGm1L9m0xnoxEvuvxxngJcZT94=; b=L4wseFg0QbPsGrvDo8PD+Is8N/ozybaPLZNbVAqwbYbAqagFwQLSk4Phf1cXUKsMnP Vfoo/TvVDCGxgCl6mToIDSntY6JIYFd00wQbgW+HFS8ISWR2igsaFArtuOWxWNhDmqAt HZ8OdfiWnuPpMEB3pnnWQUcBdXCTrnFlsAdJyQjcRl4aYnNenjE3KlVhOQmDS1SgGGYJ ra1iTuBjDnKdq8kZ1+sbooyUKDQ5udmPWxsgrwQjWkaBpVh+4aTw9arne3Xj9xRFdO4p sAGf9d4LLna2o+cvxVF8OYw9ApNHJYe+5UX1mCMQqNElIg2GqXE8Usyb2FACaTYWSru1 wW2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=Ybv8Hvxv; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 91-v6si239185plh.296.2018.03.19.09.12.58; Mon, 19 Mar 2018 09:12:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=Ybv8Hvxv; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S966834AbeCSQMy (ORCPT + 10 others); Mon, 19 Mar 2018 12:12:54 -0400 Received: from mail-co1nam03on0094.outbound.protection.outlook.com ([104.47.40.94]:52832 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935246AbeCSQMv (ORCPT ); Mon, 19 Mar 2018 12:12:51 -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=ugclcwzuy6hx1YMIxMGm1L9m0xnoxEvuvxxngJcZT94=; b=Ybv8Hvxvcepgo65K0JQ4O9415LOvlj1v7E0EFrFVOMgbdllTNTrosDnn7QTRVPPjHHgIlsohlihN7i/a90l8E7e51RSkkRxLQbg3U3A1HvTyXEY1UbA8unE9u9dRF7L/HIAWXk1H+vUqM20YMjjHG6dWZCWLrju0NYjJ9BmJkLE= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1014.namprd21.prod.outlook.com (52.132.133.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:12:49 +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:12:49 +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 3.18 037/102] ARM: davinci: da8xx: Create DSP device only when assigned memory Thread-Topic: [PATCH AUTOSEL for 3.18 037/102] ARM: davinci: da8xx: Create DSP device only when assigned memory Thread-Index: AQHTv50OFZMmuBkY9ECUNoUh0zqzsw== Date: Mon, 19 Mar 2018 16:12:19 +0000 Message-ID: <20180319161117.17833-37-alexander.levin@microsoft.com> References: <20180319161117.17833-1-alexander.levin@microsoft.com> In-Reply-To: <20180319161117.17833-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; DM5PR2101MB1014; 7:Exv0L4VlBascF67xWrupmuGX4FhTseJFm4mCsF/g0BU4765XqQQPpgwTnIt847PqMLdCSNtkPdIjlO9Rc1rCrH8dx1n8rdt8Lvaz2KO0rGdv7FJDLfDAMGTElIBbVdeCskod/i98ifn/BsSh6er7I8YE/JQYQzxfOQNmNhxp2hadASe3+aqwrAX3RumumVJDzHTVYw3hjAxNXDM9JAntxN6O6I7uI7Zm1gLarBthI77tc3Ob/9JCLMliGCXFDNII; 20:t0irFSemJ00BRqya68wJP37+e3wEtdc5ptC0pSDIKfcjQg08lemabtCc3va06nDq4Sxl++6ZrdRojTUJWKPXn3vrnIgNfOvhAH5euIphEOzKV4HsipFLp5XNK46L7Q/VymD+Cw7nUbHCA2YJPCppQdkGRkIC0r76p1d/1oq77ME= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b1a74e33-4c73-4638-f095-08d58db4429d x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1014; x-ms-traffictypediagnostic: DM5PR2101MB1014: 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:DM5PR2101MB1014; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1014; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(396003)(39380400002)(346002)(366004)(376002)(199004)(189003)(2501003)(6486002)(478600001)(5250100002)(102836004)(86612001)(1076002)(97736004)(86362001)(99286004)(72206003)(2906002)(6436002)(107886003)(66066001)(6116002)(81156014)(10090500001)(81166006)(305945005)(8676002)(7736002)(68736007)(3846002)(110136005)(54906003)(26005)(3280700002)(105586002)(316002)(186003)(53936002)(8936002)(76176011)(2900100001)(6506007)(10290500003)(22452003)(2950100002)(36756003)(25786009)(5660300001)(106356001)(3660700001)(4326008)(14454004)(6512007)(6666003)(22906009)(32563001)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1014; 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: KWdDD3I1ZHpGjfMUoqk1akC+HEkgWw1tJhPYjDLJDIj9YGV9xCtYCX8fzU6yryMNpaNtg6/2yfKhZOqrbdqGTXNl9TNgrjVSX0SCNDtgQJOBjwpjwI1grhn0e/9dPtA79x7Z5TX34IIp0jmm+DyJ8jglHZW3dlvkGiCjfSXACunyh/gSWU901y+cwhSP717UDtRb8csYN8glF5dusfZ3KVYFiCGezIsopaei0XaHthogK/0APRgGQIw8L9JIi1L9YsG78zDCMOBmXO8vgB0zAK7ewUWfyXwru/Y/OHZdY4fw/kbfGmzaUwfvtnRUUlTZTqs41jzrxb65TRxsSAi2Gg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1a74e33-4c73-4638-f095-08d58db4429d X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:12:19.2707 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1014 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 b85b781b05fd..e83874ba6e6d 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -761,6 +761,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; @@ -799,6 +801,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 @@ -813,6 +817,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); From patchwork Mon Mar 19 16:12:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132056 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp2995523edb; Mon, 19 Mar 2018 09:13:44 -0700 (PDT) X-Google-Smtp-Source: AG47ELuWDnqTUPzq9O4m+riu75+IQdgjPzAgb14bQuNc4bxkJP9hhaGcmIQZaw7ccsIxeirE9gp3 X-Received: by 10.99.120.138 with SMTP id t132mr9615927pgc.280.1521476024084; Mon, 19 Mar 2018 09:13:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521476024; cv=none; d=google.com; s=arc-20160816; b=Ef4xrDCLfXRDI+Y1UvJ1Ajd+wnM+u5+kz6YQfHXYAa4U9h9OISyhlA7qd2aazt0SIS RydOoXQsthp/OY3datbuSuwqZXq1JPpm3IxCPEtVCyanrXeWSKXE+yXL2uJWxKMa+LUE Nv8wESFQAruHOuij5HJRehQ1jZEBCQM4OA9nr/qMB6FyoSCXcW8IC5KZYep7hv8JQQ42 EXtxU+8+ZXruuPYtixti+SE148spoYUtjqJFbS7425Gb6qSQQxZ4VgDaEMOl560IsMvZ /2bWxtc4KRfvKlESuCgERhx/UUbbbvI0PQYSML77t/hC/mMzSuhG8FlP55HAp8ybWqhP Ad6w== 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=ASYjTstmuLIq0rgKF1UM99cmIE+BmE43jzrCpMharcA=; b=QwA3RhBYCU1hsHQuNVr9vsnqalT0uXF0CP8f8RSDmzO8dTWvoT7jx8fWV5SoxVDaey lp52VFwWWAU/V9w99QYdxXhapUaWYO4zuUlLBR+WPu+cxD9Q+7NDORJx6UntkuUalY4L SBjNeYeOF0jfxZBVw57uqOwNL//BXDhudtjLLfQQZz5tD5Qk9Eju6IqIHgRFHHPvi9jo x0wPg11YyFmqQnLD+JqU5/23CKm4NOlmvMwLcLLoujnEVEKCUMGpqoyno9+mSpI5b8PN UNRV0RxaG+4BjFRUVylLd5mlnK9QusdNnR5ewrp+5yxoSX6BgcMAZBP/Id48KNeOaMw5 2ZAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=Kwu15wAj; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 e67si201465pfa.140.2018.03.19.09.13.43; Mon, 19 Mar 2018 09:13:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=Kwu15wAj; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S935312AbeCSQNj (ORCPT + 10 others); Mon, 19 Mar 2018 12:13:39 -0400 Received: from mail-cys01nam02on0094.outbound.protection.outlook.com ([104.47.37.94]:64207 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935246AbeCSQNe (ORCPT ); Mon, 19 Mar 2018 12:13:34 -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=ASYjTstmuLIq0rgKF1UM99cmIE+BmE43jzrCpMharcA=; b=Kwu15wAj3skaqJP+HXkPvyrqH0rGUhjqS7PcbTAoIUYAV3nd/qV9jU4TFlkYmX8eijuN6tlCjA89dPJfUurbMKS5ijOW+1ZO5WopBDYz139JOll6Hj8jlDyqZvPYnkhi2I+6qhZqK2JoL4k/0/p3/zY2hzl5htyQy6lZ3KQJEH0= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1048.namprd21.prod.outlook.com (52.132.128.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:13:19 +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:13:19 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Tomi Valkeinen , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 066/102] drm/omap: fix tiled buffer stride calculations Thread-Topic: [PATCH AUTOSEL for 3.18 066/102] drm/omap: fix tiled buffer stride calculations Thread-Index: AQHTv50hZoTbnkI1eEKp2EqQbCoWPQ== Date: Mon, 19 Mar 2018 16:12:51 +0000 Message-ID: <20180319161117.17833-66-alexander.levin@microsoft.com> References: <20180319161117.17833-1-alexander.levin@microsoft.com> In-Reply-To: <20180319161117.17833-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; DM5PR2101MB1048; 7:7Y9j5B90+oOE+aLsJ3ImYI5SCs4YdQfQHcrfVsPA9IZHvxnUuwiCQRiiMLkzEW1CVvhyq9Jrp14pN7mCR/0zQKvbwQTHb5uy0TudFT5Exst8eIsxn3+EkYFPIFx4HioaYapixHdhUrCEVya3RVGB3JVsWfAqZJL51xr75m42nJI61U1X19VwvuKyThHPwHkJvjGmSZ7ZS9+bl/QKwIC4Yg2UEdyc0UqKnUhnWDOod19lvBFHRxfb5htcGfY8kxM4; 20:y3GKgeL1JdxzDQ8br57/UvBlyWBVTta/8akgFxwoRhJT5Jf9IWue+pk5xHvCGOo1UKOpq90o6F8eWW81wDkMSb6et42FNuqqSXX0d3VzUR4xPt6oajsgfmcjriRzZHwqfsgZhylF6A28D5iIWq9m2dN9FfEl4BfUBeK/5fso6z8= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 2adc8d89-c7be-474a-fdf7-08d58db454c5 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1048; x-ms-traffictypediagnostic: DM5PR2101MB1048: 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)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB1048; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1048; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39380400002)(396003)(346002)(39860400002)(366004)(376002)(189003)(199004)(10090500001)(107886003)(25786009)(106356001)(102836004)(26005)(6506007)(8936002)(2906002)(6666003)(186003)(86362001)(2950100002)(5250100002)(66066001)(3280700002)(5660300001)(4326008)(72206003)(68736007)(10290500003)(86612001)(2501003)(478600001)(81156014)(81166006)(8676002)(2900100001)(1076002)(105586002)(6436002)(54906003)(110136005)(53936002)(36756003)(6116002)(59450400001)(3846002)(305945005)(316002)(6512007)(6486002)(14454004)(97736004)(3660700001)(7736002)(76176011)(22452003)(99286004)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1048; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: IFwvanqKttitSXvqxjVPYnBGmWjMtUuGzT7n/U98Bq3yGdHj0PkMCf5CUWhn9OpOL52DNVKCsl3SLWHrA4cfLASfKRnTiTOVtgDLXyrNJbLeMLaLF2iyu8yRrvfJqdOWibUdy2s0Y0Tl0baYGUbGPfibGtOyn2Ss3xcPzNUtXV8OGGuIoPAZ3iusbUExa+Jx2OUH7beh26KbYxapai5yvgGwstKpWRgdgEUHYzuLijRzwn0e0OetdoiuyXrWCs/+5FTlot9fAB54bfzHT2EVI83hONp/7PFFz+gVN71qaTWrWo9X7qCNfW2vwYCgMu0cfsewFMSmUwtWLczcxCe1OQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2adc8d89-c7be-474a-fdf7-08d58db454c5 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:12:51.4564 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1048 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tomi Valkeinen [ Upstream commit cc8dd7661ccc2d8dc88921da8e6cc7c2fcdb0341 ] omap_gem uses page alignment for buffer stride. The related calculations are a bit off, though, as byte stride of 4096 gets aligned to 8192, instead of 4096. This patch changes the code to use DIV_ROUND_UP(), which fixes those calculations and makes them more readable. Signed-off-by: Tomi Valkeinen Reviewed-by: Laurent Pinchart Signed-off-by: Sasha Levin --- drivers/gpu/drm/omapdrm/omap_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.14.1 diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index e4849413ee80..4f745c11d955 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -158,7 +158,7 @@ static void evict_entry(struct drm_gem_object *obj, size_t size = PAGE_SIZE * n; loff_t off = mmap_offset(obj) + (entry->obj_pgoff << PAGE_SHIFT); - const int m = 1 + ((omap_obj->width << fmt) / PAGE_SIZE); + const int m = DIV_ROUND_UP(omap_obj->width << fmt, PAGE_SIZE); if (m > 1) { int i; @@ -415,7 +415,7 @@ static int fault_2d(struct drm_gem_object *obj, * into account in some of the math, so figure out virtual stride * in pages */ - const int m = 1 + ((omap_obj->width << fmt) / PAGE_SIZE); + const int m = DIV_ROUND_UP(omap_obj->width << fmt, PAGE_SIZE); /* We don't use vmf->pgoff since that has the fake offset: */ pgoff = ((unsigned long)vmf->virtual_address - From patchwork Mon Mar 19 16:13:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132057 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp2996415edb; Mon, 19 Mar 2018 09:14:27 -0700 (PDT) X-Google-Smtp-Source: AG47ELv+uRIj0P4vx9mZ3IycBpMWCPOZZTttD1lWaHunVd/gp4fXEUa5qtRxYLFMoCGh9u9QZkIl X-Received: by 10.101.83.75 with SMTP id w11mr9354769pgr.197.1521476067156; Mon, 19 Mar 2018 09:14:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521476067; cv=none; d=google.com; s=arc-20160816; b=V/Xf0oTTyI5dqHL0F0Jcf2t99D7Xx/yUTSp1yxjDGW0uWfVJLDXD6H/q7SYfs5P/B/ zQMuq1cC2Hc6i0xmopU9b+cpnMJr9EpF2YErBxBiFva4+UO7ARh99kQK9JkU/PGU+932 3les9iLJKSsVkJbrKuClsfnjqVqIGm3BVHLZMg00k8BJZaQzqCTevtu665z/gqyAmpuH 0zEpUUPOC6SWVt8teDq8iXRCTe0Hkh5CkHi3MiIqW6AxEliY+RScT7LzmtpnRVx8M9X7 x+ut5glGa9OEZFiQVlcvnlEZq57NoluY28ke4uDBtuX/SdaospvuE/pBWdGxr04Fm9aY DlhQ== 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=Z5hta+l+4GhEhZa5aISaf1XhWM3j/azEmn4JgZKUg1s=; b=pZa0xQTYQEiDX7RWDO0Re/E9DQMQKO+SQ9siORpU5ENeIH87LrnyC4ybnaobo4Qf5H XTfImohtR2+sVi6ze0QPzng9EtrbXKjfb0lq23HaVcz8gpVub8699znG2S0iQptMvg5J zaGWMTyS7YP/IPv79XTEkq+BHZ/eGrEODavOEITW4oEIftKFOH4IgWK+qcjvEblUbUC5 BuCP8EzJuVgi32stv429hCCfGP8WTiw3hiAC4a/3gntscxigptQ4lU7wtCsspf7G8pO1 sA/SY03XCRskggXI+QR1Bu9H7WFWMq2OqUyn5ADsj+9+1/JmDRGv38ddK8+vMnGv1gmb GY2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=SP/Tqlr/; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 185si176730pgd.561.2018.03.19.09.14.26; Mon, 19 Mar 2018 09:14:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=SP/Tqlr/; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S966885AbeCSQOY (ORCPT + 10 others); Mon, 19 Mar 2018 12:14:24 -0400 Received: from mail-cys01nam02on0101.outbound.protection.outlook.com ([104.47.37.101]:53605 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966938AbeCSQOQ (ORCPT ); Mon, 19 Mar 2018 12:14:16 -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=Z5hta+l+4GhEhZa5aISaf1XhWM3j/azEmn4JgZKUg1s=; b=SP/Tqlr/WqxlcMPppy+PoYlE/lQnCqOBtyboufmI/e49csC6dNL1i5NEFDWGWo+XljimJyLDoAbFPP8CCVlNeBUalPOJ8+K/dhLMNJyx8fdAaSwLOa2L7woHplP52NDHqozYMGxTc2vv/NKq3jqGOa9gJh9h1PNWeE5IPIy83Z4= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1063.namprd21.prod.outlook.com (52.132.128.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:14:08 +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:14:08 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Arnd Bergmann , Ian Abbott , Stefano Stabellini , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 083/102] xen: avoid type warning in xchg_xen_ulong Thread-Topic: [PATCH AUTOSEL for 3.18 083/102] xen: avoid type warning in xchg_xen_ulong Thread-Index: AQHTv50u8HHhC6mrE0SjxWk1s7/L+g== Date: Mon, 19 Mar 2018 16:13:13 +0000 Message-ID: <20180319161117.17833-83-alexander.levin@microsoft.com> References: <20180319161117.17833-1-alexander.levin@microsoft.com> In-Reply-To: <20180319161117.17833-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; DM5PR2101MB1063; 7:OINVfeqFYFU9RarYUEQhztTC3Q+fX37AsH/2yvuJ7H7juysOr0kz9+0oXxTlgMDzDwdAfLPa8hFBSOeiDDRKaHqSBBwLVjvrW8w3TwlroGZh05w1ncShCJ+j4gRE2EFZU0eJFh9YLc/5IcwM2A4TFEQAghGrwvLBhj1iZB+2OnMgCe0MLWB5ptcMmEmC05h9W1Vu/Y3x5gkLyOdi0OMguJ+O4XnU5QPKxrXwrTYOOjSiDmPyhHxgKVhcmy6xRHbD; 20:TpWkQsHshc0MTwAVTDQf3rHCbgEvYGV+HoPKxUKGzPITnPG/FUTvNOp+jHyxo0uu/260q/tJTJnBdVBCWYeYeyyt8JPKUmSG2YtVhMI38+4wOtEbvHhB9I5uvitN0/7mnENKHKCEr6h2/8ZyUaFirUT6QIoYGvaNLkkp1Mpocsk= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 22f24170-d250-4406-eea3-08d58db47183 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1063; x-ms-traffictypediagnostic: DM5PR2101MB1063: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB1063; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1063; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(396003)(39860400002)(376002)(39380400002)(366004)(199004)(189003)(3846002)(6116002)(8936002)(1076002)(8676002)(3280700002)(2501003)(575784001)(5250100002)(81156014)(53936002)(81166006)(2906002)(5660300001)(86362001)(2900100001)(105586002)(22452003)(102836004)(6512007)(316002)(59450400001)(6506007)(66066001)(106356001)(14454004)(97736004)(99286004)(36756003)(2950100002)(107886003)(76176011)(6666003)(10090500001)(7736002)(305945005)(10290500003)(72206003)(68736007)(478600001)(110136005)(3660700001)(25786009)(86612001)(26005)(6436002)(6486002)(186003)(4326008)(54906003)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1063; 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: lLhqWbMbqepwh7XSyDqV6nbV396Tw3021rbFeIDSbrkAU1lGhI/01T2zIz93lZQNKgD1V9wfda2+VxK5EXW22NSognu9DA/10UFeuvNxsp5+uQyip6DBOB9OPxsmW0Ucb5B6ZF3+yqqjLx0kMNnST51kcOapMbcNVEiI3j1VY20uAxgxK5Xn1RCUf8V8FDYOHtePbinV5Tv1bCSKIzKtgWRdmOTWPPotLwSNNdoTu6dh4DnuI8nxZJ87GI44fa+Ev12p5AwCGfeQJN5Y2aHghLzEFU51w7o10Ok4DYRY1IDX4ctNspRZg3rEX3jAq2NoC3qvb4DC+SZnnG2waR2H4A== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22f24170-d250-4406-eea3-08d58db47183 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:13:13.1887 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1063 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 9cc91f212111cdcbefa02dcdb7dd443f224bf52c ] The improved type-checking version of container_of() triggers a warning for xchg_xen_ulong, pointing out that 'xen_ulong_t' is unsigned, but atomic64_t contains a signed value: drivers/xen/events/events_2l.c: In function 'evtchn_2l_handle_events': drivers/xen/events/events_2l.c:187:1020: error: call to '__compiletime_assert_187' declared with attribute error: pointer type mismatch in container_of() This adds a cast to work around the warning. Cc: Ian Abbott Fixes: 85323a991d40 ("xen: arm: mandate EABI and use generic atomic operations.") Fixes: daa2ac80834d ("kernel.h: handle pointers to arrays better in container_of()") Signed-off-by: Arnd Bergmann Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Acked-by: Ian Abbott Signed-off-by: Sasha Levin --- arch/arm/include/asm/xen/events.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.1 diff --git a/arch/arm/include/asm/xen/events.h b/arch/arm/include/asm/xen/events.h index 8b1f37bfeeec..b7aadab9b0e8 100644 --- a/arch/arm/include/asm/xen/events.h +++ b/arch/arm/include/asm/xen/events.h @@ -16,7 +16,7 @@ static inline int xen_irqs_disabled(struct pt_regs *regs) return raw_irqs_disabled_flags(regs->ARM_cpsr); } -#define xchg_xen_ulong(ptr, val) atomic64_xchg(container_of((ptr), \ +#define xchg_xen_ulong(ptr, val) atomic64_xchg(container_of((long long*)(ptr),\ atomic64_t, \ counter), (val))