From patchwork Thu Mar 8 04:59:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130944 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6071804lja; Wed, 7 Mar 2018 21:55:34 -0800 (PST) X-Google-Smtp-Source: AG47ELuU/6E7HtDJH58B4QaJlJXtshK5wLwWesAz6K2QddEIYDaXLyAXXfFOXS7FM3nMJGhZ4bIt X-Received: by 10.98.194.219 with SMTP id w88mr25266704pfk.26.1520488534701; Wed, 07 Mar 2018 21:55:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520488534; cv=none; d=google.com; s=arc-20160816; b=KPnW4XRnD/zewl98vCBb09K71ofr/UhsdCRpVQlA+BR2LrWKsNOlJxNOsZxSXDitUh srIP3NwI1Ew1NwMWwrUDc7NrmGZjhYCd03EjWJHjAPG4aAsxyWhKn1L/vubmmlOMS5Qc MxU56Ov4t4yXmYP1olENgAg4TW5ph/Cl3bgcnD0Tr75i3U/FtDlEJivSjrYzMg+I/O8I hu/nJ3RstYT9x0ziN6XeRsyaz/V2PwqVmRESRrhh+yQjtFcJvN7tAj2gG0F9BQk9UEgC 1y/yFxhh3zgiccearQqgc09prhlr1f+wEEEZNhPO6In4MgBrb/Eo5lDuG+3oZ6opGxtg oRSw== 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=dKF+F1z+Ns72/GrMw9rlhOLXVXBjWN9dwGOZr+koKqI=; b=dtI2lTmJ0IJgt2UMpo1TYys2V9Ho+VX4ntnF5jDHn1i9f4KsG92zcLezGhzKammRLG E1jEdv+p7irjV2R3VPrFcjjAjiIPmPFFmA7IuXCroKMuolZGieGUy1+zDZ9SqfxdP0Pu Cqi7d5PqF0wUN191DZHCV8uEybGEINKdsWPsTiLbJMqrjpvZEuAPdeLB6OBOZ9BHHvVi WI66nhAyFdaDQ0HEAImh4a6qLouwwVusmydJPCJpuz0CvG4n/LZ0LIUDJkFmTvSs/IJN r2boF+Qjbx6NSH1Qa2rCNyKwu2/Ekr8UHHvwDLpD8n318zcSh2aFhhLrkydwZibqgP/Q IDMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=fG2fyDH5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w66si15164136pfi.23.2018.03.07.21.55.34; Wed, 07 Mar 2018 21:55:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=fG2fyDH5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965655AbeCHFzc (ORCPT + 10 others); Thu, 8 Mar 2018 00:55:32 -0500 Received: from mail-co1nam03on0092.outbound.protection.outlook.com ([104.47.40.92]:45512 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755336AbeCHFD5 (ORCPT ); Thu, 8 Mar 2018 00:03: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=dKF+F1z+Ns72/GrMw9rlhOLXVXBjWN9dwGOZr+koKqI=; b=fG2fyDH5oN19wOPKpXiYAD8sMxNseWA3P/5BR51pHgF8+HMko5sGZaz2tX/F4gbAI8nO+TD/YCTf3iWl1fHX5JTTp9H70EA/Kzt9TTQejm3Hw3ldT4Pk1pKEZPh4abAB43pvRDEKU2FTIX0NnCrljq+ChnbVAG2uP5HwSWvMcBU= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0902.namprd21.prod.outlook.com (52.132.132.159) 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:03:54 +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:03:54 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Loic Poulain , Marcel Holtmann , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 152/190] Bluetooth: hci_qca: Avoid setup failure on missing rampatch Thread-Topic: [PATCH AUTOSEL for 4.9 152/190] Bluetooth: hci_qca: Avoid setup failure on missing rampatch Thread-Index: AQHTtppPwAPiQSIrL0uKK9ekny2Glw== Date: Thu, 8 Mar 2018 04:59:59 +0000 Message-ID: <20180308045810.8041-152-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; DM5PR2101MB0902; 7:r7cWPKu6f4Xt9WqbwIHWEUoj1X3CtiTuwWxKoL9SNlbtHZCkJWBBP8tlR04pa5CsNGLawPUNsNigcwGl1uKe9qF0Z8F5wbLw9BcFZ3s2UoKqWe80y+WHf3wEbw55C3xD4Vl0HC540pSw9xEtcNNab8sxX1cIroDhQIlJmEEUF/hZMDKtMMOTYXzUDYGS/HV8alfuhzI2IcKz40KWHQK2I6WszdFMQ6EPXsSteS/FYNwQabzf4qm3yiBPsoFyc+Ne; 20:zMgvyND/pyX37Qb1RbO3pZBw+Q723Jjh/aPRy7+g22UDoaNKbo8VK8ejq1jHSA1eZf9F6+3VcR17ZBUPRUUu8C0Xu4mOZl9fi1bG3SdvEUexnnvlPJbGjUryic4GCIq1T27d/UFjMZ1vmR/EdtgH4PnFvARQT8z41SnaQvJrtwM= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 335ed3aa-2ffd-48e5-f7c4-08d584b1fda5 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0902; x-ms-traffictypediagnostic: DM5PR2101MB0902: 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)(5005006)(8121501046)(10201501046)(3002001)(3231220)(944501244)(52105095)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB0902; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0902; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(39380400002)(376002)(366004)(396003)(189003)(199004)(8936002)(81156014)(81166006)(7736002)(5250100002)(8676002)(99286004)(26005)(107886003)(186003)(2950100002)(106356001)(10090500001)(305945005)(66066001)(97736004)(2501003)(86362001)(3846002)(3660700001)(72206003)(6436002)(1076002)(6486002)(5660300001)(54906003)(110136005)(68736007)(53936002)(14454004)(36756003)(25786009)(478600001)(10290500003)(6506007)(2900100001)(102836004)(76176011)(6512007)(22452003)(6116002)(316002)(4326008)(105586002)(86612001)(2906002)(3280700002)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0902; 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: BlOaXy9AYk8NRpviluHk4GEcgmSxxq8kveJEhNALpu9WdhmybAXOWGg1m7PcEz087IYIm2ovoOkYQzzCP3Vhm5T0vi/J0vKqy+mRAxPgrRS/cJ7wyEMZ2YkbqntigZFd9mD+F9gV6wNj2efbfsjSbMq6DMhLyxjF9bwbOOwjagUhzH+JPZVPHWPt4JM9PH5h++pMZ3Qaj9xgx09zQSWysIhKjoCpDmLVyyQ8N1fM7hhwXkDzeQb2SM4NoGNHC/uFWyYGtQMt/hhRYUErMEhbMPd+TNZKrRwZQEMZwPOU6pfDqvI7JyxfiMx7zX8n4N/Rc8TtwfdRpG+E0vnTuvT4xw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 335ed3aa-2ffd-48e5-f7c4-08d584b1fda5 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:59:59.4720 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0902 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Loic Poulain [ Upstream commit ba8f3597900291a93604643017fff66a14546015 ] Assuming that the original code idea was to enable in-band sleeping only if the setup_rome method returns succes and run in 'standard' mode otherwise, we should not return setup_rome return value which makes qca_setup fail if no rampatch/nvm file found. This fixes BT issue on the dragonboard-820C p4 which includes the following QCA controller: hci0: Product:0x00000008 hci0: Patch :0x00000111 hci0: ROM :0x00000302 hci0: SOC :0x00000044 Since there is no rampatch for this controller revision, just make it work as is. Signed-off-by: Loic Poulain Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- drivers/bluetooth/hci_qca.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.14.1 diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 6c867fbc56a7..74b2f4a14643 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -936,6 +936,9 @@ static int qca_setup(struct hci_uart *hu) if (!ret) { set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags); qca_debugfs_init(hdev); + } else if (ret == -ENOENT) { + /* No patch/nvm-config found, run with original fw/config */ + ret = 0; } /* Setup bdaddr */