From patchwork Tue Apr 4 19:32:04 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: 96759 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp344993qgd; Tue, 4 Apr 2017 12:32:46 -0700 (PDT) X-Received: by 10.84.138.193 with SMTP id 59mr31127434plp.167.1491334366416; Tue, 04 Apr 2017 12:32:46 -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.32.46; Tue, 04 Apr 2017 12:32:46 -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 S1752949AbdDDTcp (ORCPT + 6 others); Tue, 4 Apr 2017 15:32:45 -0400 Received: from omzsmtpe03.verizonbusiness.com ([199.249.25.208]:19767 "EHLO omzsmtpe03.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753683AbdDDTcl (ORCPT ); Tue, 4 Apr 2017 15:32:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334361; x=1522870361; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=TLYkjprzh0vvA21TEzvOoUzszn9ecdhqjgtmTfAbglc=; b=VMOLaI5RZrNysLKnh4nYuh8WMKNZO2lHV8q62CBlDRo9yI/PI6Hj6DiB VMP88llWJURccUR+nL/yhUdAR6wkqkE/QAXFd5rYbwLIfkVOCjxiHEMjw n68CZxtPel2o+PobS09dEmDRtzi1p3G1noi/mK3UKPbaaa0NRdrNL35UP I=; X-IronPort-Anti-Spam-Filtered: false Received: from unknown (HELO fldsmtpi01.verizon.com) ([166.68.71.143]) by omzsmtpe03.verizonbusiness.com with ESMTP; 04 Apr 2017 19:32:37 +0000 X-IronPort-AV: E=Sophos;i="5.36,275,1486425600"; d="scan'208";a="182587261" Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO atlantis.verizonwireless.com) ([10.255.192.101]) by fldsmtpi01.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 19:32:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334328; x=1522870328; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=TLYkjprzh0vvA21TEzvOoUzszn9ecdhqjgtmTfAbglc=; b=O+loaSfxtoTmAxqvWHbrTepvw37KXwKym+vtM6tZnUtlp4SzvpMWEAnZ le5Wa4yJAzQKneAu0S9MVgvc519NNT4wJfvmd0HAZ1pbMQcnfdaima1L6 0+ODird3x2u+ZSeGV4J4n08VgIa+MR3jqhLR/hjjDW1CDRn1HG8uvRhaP E=; Received: from discovery.odc.vzwcorp.com (HELO mercury.verizonwireless.com) ([10.255.240.25]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 15:32:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334328; x=1522870328; h=to:cc:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from; bh=TLYkjprzh0vvA21TEzvOoUzszn9ecdhqjgtmTfAbglc=; b=VfXkIhjHfAgMiSQf2GxuARW/h7BbBXx2QtlwheB1nhtrRyoJbKwwTlUu T5QrwsXYtzs398/+7Axw4aOcvdx3g146opS+mQgV54P+tW2EJUjxATE5b NZSgP3gPkQ/VoVsQH/YSuvp0qPKbe2WFLDKvWvbWT5zGC6MuuI4VokTEQ s=; 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:32:08 +0000 Received: from OMZP1LUMXCA19.uswin.ad.vzwcorp.com (144.8.22.197) 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:32:07 -0400 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA19.uswin.ad.vzwcorp.com (144.8.22.197) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 4 Apr 2017 14:32:06 -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:32:06 -0500 To: "gregkh@linuxfoundation.org" CC: "stable@vger.kernel.org" Subject: [PATCH for 4.9 06/98] arm64: dts: hisi: fix hip06 sas am-max-trans quirk Thread-Topic: [PATCH for 4.9 06/98] arm64: dts: hisi: fix hip06 sas am-max-trans quirk Thread-Index: AQHSrXoj+3orM3fS8UmIPjLFHd56cA== Date: Tue, 4 Apr 2017 19:32:04 +0000 Message-ID: <20170404193158.19041-7-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: John Garry [ Upstream commit f65e786604b34d0b599b8c01ecca28be2d746290 ] The string for the am max transmissions quirk property is not correct -> fix it. Signed-off-by: John Garry Reviewed-by: Xiang Chen Signed-off-by: Wei Xu Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/hisilicon/hip06.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.3 diff --git a/arch/arm64/boot/dts/hisilicon/hip06.dtsi b/arch/arm64/boot/dts/hisilicon/hip06.dtsi index af45041..f2eb12c 100644 --- a/arch/arm64/boot/dts/hisilicon/hip06.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hip06.dtsi @@ -590,7 +590,7 @@ reg = <0 0xa2000000 0 0x10000>; sas-addr = [50 01 88 20 16 00 00 00]; hisilicon,sas-syscon = <&pcie_subctl>; - am-max-trans; + hip06-sas-v2-quirk-amt; ctrl-reset-reg = <0xa18>; ctrl-reset-sts-reg = <0x5a0c>; ctrl-clock-ena-reg = <0x318>; 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, }; From patchwork Tue Apr 4 19:32:31 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: 96762 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp345490qgd; Tue, 4 Apr 2017 12:34:07 -0700 (PDT) X-Received: by 10.99.209.85 with SMTP id c21mr25705037pgj.147.1491334446934; Tue, 04 Apr 2017 12:34:06 -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.34.06; Tue, 04 Apr 2017 12:34:06 -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 S932237AbdDDTeG (ORCPT + 6 others); Tue, 4 Apr 2017 15:34:06 -0400 Received: from omzsmtpe02.verizonbusiness.com ([199.249.25.209]:5250 "EHLO omzsmtpe02.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932227AbdDDTeF (ORCPT ); Tue, 4 Apr 2017 15:34:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334444; x=1522870444; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=iElmIqTIgwpMF9Gwe8LCgUO7r3tzSc7bFONLtwlQJlw=; b=jqdRfjLX1A9by+FbokmEN9MByr9c+NxttO3v4PpMWbulC2IyLJy/idqO ITfN3IgoO5ClKvQawI9jhTcHC4/bHhupzM58WtMVUHxaSMFO7szlb79VC aRIyLcgm1m6jt2CJwo+MQp6l/rre5caKvUJ1G5+ujLTPTOKYun31kN8CX M=; 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:34:04 +0000 X-IronPort-AV: E=Sophos;i="5.36,275,1486425600"; d="scan'208";a="325501745" Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO atlantis.verizonwireless.com) ([10.255.192.101]) by fldsmtpi03.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 19:34:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334444; x=1522870444; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=iElmIqTIgwpMF9Gwe8LCgUO7r3tzSc7bFONLtwlQJlw=; b=jqdRfjLX1A9by+FbokmEN9MByr9c+NxttO3v4PpMWbulC2IyLJy/idqO ITfN3IgoO5ClKvQawI9jhTcHC4/bHhupzM58WtMVUHxaSMFO7szlb79VC aRIyLcgm1m6jt2CJwo+MQp6l/rre5caKvUJ1G5+ujLTPTOKYun31kN8CX M=; Received: from viking.odc.vzwcorp.com (HELO mercury.verizonwireless.com) ([10.255.240.26]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 15:34:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334443; x=1522870443; h=to:cc:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from; bh=iElmIqTIgwpMF9Gwe8LCgUO7r3tzSc7bFONLtwlQJlw=; b=W316syLIJjfe58GCqmDQTOGJf4fTSah0Lv7aRU44qkDhrpNWw+PthJ2t slryxrUdkq5zWH7tgmIzdWcoowcMTYPYuBxpO198wFIBoB8EBJjTUqQkE X/DoTZR+OETmfCPKmgcqPrA35yjrqqmJyrsphuguk/eTfGhQ07QplBQuW c=; From: alexander.levin@verizon.com X-Host: viking.odc.vzwcorp.com Received: from nyora1hub002.uswin.ad.vzwcorp.com ([10.170.34.217]) by mercury.verizonwireless.com with ESMTP/TLS/AES256-SHA; 04 Apr 2017 19:33:56 +0000 Received: from OMZP1LUMXCA19.uswin.ad.vzwcorp.com (144.8.22.197) by NYORA1HUB002.uswin.ad.vzwcorp.com (10.170.34.217) with Microsoft SMTP Server (TLS) id 8.3.406.0; Tue, 4 Apr 2017 15:33:54 -0400 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA19.uswin.ad.vzwcorp.com (144.8.22.197) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 4 Apr 2017 14:33:53 -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:53 -0500 To: "gregkh@linuxfoundation.org" CC: "stable@vger.kernel.org" Subject: [PATCH for 4.9 78/98] arm: kernel: Add SMC structure parameter Thread-Topic: [PATCH for 4.9 78/98] arm: kernel: Add SMC structure parameter Thread-Index: AQHSrXoz8unuIEnz6Um1Nfkk+ujGZQ== Date: Tue, 4 Apr 2017 19:32:31 +0000 Message-ID: <20170404193158.19041-79-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: Andy Gross [ Upstream commit 680a0873e193bae666439f4b5e32c758e68f114c ] This patch adds a quirk parameter to the arm_smccc_(smc/hvc) calls. The quirk structure allows for specialized SMC operations due to SoC specific requirements. The current arm_smccc_(smc/hvc) is renamed and macros are used instead to specify the standard arm_smccc_(smc/hvc) or the arm_smccc_(smc/hvc)_quirk function. This patch and partial implementation was suggested by Will Deacon. Signed-off-by: Andy Gross Reviewed-by: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm/kernel/armksyms.c | 4 ++-- arch/arm/kernel/smccc-call.S | 14 ++++++++------ arch/arm64/kernel/arm64ksyms.c | 4 ++-- arch/arm64/kernel/asm-offsets.c | 7 +++++-- arch/arm64/kernel/smccc-call.S | 14 ++++++++------ include/linux/arm-smccc.h | 40 ++++++++++++++++++++++++++++++++-------- 6 files changed, 57 insertions(+), 26 deletions(-) -- 2.9.3 diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index 7e45f69..8e8d20c 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c @@ -178,6 +178,6 @@ EXPORT_SYMBOL(__pv_offset); #endif #ifdef CONFIG_HAVE_ARM_SMCCC -EXPORT_SYMBOL(arm_smccc_smc); -EXPORT_SYMBOL(arm_smccc_hvc); +EXPORT_SYMBOL(__arm_smccc_smc); +EXPORT_SYMBOL(__arm_smccc_hvc); #endif diff --git a/arch/arm/kernel/smccc-call.S b/arch/arm/kernel/smccc-call.S index 2e48b67..e5d4306 100644 --- a/arch/arm/kernel/smccc-call.S +++ b/arch/arm/kernel/smccc-call.S @@ -46,17 +46,19 @@ UNWIND( .fnend) /* * void smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2, * unsigned long a3, unsigned long a4, unsigned long a5, - * unsigned long a6, unsigned long a7, struct arm_smccc_res *res) + * unsigned long a6, unsigned long a7, struct arm_smccc_res *res, + * struct arm_smccc_quirk *quirk) */ -ENTRY(arm_smccc_smc) +ENTRY(__arm_smccc_smc) SMCCC SMCCC_SMC -ENDPROC(arm_smccc_smc) +ENDPROC(__arm_smccc_smc) /* * void smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2, * unsigned long a3, unsigned long a4, unsigned long a5, - * unsigned long a6, unsigned long a7, struct arm_smccc_res *res) + * unsigned long a6, unsigned long a7, struct arm_smccc_res *res, + * struct arm_smccc_quirk *quirk) */ -ENTRY(arm_smccc_hvc) +ENTRY(__arm_smccc_hvc) SMCCC SMCCC_HVC -ENDPROC(arm_smccc_hvc) +ENDPROC(__arm_smccc_hvc) diff --git a/arch/arm64/kernel/arm64ksyms.c b/arch/arm64/kernel/arm64ksyms.c index 78f3680..e9c4dc9 100644 --- a/arch/arm64/kernel/arm64ksyms.c +++ b/arch/arm64/kernel/arm64ksyms.c @@ -73,5 +73,5 @@ NOKPROBE_SYMBOL(_mcount); #endif /* arm-smccc */ -EXPORT_SYMBOL(arm_smccc_smc); -EXPORT_SYMBOL(arm_smccc_hvc); +EXPORT_SYMBOL(__arm_smccc_smc); +EXPORT_SYMBOL(__arm_smccc_hvc); diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index 4a2f0f0..c58ddf8 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -140,8 +140,11 @@ int main(void) DEFINE(SLEEP_STACK_DATA_SYSTEM_REGS, offsetof(struct sleep_stack_data, system_regs)); DEFINE(SLEEP_STACK_DATA_CALLEE_REGS, offsetof(struct sleep_stack_data, callee_saved_regs)); #endif - DEFINE(ARM_SMCCC_RES_X0_OFFS, offsetof(struct arm_smccc_res, a0)); - DEFINE(ARM_SMCCC_RES_X2_OFFS, offsetof(struct arm_smccc_res, a2)); + DEFINE(ARM_SMCCC_RES_X0_OFFS, offsetof(struct arm_smccc_res, a0)); + DEFINE(ARM_SMCCC_RES_X2_OFFS, offsetof(struct arm_smccc_res, a2)); + DEFINE(ARM_SMCCC_QUIRK_ID_OFFS, offsetof(struct arm_smccc_quirk, id)); + DEFINE(ARM_SMCCC_QUIRK_STATE_OFFS, offsetof(struct arm_smccc_quirk, state)); + BLANK(); DEFINE(HIBERN_PBE_ORIG, offsetof(struct pbe, orig_address)); DEFINE(HIBERN_PBE_ADDR, offsetof(struct pbe, address)); diff --git a/arch/arm64/kernel/smccc-call.S b/arch/arm64/kernel/smccc-call.S index ae0496f..ba60a8c 100644 --- a/arch/arm64/kernel/smccc-call.S +++ b/arch/arm64/kernel/smccc-call.S @@ -27,17 +27,19 @@ /* * void arm_smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2, * unsigned long a3, unsigned long a4, unsigned long a5, - * unsigned long a6, unsigned long a7, struct arm_smccc_res *res) + * unsigned long a6, unsigned long a7, struct arm_smccc_res *res, + * struct arm_smccc_quirk *quirk) */ -ENTRY(arm_smccc_smc) +ENTRY(__arm_smccc_smc) SMCCC smc -ENDPROC(arm_smccc_smc) +ENDPROC(__arm_smccc_smc) /* * void arm_smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2, * unsigned long a3, unsigned long a4, unsigned long a5, - * unsigned long a6, unsigned long a7, struct arm_smccc_res *res) + * unsigned long a6, unsigned long a7, struct arm_smccc_res *res, + * struct arm_smccc_quirk *quirk) */ -ENTRY(arm_smccc_hvc) +ENTRY(__arm_smccc_hvc) SMCCC hvc -ENDPROC(arm_smccc_hvc) +ENDPROC(__arm_smccc_hvc) diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index b5abfda..c66f8ae 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -72,33 +72,57 @@ struct arm_smccc_res { }; /** - * arm_smccc_smc() - make SMC calls + * struct arm_smccc_quirk - Contains quirk information + * @id: quirk identification + * @state: quirk specific information + * @a6: Qualcomm quirk entry for returning post-smc call contents of a6 + */ +struct arm_smccc_quirk { + int id; + union { + unsigned long a6; + } state; +}; + +/** + * __arm_smccc_smc() - make SMC calls * @a0-a7: arguments passed in registers 0 to 7 * @res: result values from registers 0 to 3 + * @quirk: points to an arm_smccc_quirk, or NULL when no quirks are required. * * This function is used to make SMC calls following SMC Calling Convention. * The content of the supplied param are copied to registers 0 to 7 prior * to the SMC instruction. The return values are updated with the content - * from register 0 to 3 on return from the SMC instruction. + * from register 0 to 3 on return from the SMC instruction. An optional + * quirk structure provides vendor specific behavior. */ -asmlinkage void arm_smccc_smc(unsigned long a0, unsigned long a1, +asmlinkage void __arm_smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3, unsigned long a4, unsigned long a5, unsigned long a6, unsigned long a7, - struct arm_smccc_res *res); + struct arm_smccc_res *res, struct arm_smccc_quirk *quirk); /** - * arm_smccc_hvc() - make HVC calls + * __arm_smccc_hvc() - make HVC calls * @a0-a7: arguments passed in registers 0 to 7 * @res: result values from registers 0 to 3 * * This function is used to make HVC calls following SMC Calling * Convention. The content of the supplied param are copied to registers 0 * to 7 prior to the HVC instruction. The return values are updated with - * the content from register 0 to 3 on return from the HVC instruction. + * the content from register 0 to 3 on return from the HVC instruction. An + * optional quirk structure provides vendor specific behavior. */ -asmlinkage void arm_smccc_hvc(unsigned long a0, unsigned long a1, +asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3, unsigned long a4, unsigned long a5, unsigned long a6, unsigned long a7, - struct arm_smccc_res *res); + struct arm_smccc_res *res, struct arm_smccc_quirk *quirk); + +#define arm_smccc_smc(...) __arm_smccc_smc(__VA_ARGS__, NULL) + +#define arm_smccc_smc_quirk(...) __arm_smccc_smc(__VA_ARGS__) + +#define arm_smccc_hvc(...) __arm_smccc_hvc(__VA_ARGS__, NULL) + +#define arm_smccc_hvc_quirk(...) __arm_smccc_hvc(__VA_ARGS__) #endif /*__LINUX_ARM_SMCCC_H*/ From patchwork Tue Apr 4 19:32:32 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: 96763 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp345823qgd; Tue, 4 Apr 2017 12:35:02 -0700 (PDT) X-Received: by 10.99.97.6 with SMTP id v6mr25824966pgb.186.1491334502068; Tue, 04 Apr 2017 12:35:02 -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.35.01; Tue, 04 Apr 2017 12:35:02 -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 S932310AbdDDTfA (ORCPT + 6 others); Tue, 4 Apr 2017 15:35:00 -0400 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:48124 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932288AbdDDTe7 (ORCPT ); Tue, 4 Apr 2017 15:34:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334498; x=1522870498; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=v1iBp7cw0AtASTz8ENLh8ULmaThmxCZOzsozeWwHve8=; b=LTXZwl3GaZl5WFwPeXU5r4M+ibFnFSlc4dfxQpdzSJ0XdUZwNN4Wc/P5 pyWpnPEsNqriXQhyigB+Qes8MCvaAOf9Z35QfJlwe/ut2eSHdv6T7378n 1d2e3zJmoyD/AshFPxy8jyBttb6sXccSiOO7UiCe3kz6FlAZNCfF4vP/q U=; X-IronPort-Anti-Spam-Filtered: false Received: from unknown (HELO fldsmtpi01.verizon.com) ([166.68.71.143]) by fldsmtpe03.verizon.com with ESMTP; 04 Apr 2017 19:34:11 +0000 X-IronPort-AV: E=Sophos;i="5.36,275,1486425600"; d="scan'208";a="182588083" Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO atlantis.verizonwireless.com) ([10.255.192.101]) by fldsmtpi01.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 19:33:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334437; x=1522870437; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=v1iBp7cw0AtASTz8ENLh8ULmaThmxCZOzsozeWwHve8=; b=BlP8iFglT8Y+VoFh5S40gXmyYKPtQOZcj2fqpzgTfIsZ6+ZA41Vzb/bX lUD4OWVij+YYSgA4HZFzko3ULA6cwuKm6QBImZhfQzAC3NGMb7zB1pW0M I6EigsILFrUtU8z93wkLIdv3/QzSEJduxKci3sIMGHMGqZ3MUGfzgMrhq c=; Received: from ranger.odc.vzwcorp.com (HELO mercury.verizonwireless.com) ([10.255.240.27]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 15:33:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334436; x=1522870436; h=to:cc:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from; bh=v1iBp7cw0AtASTz8ENLh8ULmaThmxCZOzsozeWwHve8=; b=s9xZZxIqO5uBr7fJQmiV+qaibVcTK0ML+qKjf3+8yPa2VU7e/F7KbsnM xba3zGgZbGBu5XnJYh/9BYr+eC18Wq/gjY8cyEV877VaTq8ySEbiMP2UC qE0BEiFQps3ttLkJCAJfYcFPlOI4+wAWzpqhJmS+P2h0eIfLSKt38od7G Q=; From: alexander.levin@verizon.com X-Host: ranger.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:54 +0000 Received: from OMZP1LUMXCA11.uswin.ad.vzwcorp.com (144.8.22.186) 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:54 -0400 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA11.uswin.ad.vzwcorp.com (144.8.22.186) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 4 Apr 2017 14:33:53 -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:53 -0500 To: "gregkh@linuxfoundation.org" CC: "stable@vger.kernel.org" Subject: [PATCH for 4.9 79/98] firmware: qcom: scm: Fix interrupted SCM calls Thread-Topic: [PATCH for 4.9 79/98] firmware: qcom: scm: Fix interrupted SCM calls Thread-Index: AQHSrXo0642R6RYilE+/ZPB6/IWduw== Date: Tue, 4 Apr 2017 19:32:32 +0000 Message-ID: <20170404193158.19041-80-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: Andy Gross [ Upstream commit 82bcd087029f6056506ea929f11af02622230901 ] This patch adds a Qualcomm specific quirk to the arm_smccc_smc call. On Qualcomm ARM64 platforms, the SMC call can return before it has completed. If this occurs, the call can be restarted, but it requires using the returned session ID value from the interrupted SMC call. The quirk stores off the session ID from the interrupted call in the quirk structure so that it can be used by the caller. This patch folds in a fix given by Sricharan R: https://lkml.org/lkml/2016/9/28/272 Signed-off-by: Andy Gross Reviewed-by: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/kernel/smccc-call.S | 9 ++++++++- drivers/firmware/qcom_scm-64.c | 13 ++++++++++--- include/linux/arm-smccc.h | 11 ++++++++--- 3 files changed, 26 insertions(+), 7 deletions(-) -- 2.9.3 diff --git a/arch/arm64/kernel/smccc-call.S b/arch/arm64/kernel/smccc-call.S index ba60a8c..6252234 100644 --- a/arch/arm64/kernel/smccc-call.S +++ b/arch/arm64/kernel/smccc-call.S @@ -12,6 +12,7 @@ * */ #include +#include #include .macro SMCCC instr @@ -20,7 +21,13 @@ ldr x4, [sp] stp x0, x1, [x4, #ARM_SMCCC_RES_X0_OFFS] stp x2, x3, [x4, #ARM_SMCCC_RES_X2_OFFS] - ret + ldr x4, [sp, #8] + cbz x4, 1f /* no quirk structure */ + ldr x9, [x4, #ARM_SMCCC_QUIRK_ID_OFFS] + cmp x9, #ARM_SMCCC_QUIRK_QCOM_A6 + b.ne 1f + str x6, [x4, ARM_SMCCC_QUIRK_STATE_OFFS] +1: ret .cfi_endproc .endm diff --git a/drivers/firmware/qcom_scm-64.c b/drivers/firmware/qcom_scm-64.c index 4a0f5ea..1e2e519 100644 --- a/drivers/firmware/qcom_scm-64.c +++ b/drivers/firmware/qcom_scm-64.c @@ -91,6 +91,7 @@ static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id, dma_addr_t args_phys = 0; void *args_virt = NULL; size_t alloc_len; + struct arm_smccc_quirk quirk = {.id = ARM_SMCCC_QUIRK_QCOM_A6}; if (unlikely(arglen > N_REGISTER_ARGS)) { alloc_len = N_EXT_QCOM_SCM_ARGS * sizeof(u64); @@ -131,10 +132,16 @@ static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id, qcom_smccc_convention, ARM_SMCCC_OWNER_SIP, fn_id); + quirk.state.a6 = 0; + do { - arm_smccc_smc(cmd, desc->arginfo, desc->args[0], - desc->args[1], desc->args[2], x5, 0, 0, - res); + arm_smccc_smc_quirk(cmd, desc->arginfo, desc->args[0], + desc->args[1], desc->args[2], x5, + quirk.state.a6, 0, res, &quirk); + + if (res->a0 == QCOM_SCM_INTERRUPTED) + cmd = res->a0; + } while (res->a0 == QCOM_SCM_INTERRUPTED); mutex_unlock(&qcom_scm_lock); diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index c66f8ae..b679341 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -14,9 +14,6 @@ #ifndef __LINUX_ARM_SMCCC_H #define __LINUX_ARM_SMCCC_H -#include -#include - /* * This file provides common defines for ARM SMC Calling Convention as * specified in @@ -60,6 +57,13 @@ #define ARM_SMCCC_OWNER_TRUSTED_OS 50 #define ARM_SMCCC_OWNER_TRUSTED_OS_END 63 +#define ARM_SMCCC_QUIRK_NONE 0 +#define ARM_SMCCC_QUIRK_QCOM_A6 1 /* Save/restore register a6 */ + +#ifndef __ASSEMBLY__ + +#include +#include /** * struct arm_smccc_res - Result from SMC/HVC call * @a0-a3 result values from registers 0 to 3 @@ -125,4 +129,5 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, #define arm_smccc_hvc_quirk(...) __arm_smccc_hvc(__VA_ARGS__) +#endif /*__ASSEMBLY__*/ #endif /*__LINUX_ARM_SMCCC_H*/ From patchwork Tue Apr 4 19:32:32 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: 96764 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp345831qgd; Tue, 4 Apr 2017 12:35:02 -0700 (PDT) X-Received: by 10.99.178.19 with SMTP id x19mr25379914pge.122.1491334502596; Tue, 04 Apr 2017 12:35:02 -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.35.02; Tue, 04 Apr 2017 12:35:02 -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 S932325AbdDDTfB (ORCPT + 6 others); Tue, 4 Apr 2017 15:35:01 -0400 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:59238 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932301AbdDDTe7 (ORCPT ); Tue, 4 Apr 2017 15:34:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334499; x=1522870499; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=0D3MDHFzqyRgQMzp2VH7LlGkh4R1lKe3RaifyaGo4AU=; b=dvUlvcCbCAY8BhBssu7AhtdbEOXIcEbMF/ZxwT/05goSUx7cG/Fd1Igv LVl013oaxOOful/ZUucSjbe6BFbJJkTd2FSnaKCFICI+GWJGKI7h8BALD B5/PBjfIvShHfeDKfi9eehY5eCj3XNGV6gZmVrI1ZFdF0pouiEae7/p4m s=; X-IronPort-Anti-Spam-Filtered: false Received: from unknown (HELO fldsmtpi01.verizon.com) ([166.68.71.143]) by fldsmtpe03.verizon.com with ESMTP; 04 Apr 2017 19:34:11 +0000 X-IronPort-AV: E=Sophos;i="5.36,275,1486425600"; d="scan'208";a="182588084" Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO atlantis.verizonwireless.com) ([10.255.192.101]) by fldsmtpi01.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 19:33:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334437; x=1522870437; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=0D3MDHFzqyRgQMzp2VH7LlGkh4R1lKe3RaifyaGo4AU=; b=PtEI4t/c52+b7PyN91G/YJEfQHZs38Xcg++feC4sUyw067Edi7vgmrEi u/OIOB0lIXeHDvIBoIQ8kReD+xMr+RvycXPqRD7M+Vr2GHE2iuPP0hPny j1xoM6Ch+7b/ivZEmewj2Hr4HvxPz7xA0qyVvg4lgM28/DG6FTgKIh9Mt 8=; Received: from ranger.odc.vzwcorp.com (HELO mercury.verizonwireless.com) ([10.255.240.27]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 15:33:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334436; x=1522870436; h=to:cc:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from; bh=0D3MDHFzqyRgQMzp2VH7LlGkh4R1lKe3RaifyaGo4AU=; b=P6bN0BSvNTe5DhhDectdYoXkaPCT3b8ORvydiDJ7wSL5v6qDKijaUei5 2vNHljFdZroB52g2weGtlJJTVW6iQJBTfrhmoZcT8J5mttiwvS4Zx+3RQ 2A+JAdeFSwxcWcBm9cjzPdBLiKWt+zfapZh5V2Su0NFBt6dfz8plEv0bX k=; From: alexander.levin@verizon.com X-Host: ranger.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:56 +0000 Received: from OMZP1LUMXCA12.uswin.ad.vzwcorp.com (144.8.22.187) 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:55 -0400 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA12.uswin.ad.vzwcorp.com (144.8.22.187) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 4 Apr 2017 14:33:54 -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:54 -0500 To: "gregkh@linuxfoundation.org" CC: "stable@vger.kernel.org" Subject: [PATCH for 4.9 80/98] drm/msm/adreno: move function declarations to header file Thread-Topic: [PATCH for 4.9 80/98] drm/msm/adreno: move function declarations to header file Thread-Index: AQHSrXo0zvjGMzByOkO7nIVYuk1klg== Date: Tue, 4 Apr 2017 19:32:32 +0000 Message-ID: <20170404193158.19041-81-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: Baoyou Xie [ Upstream commit a5725ab0497ad91a2df7c01a78bf1a0cc5be4526 ] We get 2 warnings when building kernel with W=1: drivers/gpu/drm/msm/adreno/a3xx_gpu.c:535:17: warning: no previous prototype for 'a3xx_gpu_init' [-Wmissing-prototypes] drivers/gpu/drm/msm/adreno/a4xx_gpu.c:624:17: warning: no previous prototype for 'a4xx_gpu_init' [-Wmissing-prototypes] In fact, both functions are declared in drivers/gpu/drm/msm/adreno/adreno_device.c, but should be declared in a header file. So this patch moves both function declarations to drivers/gpu/drm/msm/adreno/adreno_gpu.h. Signed-off-by: Baoyou Xie Reviewed-by: Arnd Bergmann Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/1477127865-9381-1-git-send-email-baoyou.xie@linaro.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/adreno/adreno_device.c | 3 --- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.9.3 diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 5127b75..7250ffc 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -25,9 +25,6 @@ bool hang_debug = false; MODULE_PARM_DESC(hang_debug, "Dump registers when hang is detected (can be slow!)"); module_param_named(hang_debug, hang_debug, bool, 0600); -struct msm_gpu *a3xx_gpu_init(struct drm_device *dev); -struct msm_gpu *a4xx_gpu_init(struct drm_device *dev); - static const struct adreno_info gpulist[] = { { .rev = ADRENO_REV(3, 0, 5, ANY_ID), diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index a54f6e0..07d99bd 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -311,4 +311,7 @@ static inline void adreno_gpu_write(struct adreno_gpu *gpu, gpu_write(&gpu->base, reg - 1, data); } +struct msm_gpu *a3xx_gpu_init(struct drm_device *dev); +struct msm_gpu *a4xx_gpu_init(struct drm_device *dev); + #endif /* __ADRENO_GPU_H__ */ From patchwork Tue Apr 4 19:32:32 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: 96761 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp345455qgd; Tue, 4 Apr 2017 12:34:00 -0700 (PDT) X-Received: by 10.98.86.71 with SMTP id k68mr23923699pfb.215.1491334440104; Tue, 04 Apr 2017 12:34:00 -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.59; Tue, 04 Apr 2017 12:34:00 -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 S1754258AbdDDTd7 (ORCPT + 6 others); Tue, 4 Apr 2017 15:33:59 -0400 Received: from omzsmtpe02.verizonbusiness.com ([199.249.25.209]:7960 "EHLO omzsmtpe02.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754512AbdDDTd6 (ORCPT ); Tue, 4 Apr 2017 15:33:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334437; x=1522870437; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=1B9Y+/LGk9qoSsBRoX0ywh8VxibAlU6Onkyv441mLqQ=; b=EVwlqC2hLVmMjZtHKBiCR1DvMpg16oLuczcN7gMe4AC+fUERVJq4GzoW v7SOLSIMcpfhkglIdBBDBljbOCQqg5a/KGBVsvzEoHfWpOUON+i76wJJA cD9LFgaRrY6vzkufKLlwMzJEYbICPK2qAykbrUoN2AjVdFxlk4rEEimFd k=; 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:57 +0000 X-IronPort-AV: E=Sophos;i="5.36,275,1486425600"; d="scan'208";a="325501653" 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:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334436; x=1522870436; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=1B9Y+/LGk9qoSsBRoX0ywh8VxibAlU6Onkyv441mLqQ=; b=LgD1hF25LmBLdNXEG6mdEbt0mF1r7ZYO0TLK2eeIc2DTr57abgs9qp4Z ZkIkztqi+SgQH5ro8nxUmHSnl8cErQbflk1xb8ogmrcZpbVNjrdrbjsC2 R+mCs8JwLQHHTuzA5RvUlqXHs6JtSQ5W73ZOIzPcG+OI+DoTGgDZlKubo o=; 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:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334436; x=1522870436; h=to:cc:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from; bh=1B9Y+/LGk9qoSsBRoX0ywh8VxibAlU6Onkyv441mLqQ=; b=FrLGXChwYwXuDYhnHmRkMbqqNUtxHdhG8ArURQRL6VXw6q3W7qsQ44wk af2NjiCQHY8OZ8XA5DKq9ld9IXC9BbUAOcVbofrahBbdYLdJlDGU2MigZ c9fWa/+k0c21RGQWUA2xJH8QNMu3xUwjkEboFGy8CGzWqZcunBknYpDFn A=; From: alexander.levin@verizon.com X-Host: discovery.odc.vzwcorp.com Received: from nyora1hub001.uswin.ad.vzwcorp.com ([10.170.34.216]) by mercury.verizonwireless.com with ESMTP/TLS/AES256-SHA; 04 Apr 2017 19:33:56 +0000 Received: from OMZP1LUMXCA16.uswin.ad.vzwcorp.com (144.8.22.194) by NYORA1HUB001.uswin.ad.vzwcorp.com (10.170.34.216) with Microsoft SMTP Server (TLS) id 8.3.406.0; Tue, 4 Apr 2017 15:33:56 -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:55 -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:54 -0500 To: "gregkh@linuxfoundation.org" CC: "stable@vger.kernel.org" Subject: [PATCH for 4.9 81/98] ARM: smccc: Update HVC comment to describe new quirk parameter Thread-Topic: [PATCH for 4.9 81/98] ARM: smccc: Update HVC comment to describe new quirk parameter Thread-Index: AQHSrXo0zuYXbpHJ+0yKUL1bX/ebVA== Date: Tue, 4 Apr 2017 19:32:32 +0000 Message-ID: <20170404193158.19041-82-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: Will Deacon [ Upstream commit 3046ec674d441562c6bb3e4284cd866743042ef3 ] Commit 680a0873e193 ("arm: kernel: Add SMC structure parameter") added a new "quirk" parameter to the SMC and HVC SMCCC backends, but only updated the comment for the SMC version. This patch adds the new paramater to the comment describing the HVC version too. Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- include/linux/arm-smccc.h | 1 + 1 file changed, 1 insertion(+) -- 2.9.3 diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index b679341..4c5bca38 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -109,6 +109,7 @@ asmlinkage void __arm_smccc_smc(unsigned long a0, unsigned long a1, * __arm_smccc_hvc() - make HVC calls * @a0-a7: arguments passed in registers 0 to 7 * @res: result values from registers 0 to 3 + * @quirk: points to an arm_smccc_quirk, or NULL when no quirks are required. * * This function is used to make HVC calls following SMC Calling * Convention. The content of the supplied param are copied to registers 0