From patchwork Tue Apr 4 19:32:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 96760 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp345333qgd; Tue, 4 Apr 2017 12:33:39 -0700 (PDT) X-Received: by 10.84.238.198 with SMTP id l6mr31399103pln.180.1491334419045; Tue, 04 Apr 2017 12:33:39 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p89si18339852pfa.239.2017.04.04.12.33.38; Tue, 04 Apr 2017 12:33:39 -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=@verizon.com; dkim=pass header.i=@verizon.com; dkim=pass header.i=@verizon.com; 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=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932122AbdDDTdi (ORCPT + 6 others); Tue, 4 Apr 2017 15:33:38 -0400 Received: from omzsmtpe02.verizonbusiness.com ([199.249.25.209]:7342 "EHLO omzsmtpe02.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932146AbdDDTdh (ORCPT ); Tue, 4 Apr 2017 15:33:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334417; x=1522870417; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=cB0ZN9pQociixxIqxNMMCY0GCy7zobCcBpQhbW1JxnU=; b=MyyqX4XXRM3WdaglKIiVMUIRVy9D41fCJrjfBpUNK/rdW9W+NwyyctiY ifhfLELmHi0jRvZpnWmaa6LESRX6Zl1GNokMchLgqE0wOtxDyt1FKUyc/ VlaH8ne6/5rhBS9lu8LcVHiXaOf+ZCcUQyx4jOlXEIpYuIgabJ2DmnIBG 4=; X-IronPort-Anti-Spam-Filtered: false Received: from unknown (HELO fldsmtpi03.verizon.com) ([166.68.71.145]) by omzsmtpe02.verizonbusiness.com with ESMTP; 04 Apr 2017 19:33:35 +0000 X-IronPort-AV: E=Sophos;i="5.36,275,1486425600"; d="scan'208";a="325501215" Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO apollo.verizonwireless.com) ([10.255.192.101]) by fldsmtpi03.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 19:33:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334387; x=1522870387; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=cB0ZN9pQociixxIqxNMMCY0GCy7zobCcBpQhbW1JxnU=; b=Fu5JK1B3XEYTODaS32cTW/lyjTjuVS4MDrLFurtnJw8tOuGvq7w85PfY IcJDVANwZf4Dw+hhM6n3CsATQxrXKykWdpjCcQVjejG27SbmflTaZK76C Z37oDS5PhsUn3TKgG+r0DXsm3BsnOGIoPxLgBq+1U6Fp7iVr27f9R8CFa 4=; Received: from discovery.odc.vzwcorp.com (HELO mercury.verizonwireless.com) ([10.255.240.25]) by apollo.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 15:33:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334387; x=1522870387; h=to:cc:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from; bh=cB0ZN9pQociixxIqxNMMCY0GCy7zobCcBpQhbW1JxnU=; b=QicNbMDiftmnNaRmRy2aI+48vdNEBV1N85fRJ3gCm5wwvPr77UbmSPuJ 0v2uIuGOgEQnbneBdN+bmIRgm/S9Ccun5E7qLoDtLHHd7hehLeMRgCWyi dNNH4kHgV8kfakPMwb8cijIXIX+c/JMZRNleKpASgIorSBVuLBO23MfSG k=; From: alexander.levin@verizon.com X-Host: discovery.odc.vzwcorp.com Received: from nyora1hub003.uswin.ad.vzwcorp.com ([10.170.34.218]) by mercury.verizonwireless.com with ESMTP/TLS/AES256-SHA; 04 Apr 2017 19:33:07 +0000 Received: from OMZP1LUMXCA16.uswin.ad.vzwcorp.com (144.8.22.194) by NYORA1HUB003.uswin.ad.vzwcorp.com (10.170.34.218) with Microsoft SMTP Server (TLS) id 8.3.406.0; Tue, 4 Apr 2017 15:33:07 -0400 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA16.uswin.ad.vzwcorp.com (144.8.22.194) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 4 Apr 2017 14:33:05 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1210.000; Tue, 4 Apr 2017 14:33:05 -0500 To: "gregkh@linuxfoundation.org" CC: "stable@vger.kernel.org" Subject: [PATCH for 4.9 52/98] usb: chipidea: msm: Rely on core to override AHBBURST Thread-Topic: [PATCH for 4.9 52/98] usb: chipidea: msm: Rely on core to override AHBBURST Thread-Index: AQHSrXoudlkGFfeH4kCn3vOoTbFqzA== Date: Tue, 4 Apr 2017 19:32:21 +0000 Message-ID: <20170404193158.19041-53-alexander.levin@verizon.com> References: <20170404193158.19041-1-alexander.levin@verizon.com> In-Reply-To: <20170404193158.19041-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stephen Boyd [ Upstream commit dd3749099cfa2c80039193c438b90f3160eaf7f9 ] The core framework already handles setting this parameter with a platform quirk. Add the appropriate flag so that we always set AHBBURST to 0. Technically DT should be doing this, but we always do it for msm chipidea devices so setting the flag in the driver works just as well. If the burst needs to be anything besides 0, we expect the 'ahb-burst-config' dts property to be present. Acked-by: Peter Chen Cc: Greg Kroah-Hartman Signed-off-by: Stephen Boyd Signed-off-by: Peter Chen Signed-off-by: Sasha Levin --- drivers/usb/chipidea/ci_hdrc_msm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.3 diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 3889809..37591a4 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -24,7 +24,6 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) switch (event) { case CI_HDRC_CONTROLLER_RESET_EVENT: dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n"); - writel(0, USB_AHBBURST); /* use AHB transactor, allow posted data writes */ writel(0x8, USB_AHBMODE); usb_phy_init(ci->usb_phy); @@ -47,7 +46,8 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { .name = "ci_hdrc_msm", .capoffset = DEF_CAPOFFSET, .flags = CI_HDRC_REGS_SHARED | - CI_HDRC_DISABLE_STREAMING, + CI_HDRC_DISABLE_STREAMING | + CI_HDRC_OVERRIDE_AHB_BURST, .notify_event = ci_hdrc_msm_notify_event, };