From patchwork Thu Mar 8 04:58:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130950 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6103706lja; Wed, 7 Mar 2018 22:34:33 -0800 (PST) X-Google-Smtp-Source: AG47ELugs0db7TccSX0osX6Ki7LFEz6Ru9GDYgDMSmpeOEavDn6JLVPzZ5WhsCGomx6EXQzetsl/ X-Received: by 2002:a17:902:9a45:: with SMTP id x5-v6mr13240921plv.18.1520490872939; Wed, 07 Mar 2018 22:34:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520490872; cv=none; d=google.com; s=arc-20160816; b=SJv/K7R4EjKeHwPAkFv2yROaL/01VNJUd62NInvRdaKoOHebM9XNlAiJyJTwCdm+Ar CZ8miZs/gAM9i2AxcYLi4t4aLi/zt2q8vDaQCWbfX6aJUSmItixCMFXTJPVKpRM3mit+ oF5ANhH22QB3oSdzzJTfaP9tcLCrrdJydQLcMZY1QfmohwS3GrMH+xbbihirPMFIsG2U zLv5/YD4+ftJPC8xTja94y5eAGX0HrNjAYGmeAcp1+9HaFwxfMYrS9TYsVNLbNBhm5ZW PCkaatbWIi+Rm7/FQ3ksUDv6hUQBpFoQ8HN151YA81R2q8fG2X4t1js+WwJl8xMjWOf/ 1ptQ== 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=UeNFVzNLnGAZT8iKZ99wlrgkFPz9MTFU/KtoJSv8POs=; b=rVc8rdkdQX79SJIa1Q0MOyNIovj8RxXeHc0/gSbH9AWJy/ma90N6BRVTBH+Uy3lqTr So9Ra026BmIYsFw9OESuVOBXhb4vcwwfAH8l+2gIKhT6jJ8ovVeE3TxZuNFHrvCXGVpY T2mE0tFqq/+1GtG+NC2x1uSxLqowoGpqdXOMXl06LRmmOZiFhrh3puqfKBN+erYPksbx lLPH7Pw3GchleavqM3PomLt6HyrMlybrrbxH9dfxDcn5O3sjIfZ5N1aSQkxFV6X9Sxn8 FishC9lEgYYjXbpo6dv1vjUH+mib7H9azsDJjT4If9vmKEyQx/GSrvFBnymzFy9X5FKD 7hdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=k/4akz5h; 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 b13si15032370pfi.53.2018.03.07.22.34.32; Wed, 07 Mar 2018 22:34:32 -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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=k/4akz5h; 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 S1755512AbeCHGe3 (ORCPT + 28 others); Thu, 8 Mar 2018 01:34:29 -0500 Received: from mail-co1nam03on0137.outbound.protection.outlook.com ([104.47.40.137]:7440 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965513AbeCHE75 (ORCPT ); Wed, 7 Mar 2018 23:59:57 -0500 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=UeNFVzNLnGAZT8iKZ99wlrgkFPz9MTFU/KtoJSv8POs=; b=k/4akz5hNrVc+UmJ5WPKLQ7mT9KoQvdoYJaTqCtDiLTpa7O9d6xijqnPPBoqY+yZTdwJIQ3EzxOYOZWwFDbiC1j7BjWBRtoGyFjCi6C2nQm5DJFk0HdS9Hzuzr3ykqMVA1RARwPoDVDX8NdWUH7RxrP6CoaKidKvi7poNf2ufng= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0920.namprd21.prod.outlook.com (52.132.132.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.3; Thu, 8 Mar 2018 04:59:51 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 04:59:51 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: John Stultz , Wei Xu , Guodong Xu , Amit Pundir , Rob Herring , John Youn , Douglas Anderson , Chen Yu , Felipe Balbi , Greg Kroah-Hartman , "linux-usb@vger.kernel.org" , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 002/190] usb: dwc2: Make sure we disconnect the gadget state Thread-Topic: [PATCH AUTOSEL for 4.9 002/190] usb: dwc2: Make sure we disconnect the gadget state Thread-Index: AQHTtpokoLy+kagVSka7vFFKiMmORg== Date: Thu, 8 Mar 2018 04:58:47 +0000 Message-ID: <20180308045810.8041-2-alexander.levin@microsoft.com> References: <20180308045810.8041-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045810.8041-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; DM5PR2101MB0920; 7:J1O5R6pBAUR2LwBXsqlDUUoFByWY/fzkPHzAZ7Lgdg09k3UyH+2Nc4DYKjp28C88ZK4EKNFOODKVqC3PUv39snvQjCa+GZUY4UNjP7ZNcd+zs0+uHxvk59HGNGKOMLRl38b799Q5y17tH6umJoFFJMuiLRv2aYFbO1LPRYuek/jh2JQx75wsSP1f7Q4eqCEwTXQH+Pv59+GtIMy28eldXYEMjugWATE8WbxLPakDatuqjFA7LPzp4/KxFlb0TAuW; 20:TfsfLdx9vxIqgLIyd1KpNFhojnKN9inP2yRi9VsHTGNs/PH8JKQ8+Z9Cpu43xno9dS/jUTSZuJwA8wAm+ff60KkzGbZbYWSqyYDyxUAS0bZKAbPcYD3/cOkUubTJXnRSUx3s4uKKuJmvJXPscfyFTeo4+7zfnSJy6UAKggIx+qo= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: bb0b05f5-0e91-4718-4b69-08d584b16d05 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0920; x-ms-traffictypediagnostic: DM5PR2101MB0920: 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)(9452136761055)(50582790962513)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231220)(944501244)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB0920; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0920; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(396003)(39380400002)(346002)(366004)(376002)(189003)(199004)(81156014)(81166006)(5250100002)(8936002)(54906003)(2501003)(305945005)(8676002)(107886003)(110136005)(97736004)(99286004)(6436002)(36756003)(316002)(72206003)(76176011)(14454004)(6486002)(7736002)(478600001)(10290500003)(186003)(22452003)(59450400001)(68736007)(105586002)(2950100002)(106356001)(7416002)(102836004)(575784001)(26005)(6506007)(86362001)(3660700001)(5660300001)(2906002)(10090500001)(1076002)(25786009)(2900100001)(53936002)(4326008)(66066001)(6512007)(6666003)(6116002)(3280700002)(3846002)(86612001)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0920; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: vRcjc97Sv/1Js7Qz5CG3OF+0V6tLrwz8XPy3N8f0b2SYOI+dIJTu1Q+Xekim8WkWrqF/ottDxsJpEjRnK69InXQijYD3JeFMNOojvp1jYAUPLJpUwPrHJXWQQspAATRl6XFXwg++S6ruLdffUN/EXn7DUtO1rPsHJzxKlgiN+O4TLYve/ojE5W0V7GdSjXZvjW2XVvKu8Vw8n5JTEYDoECXruLrnfA8aXxo4u6jirH80CpaRVWS6mAVcHHAn215FSAuY0omvU0zuTndVJ/gfQHIarkjtuySzRCoBEjFHwKAdEDRzZVIGpMORraCqbxDJ/61V7O5JveExf3VVAYFEbw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb0b05f5-0e91-4718-4b69-08d584b16d05 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:58:47.2038 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0920 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Stultz [ Upstream commit dad3f793f20fbb5c0c342f0f5a0bdf69a4d76089 ] I had seen some odd behavior with HiKey's usb-gadget interface that I finally seemed to have chased down. Basically every other time I plugged in the OTG port, the gadget interface would properly initialize. The other times, I'd get a big WARN_ON in dwc2_hsotg_init_fifo() about the fifo_map not being clear. Ends up if we don't disconnect the gadget state, the fifo-map doesn't get cleared properly, which causes WARN_ON messages and also results in the device not properly being setup as a gadget every other time the OTG port is connected. So this patch adds a call to dwc2_hsotg_disconnect() in the reset path so the state is properly cleared. With it, the gadget interface initializes properly on every plug in. Cc: Wei Xu Cc: Guodong Xu Cc: Amit Pundir Cc: Rob Herring Cc: John Youn Cc: Douglas Anderson Cc: Chen Yu Cc: Felipe Balbi Cc: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org Acked-by: John Youn Signed-off-by: John Stultz Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/dwc2/hcd.c | 1 + 1 file changed, 1 insertion(+) -- 2.14.1 diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c index df5a06578005..dfc0566bb155 100644 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -3220,6 +3220,7 @@ static void dwc2_conn_id_status_change(struct work_struct *work) dwc2_core_init(hsotg, false); dwc2_enable_global_interrupts(hsotg); spin_lock_irqsave(&hsotg->lock, flags); + dwc2_hsotg_disconnect(hsotg); dwc2_hsotg_core_init_disconnected(hsotg, false); spin_unlock_irqrestore(&hsotg->lock, flags); dwc2_hsotg_core_connect(hsotg); From patchwork Thu Mar 8 04:58:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130949 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6103320lja; Wed, 7 Mar 2018 22:34:07 -0800 (PST) X-Google-Smtp-Source: AG47ELstfTMx3VE6j5S6Sq/89HkMX0oDcDQreRH4dvRXDnHF5V6Zk/hSBtQak+x4xgKK6mLxiQFc X-Received: by 2002:a17:902:7d94:: with SMTP id a20-v6mr23122310plm.184.1520490847379; Wed, 07 Mar 2018 22:34:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520490847; cv=none; d=google.com; s=arc-20160816; b=07Ppq0n9Q/emojOsjfnM69O10TwhSBnyQSXduxmRP3YBtdGTrbjvNiJWZdGz5nLIjt nSLiMVLq/a1tOg42xF8Jh/wg+4420v1nqYJGslmZQGaVq0CbaP5STNqR0ks8T/kbjtLm 9ZZNTMFOwB4cRyMQviYJrw2T8/7Pv85oJ/CqVxfipVXWX7c3JvzcxjJwoRLfq7FKtbbG iiEqPPV64e2znMgHoiFMSxkZxTHwB70/QhNCZXu8zmfP2pW9+8jYXJRax6EglgDIe7NH MMj6NDRaLwW16nPyDsd0s2zmJozVdtPCsByb4ZYTGMidQfj9WxD/mpMwhSjojZZNV9Qq 0Ekg== 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=x9L7R/lzN+FtipQqr7oc2INxk/F9ikPjMGNXDR0U6hc=; b=QWbDyXJACV7gJpVvsAQsO4oGXHXWTswBHC6ULujKPG1tx71vaZ0mYk4P17nXDilC6x 9evWe/2jYkHU9X2D1CcG+sJj3sQzPLvL7rRkOe4JCgg+S8trYAC4nmBlMxvJ5587cgJc eGWashII2EhkaRm0UdMxH1PK7kkhnohU96BC1yJRNuFGVX88FVKMm0Hz9nW2HxYwDrdG ftCqqjbV51iOhYowsfTDTk0Z2Z5yGtlE5b2mZXeV27W2XsiPTRvjGgW1+HK99BKeACoK z+2GGDCE8S/LVjBi9T0t5WBB8mOkvpd77mYXnVtltfGNdPtXk24HAaNJpK0AXBvmUn/A +5Hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=crKMFcRj; 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 g8-v6si8556792plp.615.2018.03.07.22.34.07; Wed, 07 Mar 2018 22:34:07 -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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=crKMFcRj; 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 S1755471AbeCHGdv (ORCPT + 28 others); Thu, 8 Mar 2018 01:33:51 -0500 Received: from mail-bl2nam02on0092.outbound.protection.outlook.com ([104.47.38.92]:59552 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965532AbeCHE77 (ORCPT ); Wed, 7 Mar 2018 23:59:59 -0500 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=x9L7R/lzN+FtipQqr7oc2INxk/F9ikPjMGNXDR0U6hc=; b=crKMFcRjDbC1X+xt9ko0SX0jTvxsKMf9c4acmk8ke2GJPHeHjBn2VPDusY12eiwSwpeWIDlu8Xj3ouHcghBJOndH9tUo1FaZiMK2tZek0dy0MrlcvTiOXSaiEvYhWD/+ArxCwHPa6HnIXauwghVYeZRCLHbuCDYwzdjU6ZboZ18= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0920.namprd21.prod.outlook.com (52.132.132.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.3; Thu, 8 Mar 2018 04:59:53 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 04:59:53 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Mark Rutland , Will Deacon , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 006/190] drivers/perf: arm_pmu: handle no platform_device Thread-Topic: [PATCH AUTOSEL for 4.9 006/190] drivers/perf: arm_pmu: handle no platform_device Thread-Index: AQHTtpolizEVqqXCsUOq/0VMan29vg== Date: Thu, 8 Mar 2018 04:58:49 +0000 Message-ID: <20180308045810.8041-6-alexander.levin@microsoft.com> References: <20180308045810.8041-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045810.8041-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; DM5PR2101MB0920; 7:zTHHoAj3skFySz7Qk5E+UDzZPfYTlqZSIOVaLlfUh+lvBPex25E+qTPJ7FLY6zgLcS4oJ7jZpBitJSJcWgbIMkYQamtEoKyDy8GXoFDPCFELs5iGNjpEmpDpz7Xwa7mF3NTsan6mS2SQ71CIvBza/h8Zdg3P71r4EfNWPccsfEsK/NCEnXiIeoK0/X68aj6QC22Af2yOx7RDAsaPnyn+bHzGqWB9G1nvdIuzRlPqV7NKBdFV/NgSkgIaqGLy0XL9; 20:La9uqmvfrnK1hP2HA0TjhSzsZ8FIsNnjbQisCH41wT79Jgg5ltTu7YT2YwI/vK7YrJawMY1LPV1kFbZrtXFWWZYzotbhV5NloBHBJwvRjNdnYvsJEerT0IJmGYRas2NTcOaAFSKjgLbMdpm66fCY9k9t5zlx92lF99/xjymU5z0= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 8097ca71-b256-47e4-1b0c-08d584b16e32 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0920; x-ms-traffictypediagnostic: DM5PR2101MB0920: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231220)(944501244)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB0920; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0920; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(396003)(39380400002)(346002)(366004)(376002)(189003)(199004)(81156014)(81166006)(5250100002)(8936002)(54906003)(2501003)(305945005)(8676002)(107886003)(110136005)(97736004)(99286004)(6436002)(36756003)(316002)(72206003)(76176011)(14454004)(6486002)(7736002)(478600001)(10290500003)(186003)(22452003)(59450400001)(68736007)(105586002)(2950100002)(106356001)(102836004)(26005)(6506007)(86362001)(3660700001)(5660300001)(2906002)(10090500001)(1076002)(25786009)(2900100001)(53936002)(4326008)(66066001)(6512007)(6666003)(6116002)(3280700002)(3846002)(86612001)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0920; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: efnI4R5n9LYy5nC8KrTjlW7TDvO+7R2L6HQsYtBy78dkF3wcQd1Gk7MbC6VIuYowLX6d0RGuZHW8Fzu4QTFvVle7rCIKWKc990FlO8LLBunw1wXrxPoNgEVrsTEpfoXDylo2YR5nGggW4PgnQqzX1+RT7LRENUqH/HDF4IrCui+qkw4B/kRLlkcxcFYMqMrody3vLzaMCiIxoZA54bGH9YDngN1q0xbnD+q0i05ARcgIh4VJiRWpG4OWNwkJt9LP8hX/CW6eO5HSJZOfy4OdZTKKfmXmTTh2cvYlBBH7Hi1+Jduv/uz7U24wm1AtGRphGLg2EiNGCdE9HXoFFJ17ug== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8097ca71-b256-47e4-1b0c-08d584b16e32 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:58:49.0732 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0920 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Rutland [ Upstream commit 7654137071fa706e5c91f4f27bc2a5cd7e435a9b ] In armpmu_dispatch_irq() we look at arm_pmu::plat_device to acquire platdata, so that we can defer to platform-specific IRQ handling, required on some 32-bit parts. With the advent of ACPI we won't always have a platform_device, and so we must avoid trying to dereference fields from it. This patch fixes up armpmu_dispatch_irq() to avoid doing so, introducing a new armpmu_get_platdata() helper. Signed-off-by: Mark Rutland Tested-by: Jeremy Linton Cc: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/arm_pmu.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -- 2.14.1 diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index b37b57294566..af82edc7fa5c 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -322,10 +322,16 @@ validate_group(struct perf_event *event) return 0; } +static struct arm_pmu_platdata *armpmu_get_platdata(struct arm_pmu *armpmu) +{ + struct platform_device *pdev = armpmu->plat_device; + + return pdev ? dev_get_platdata(&pdev->dev) : NULL; +} + static irqreturn_t armpmu_dispatch_irq(int irq, void *dev) { struct arm_pmu *armpmu; - struct platform_device *plat_device; struct arm_pmu_platdata *plat; int ret; u64 start_clock, finish_clock; @@ -337,8 +343,8 @@ static irqreturn_t armpmu_dispatch_irq(int irq, void *dev) * dereference. */ armpmu = *(void **)dev; - plat_device = armpmu->plat_device; - plat = dev_get_platdata(&plat_device->dev); + + plat = armpmu_get_platdata(armpmu); start_clock = sched_clock(); if (plat && plat->handle_irq) From patchwork Thu Mar 8 04:59:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130948 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6092446lja; Wed, 7 Mar 2018 22:20:03 -0800 (PST) X-Google-Smtp-Source: AG47ELtGt8qKrFik7Iy15yfQ/htZkN9j5mIWCeKlJdud8xJZlU7fbYYaMuSVV5nezlprBzCeZSlK X-Received: by 2002:a17:902:12e:: with SMTP id 43-v6mr22933025plb.77.1520490003677; Wed, 07 Mar 2018 22:20:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520490003; cv=none; d=google.com; s=arc-20160816; b=XDPvZ2PdIikKGZhFzP1uQdYRT+PuWu2CucYgdYwb6uGO4IAP/7h/YYeG6Z+HEJjpah FXr+oxOtSkZyQA7bSsGYyga1i+sxu+/3pBjKqmJXXD1QxDNG90yIHgLdR/5QfMi3RfMl K4FCR3SPNhaj4/2cgNC5GHD7HLGTwwas/qJ5VSfexizEYP0GJLTpDWRLg4l8onz7yTms 7dG9t9hVj93yklxPtl5sjbudkK1ql5oeb0RbReohchafPFmVyRN0gUb6RjRwixoqJn6h qlCRuOHaWD6IpBOTBuBHCdW68VtJgXXjaigVZzM9Q/UEXhTx7fhRezT1UD1+keDdrT4r iBUw== 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=+2YX6yFOoaakHaG+m17uY8q07e/c/pw58IHrjW5R5ig=; b=vlBSeM2YJu07jKoBXaQ2lVj9+jPEVvwlbCLY69KcBVN4vGqUaasG5kdyl7ZRfKeYR+ jGqDaQ9xhK3gTVZxKeBihPTlpkFkH9EUDbLsykl3PxGfA6bdKkNwqqewIzr0/RDt65WT CdVuHDizmS0XcILItPhIbXRrTupTSu5nqPc4+MOaAlyo0I02fpsISxLpjIRHdpv9KAur RcxiHfo2ng/yxdpwoTxQJsyp6rIRAhOFUqM5J5n2THqTmPgEVRAGDqwBaN1ATr4Yjl63 gskcNUVcXomocim+sRP+cLsym2TgKrYqdRxMIxKokJEzjyj/F/t0Bko/7nOJBAc9QIvo UfDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=SwSWc7fe; 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 j5si15164533pfe.334.2018.03.07.22.20.03; Wed, 07 Mar 2018 22:20:03 -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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=SwSWc7fe; 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 S965791AbeCHGT6 (ORCPT + 28 others); Thu, 8 Mar 2018 01:19:58 -0500 Received: from mail-sn1nam01on0095.outbound.protection.outlook.com ([104.47.32.95]:45505 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935421AbeCHFA6 (ORCPT ); Thu, 8 Mar 2018 00:00:58 -0500 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=+2YX6yFOoaakHaG+m17uY8q07e/c/pw58IHrjW5R5ig=; b=SwSWc7fe8nYF7CqL161AXPyJJd57Digu8Yn5dgISOKquxAo0LW/CMruhMm5w6+MUol4ZtBdsgqvmO4f5t38jC6pIjVJmJF09aidG4ik7xdoFgPWMw1sFfccbsbMiT98k175nV9uxSTIevuN2ONNtBWby3zzWBiwNXxaTxuzeL7s= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1109.namprd21.prod.outlook.com (52.132.130.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.3; Thu, 8 Mar 2018 05:00:46 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 05:00:46 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Suman Anna , Joerg Roedel , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 055/190] iommu/omap: Register driver before setting IOMMU ops Thread-Topic: [PATCH AUTOSEL for 4.9 055/190] iommu/omap: Register driver before setting IOMMU ops Thread-Index: AQHTtpo1BMgL04AufEOFsoBl6y3hUg== Date: Thu, 8 Mar 2018 04:59:16 +0000 Message-ID: <20180308045810.8041-55-alexander.levin@microsoft.com> References: <20180308045810.8041-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045810.8041-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; DM5PR2101MB1109; 7:x0ajnLz2Urj5iHq5Q7eGcsVKjPzIRMzBIZD42NMbgmZ72NShA57f9bdDwLv3mT6p7aTNc+Etq9xqpJmwkmhNfrxCHUZRToZvh3d1MWIHu1yN6e5G8r+JDzdZbCWdsgCN4cKBeSs7AZnQMWbavhmyY6oGNFy+LJRkorxWwRLDvZ+P14634WIj+HDmVCTRhxkCuPmNQH5EH+4XS1Pr/uGQR2QbJNMgroLpEE267NmOCRhoINVK39hzbYBM3l/XUBpk; 20:GCknoPtUIbNYAvsblRbssiXOpFk7fUQlmDSlyzWOIyd3iNbkcZPnPDlfoyg2GjwSoTY4cSTkDTOA26nYfi555s84dJeHuqApj1SXNQKotXSzciE/rLSms3xqML7eFAydP3TT9Sm6LnDdouLg78BvXarS2+1DbFbvTMr8fKXdET4= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 35f886ef-0378-414b-a7ab-08d584b18e05 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1109; x-ms-traffictypediagnostic: DM5PR2101MB1109: 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)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501244)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB1109; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1109; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(376002)(346002)(39380400002)(39860400002)(366004)(199004)(189003)(3660700001)(5250100002)(102836004)(6436002)(2501003)(81166006)(8936002)(6486002)(81156014)(53936002)(6512007)(8676002)(6506007)(5660300001)(86612001)(76176011)(10290500003)(86362001)(4326008)(105586002)(25786009)(10090500001)(26005)(2900100001)(316002)(106356001)(97736004)(54906003)(305945005)(7736002)(186003)(36756003)(22452003)(110136005)(14454004)(72206003)(6116002)(3846002)(68736007)(3280700002)(66066001)(2906002)(2950100002)(478600001)(6666003)(99286004)(1076002)(107886003)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1109; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: UKNjy4AR7cieWKv1d/zsaZYtBATHk9ZmsJ6og5bVv2jHf7aWKLsxG5YExBZOYVKBQwGnT2NyFC65hmneZ3oKmfzd92hEEyk9ViSHptXgum0t1jhzyDgLZ4lDhjQxSXMRthyoztfzwfwQ4Nt9ScxSm5gF0ktThx1+d1zF//vCIy3d7Xnh5bG7TsP2lncH7HhO1SOQX7HuQOy29UkHB3SAX5Keimqjv1Si5BJWfMCeNqMAjeBKPaEmBeC8/gWH1DK1z0PZIwWWcKcRDv4lIzYEsBlyHDj5y3apUwIgj5ec7U8GNAUbd8y4dJ2GIor6bXogvFZcXWPFrjX5jQkMHHqwSQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35f886ef-0378-414b-a7ab-08d584b18e05 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:59:16.2064 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1109 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suman Anna [ Upstream commit abaa7e5b054aae567861628b74dbc7fbf8ed79e8 ] Move the registration of the OMAP IOMMU platform driver before setting the IOMMU callbacks on the platform bus. This causes the IOMMU devices to be probed first before the .add_device() callback is invoked for all registered devices, and allows the iommu_group support to be added to the OMAP IOMMU driver. While at this, also check for the return status from bus_set_iommu. Signed-off-by: Suman Anna Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/omap-iommu.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) -- 2.14.1 diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index e2583cce2cc1..54556713c8d1 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -1299,6 +1299,7 @@ static int __init omap_iommu_init(void) const unsigned long flags = SLAB_HWCACHE_ALIGN; size_t align = 1 << 10; /* L2 pagetable alignement */ struct device_node *np; + int ret; np = of_find_matching_node(NULL, omap_iommu_of_match); if (!np) @@ -1312,11 +1313,25 @@ static int __init omap_iommu_init(void) return -ENOMEM; iopte_cachep = p; - bus_set_iommu(&platform_bus_type, &omap_iommu_ops); - omap_iommu_debugfs_init(); - return platform_driver_register(&omap_iommu_driver); + ret = platform_driver_register(&omap_iommu_driver); + if (ret) { + pr_err("%s: failed to register driver\n", __func__); + goto fail_driver; + } + + ret = bus_set_iommu(&platform_bus_type, &omap_iommu_ops); + if (ret) + goto fail_bus; + + return 0; + +fail_bus: + platform_driver_unregister(&omap_iommu_driver); +fail_driver: + kmem_cache_destroy(iopte_cachep); + return ret; } subsys_initcall(omap_iommu_init); /* must be ready before omap3isp is probed */ From patchwork Thu Mar 8 04:59:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130947 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6080880lja; Wed, 7 Mar 2018 22:06:15 -0800 (PST) X-Google-Smtp-Source: AG47ELt9igQuBhFrvYznnGCgE8XytQVtbiv1eHHg30/cDSFo/ycjT6XcrYNmF5B7ppWmpFHAwopc X-Received: by 2002:a17:902:14e:: with SMTP id 72-v6mr23187146plb.280.1520489175055; Wed, 07 Mar 2018 22:06:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520489175; cv=none; d=google.com; s=arc-20160816; b=ffhaw0fq2wPKKi+m/zAT9QqSySZlvAEoOv+dFldcinLWrNi7k35rV49qvQ6XRHIZS8 kfUgIj5OBRpDp0wpvVvMKAbVVtFivlLV51OAjBAXULGqpakUDVOtyvCy0eCYxeW71ylL 4bMnEETytIMWxhH+jhhlYuNyIKCB1rMq/O45riq447dZERUbMEvs8bnO8ApvaV9SFtYO JflcL1fsmVmCzGAZsMwT7Ts1lJIfdrlZRRyynsMsceHGGd7E5Qt6kJRETGQxmZTw/JiO wwHUzKqRtpMFNvoglh7G4vAoMak3Rc+rRKH7FcgcbPQI4ZltyxSVR6RgyjVo3USGJcc3 iR7Q== 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 :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=AsnLLMMAAJ2LALJIl6ONIg9MpW25rnCw9O9nWT9ShN4=; b=DNeoqUf83gsL5f/w5R8YE7kG/JMF1Dw6WWhx1Hi9Q+beoYwa5wTEg1kJRyHbdIskFx vBWfNaRJ8/orGZ3eE0pWoeudpaO0J0ZY1C4pdDW/qPyd5gZkOidgH9DkgPyrvBz1zC08 iCL+oHNayhC0E9ugqCKJQYi3V0fc+VQx0LBoNptk4bRUk45C1f2sxEHH3Igna3aIwxlA q3SbGAP5K1v65OdHIJGlaCRNL4XwDEuSvDj1zuWA5LYMoC09tmCfv9vENErNUsc1Y7EU vvtAiVZPU9z+5EBKXRtuuooOxpvRCYhyM0f0kNtSYtPn3Q2DOrTbxB7hs7qc4TmgBrty ddMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=OUEnEhgo; 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 v20si12627397pgc.137.2018.03.07.22.06.14; Wed, 07 Mar 2018 22:06:15 -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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=OUEnEhgo; 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 S935547AbeCHGF5 (ORCPT + 28 others); Thu, 8 Mar 2018 01:05:57 -0500 Received: from mail-by2nam03hn0237.outbound.protection.outlook.com ([104.47.42.237]:45201 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965828AbeCHFCS (ORCPT ); Thu, 8 Mar 2018 00:02:18 -0500 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=AsnLLMMAAJ2LALJIl6ONIg9MpW25rnCw9O9nWT9ShN4=; b=OUEnEhgoKjJ1jZVsFjqsYFliXc14Ag4pxPQPVVe6qAXwRRiu2KN0p49iteK19d1RJAk5rav2FVFjD727GF8auj4kolJ6qln0miBi6kpFKMFZ5+w+RBVE8lfl81OgDxtPWvZ5pznaCoMb+YNabtZX0PCPTomJfBa/9VnLjx+Nrdk= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0997.namprd21.prod.outlook.com (52.132.133.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.7; Thu, 8 Mar 2018 05:02:16 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 05:02:15 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Kishon Vijay Abraham I , Bjorn Helgaas , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 111/190] ARM: DRA7: clockdomain: Change the CLKTRCTRL of CM_PCIE_CLKSTCTRL to SW_WKUP Thread-Topic: [PATCH AUTOSEL for 4.9 111/190] ARM: DRA7: clockdomain: Change the CLKTRCTRL of CM_PCIE_CLKSTCTRL to SW_WKUP Thread-Index: AQHTtppEYDzD7KyG40yBwQfQAY5T+Q== Date: Thu, 8 Mar 2018 04:59:40 +0000 Message-ID: <20180308045810.8041-111-alexander.levin@microsoft.com> References: <20180308045810.8041-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045810.8041-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; DM5PR2101MB0997; 7:57QNsdslNw0cGjQaBD2hELAgEnfRFuLWOvuqvjTfEUPlVnNC2istbtwnndl7q5XiZgxn/9AqSRGYRI5qaoBLMThLQ94VWp9FznGWLRS5ihAN3Z0vbaMMG+vpTgtCNaR9PEf3UbDwxMg3hffEBfiuYEQyKD2bKW5L8rRl62RuPkRoUbM5w38HiQmWKkYwtOTmObwM6wJWSQNVNaZRgg6aPjkh+EoWXRtltQ0MtYvPFqrjiAWkTtej7TxIB6R7xfLE; 20:PL8tar37q3HxSNt/0T/nDyXoSFSc6UF+iZmmTC5nxdxlJV8vqDjOgsCACh9JlUn2m8zfX+7+Ao4FP8+m49/3jB6TzOgUsLZd8TCZaydLMrPzJH9bIBg06phZSLZeIi2dEJZQDJXVn8jIW8ie9z9Hltr7ms4DGP+aUA2rMEqNkdA= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: c69f0322-ba22-4190-eda3-08d584b1c317 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0997; x-ms-traffictypediagnostic: DM5PR2101MB0997: 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)(211936372134217)(153496737603132); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231220)(944501244)(52105095)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB0997; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0997; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:SPM; SFS:(10019020)(396003)(39380400002)(39860400002)(376002)(366004)(346002)(189003)(199004)(97736004)(54906003)(76176011)(2900100001)(106356001)(99286004)(110136005)(316002)(3280700002)(22452003)(10290500003)(105586002)(36756003)(25786009)(72206003)(66066001)(3846002)(6116002)(3660700001)(4326008)(14454004)(1076002)(478600001)(2906002)(10090500001)(5250100002)(6486002)(86362001)(5660300001)(186003)(305945005)(8936002)(81166006)(2501003)(26005)(2950100002)(107886003)(81156014)(6512007)(86612001)(6666003)(8676002)(102836004)(6506007)(53936002)(59450400001)(68736007)(7736002)(6436002)(22906009)(121003001)(133343001)(217873001); DIR:OUT; SFP:1501; SCL:5; SRVR:DM5PR2101MB0997; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: w14kWnyrppQEuBvedCekL+h6CeCWiap1B+w2Tg6D4DhEA86NZsIv4fmfVB3bMP4R3xlIx/g2U26TdRlpzPNE2R6CG+8P+GT6xklZaRAVmDmVJ6vLBIrDVluCEud1ykdXCMMy6cb7do3+WBBbtgwfB/+7xOazG3yhbuF4rmumkDFWV8u+vaOaz+7OsotMuvpvXNX0mNnu267zyDqX+gX0Hyt4ZFsfQIyQDzUzMU9LO8DkzZPKlmi8Wr16xcZBNIachanEqBQ4LP07IFpfn0Tm5s4gM9icekSNRAW7eTf92+AGUqUJgAMqhk0Szu+n1paVTkG7TUFbZrpv4oDt1usTFvqzAAyupdwdOAncQleKPFP4MzlgX4JIpEI+cH35VnHWalgQmAFBS7k5gTbsykHCIw== spamdiagnosticoutput: 1:22 MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: c69f0322-ba22-4190-eda3-08d584b1c317 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:59:40.8128 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0997 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kishon Vijay Abraham I [ Upstream commit 2c949ce38f4e81d7487f165fa3b8f77d74a2a6c4 ] The PCIe programming sequence in TRM suggests CLKSTCTRL of PCIe should be set to SW_WKUP. There are no issues when CLKSTCTRL is set to HW_AUTO in RC mode. However in EP mode, the host system is not able to access the MEMSPACE and setting the CLKSTCTRL to SW_WKUP fixes it. Acked-by: Tony Lindgren Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- arch/arm/mach-omap2/clockdomains7xx_data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.1 diff --git a/arch/arm/mach-omap2/clockdomains7xx_data.c b/arch/arm/mach-omap2/clockdomains7xx_data.c index ef9ed36e8a61..e3416b40e82b 100644 --- a/arch/arm/mach-omap2/clockdomains7xx_data.c +++ b/arch/arm/mach-omap2/clockdomains7xx_data.c @@ -524,7 +524,7 @@ static struct clockdomain pcie_7xx_clkdm = { .dep_bit = DRA7XX_PCIE_STATDEP_SHIFT, .wkdep_srcs = pcie_wkup_sleep_deps, .sleepdep_srcs = pcie_wkup_sleep_deps, - .flags = CLKDM_CAN_HWSUP_SWSUP, + .flags = CLKDM_CAN_SWSUP, }; static struct clockdomain atl_7xx_clkdm = { From patchwork Thu Mar 8 05:00:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130942 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6066551lja; Wed, 7 Mar 2018 21:48:27 -0800 (PST) X-Google-Smtp-Source: AG47ELsgBiqaKak94orQl1fXR6nXeFwLxxd2b6A0vgtVTN2TsqfutMFeD7+QvOEd378+5YuF5WBl X-Received: by 2002:a17:902:225:: with SMTP id 34-v6mr22991853plc.415.1520488107764; Wed, 07 Mar 2018 21:48:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520488107; cv=none; d=google.com; s=arc-20160816; b=aT7c49bDBm4qV39CvUsx+piWxBUEp6ncnY8DdrZeuNLV5ZFwpNROLG8RVySDsbtSOr EyyBjP4JwXV3HzTgEeKN25aCnYa5jaTEawBeDAR7f21uoT3mm3uKC1+JOXLJVLxem+0x DUNVOEQBtAi9Aw4heVF3eRR8qhXIRMaEKmtpX+t9IyXDreXaME0d/ou06bCl2U6dereZ V/FtOIYcyA+r09FoGCUo3MBaALMLmXLZYIW0OCX+TKvHsEYFSNI61uejqL5vfj87t3No Dg/41ZT7vmg3+iF/bToZ9GMpIiabyAcsFJXQroM9n/wOT3/vuy3wat2KAAl98LwqLMLF Dubw== 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=qPU3X4xl0m9xwv8s7C4s2kcYSIDUVwWAlPLVGcSXYD4=; b=vyRA6//Q0C6bIRGNhZ76QVDnwhp482X2UtxRqUamebntBOJhPVOP0frMbEkAMaITxB 2fSny5+2Gh0l9qaK1RpkQnJx/J4sO9sxSV3vQB4MUVgw/xmC5gM7UWiQb6R6jgE4W2dD 6RWbJ+CwTu8NsFU1UqIhvXO5hlGbrBpuGTYkFoK6FJoOiQoRixErVB2cYk5sCvLPzy0l OliQbvv8o+8n3NArZ5nWFZHsuMCIGwjZLiCsWHWV3phSoVHCYC4rPNHSIN27lVWN7y2w fdcpiV+O7cJaLCRQXV8I+3Vc11MhPb8yH1ZjoZe0Ec0Hs4WO8vT5Ixa4gVHJp7Su9WY5 3VeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=fwJO6fUL; 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 e2si7008876pgq.596.2018.03.07.21.48.27; Wed, 07 Mar 2018 21:48:27 -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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=fwJO6fUL; 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 S966714AbeCHFsX (ORCPT + 28 others); Thu, 8 Mar 2018 00:48:23 -0500 Received: from mail-by2nam03on0127.outbound.protection.outlook.com ([104.47.42.127]:45712 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935573AbeCHFFD (ORCPT ); Thu, 8 Mar 2018 00:05:03 -0500 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=qPU3X4xl0m9xwv8s7C4s2kcYSIDUVwWAlPLVGcSXYD4=; b=fwJO6fUL4QXFyJsQ4eW66CddDcl+yGI43FRohBNVHOFnpq6nxF4YI5Gc3pt0nZDMPUTXJ2npV0CVKdYZsSSnoyzk0KJzM7C13dcxz+obbi885o88oz5TEO7j+mtCxzx13KlOmGzuKttl9padzM1qCV9AJZcBz6QqZh2jfpnexHE= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0981.namprd21.prod.outlook.com (52.132.133.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.1; Thu, 8 Mar 2018 05:04:59 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 05:04:59 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Joel Stanley , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 185/190] ARM: dts: aspeed-evb: Add unit name to memory node Thread-Topic: [PATCH AUTOSEL for 4.9 185/190] ARM: dts: aspeed-evb: Add unit name to memory node Thread-Index: AQHTtppY3NI+smV+mkOn4XE58uprvg== Date: Thu, 8 Mar 2018 05:00:14 +0000 Message-ID: <20180308045810.8041-185-alexander.levin@microsoft.com> References: <20180308045810.8041-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045810.8041-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; DM5PR2101MB0981; 7:ra6Kd4cZNuBwamlZM93GcclYIiskeXZs3kZAhSmbo+FGaUOGCQ6iDLPvwUYkfEnIe+JAkDnDwfme7jCwlez/YhHCi42xX88b2djsKfljgyZZk1X4ouFrDKuMXfkv7zSIZUKVMsCb/4k7tI46eZ7rOrO8kn7rS7atVcnAp0i9ILzNZvjOd283kHopPDtiVi3DtIz68rLtx6bGpdc+ONWmuLDBlLQPDi1Qn/aAV7KZDDkhVhe+e1B+m9tzR1PoTCFU; 20:PiuaOUM+JjdXRpBk0TbCeUQ0fIWNAYPma63yZ0IW16NjkYuNvvvELDFb+al2AVQu/L7ZxBNVo/+MoMXPnJMM49Q7ee+qvbYlRv0qVkS+U7RPb8Irz15NyYNZoYQYvk34eGCy1bDMR3cx1Tdb949mCb5F/Sno1+1zMbhw+nlg5P0= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 48bd3877-763c-4720-d2af-08d584b224d3 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0981; x-ms-traffictypediagnostic: DM5PR2101MB0981: 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)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231220)(944501244)(52105095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB0981; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0981; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(39380400002)(396003)(366004)(346002)(376002)(199004)(189003)(305945005)(86612001)(2906002)(7736002)(6486002)(36756003)(54906003)(110136005)(6436002)(6666003)(2950100002)(10290500003)(316002)(186003)(22452003)(10090500001)(478600001)(105586002)(6512007)(53936002)(66066001)(68736007)(76176011)(102836004)(3280700002)(107886003)(25786009)(8936002)(59450400001)(106356001)(6506007)(5660300001)(3846002)(97736004)(14454004)(2501003)(26005)(5250100002)(4326008)(3660700001)(86362001)(575784001)(6116002)(81166006)(99286004)(72206003)(2900100001)(1076002)(8676002)(81156014)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0981; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 7a/Wv2srPi63JgWuEhsOjNLl/ntcdk9yUwBjs7i+Lp3IVupvN+iMlg1hzwKfAvv84gysruVCQiBv6Pr9tUFw46DGCbn0Bvx6RvbJqnb21uEwg5bZI6pXe8GSUJn81h6XJT1/N/NzCi+YfPpNhfs6BS/g3BdbIWEXoES/Kq/l6i2+f7vXVM2YUcUqvV7bxVpAw3E5f6SiSaTuC4PWfZkl1GOLcSSlZfqFRLsQ99EimXEZHGRtlB/UAquUlee90uIVcTjC1YxKhcVo4XHvvh/CQLYonO8JAI+kx+NJr9UoZdk02tmsdygZ3uVaSv3Q25RO2gHiij1JCowVdKCbuxeeFQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48bd3877-763c-4720-d2af-08d584b224d3 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 05:00:14.3645 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0981 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joel Stanley [ Upstream commit e40ed274489a5f516da120186578eb379b452ac6 ] Fixes a warning when building with W=1. All of the ASPEED device trees build without warnings now. Signed-off-by: Joel Stanley Signed-off-by: Sasha Levin --- arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts index 1b7a5ff0e533..d7774d35e466 100644 --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts @@ -15,7 +15,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory@80000000 { reg = <0x80000000 0x20000000>; }; };