From patchwork Thu Mar 8 05:02:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130937 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6050596lja; Wed, 7 Mar 2018 21:27:13 -0800 (PST) X-Google-Smtp-Source: AG47ELvzxe+kzf6H4FobQPBVBQlQoi0wa0nPtbTb9kTzf0vSOz5LBsoBNdQKtVMw1AbSfQqka9Z6 X-Received: by 2002:a17:902:2843:: with SMTP id e61-v6mr22961712plb.437.1520486833164; Wed, 07 Mar 2018 21:27:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520486833; cv=none; d=google.com; s=arc-20160816; b=EJEggcW3edphUjLUjg/9y0UMigvVrqGKUdvCFWJGqTGEn5wvIDqJYMLXs1ot7t8hEE 8Sp/cS9X1Iu2Tj/aJ/mUebsg4xGmDiAAg1+n/iUlw1YkTr56L1lVjCU8jBN0LqRQ+N8X OLCoEvp4pcO2H+rlUJzfIuGGVmv9/23Tcx7U5uWW/1zEvrQlkpxVekeId3OwtxUDgNYI uLPc9Gs2BolmwzsOcAnVYITSnETboBDULlEGmjejhd4LTA1iraVhpneSnszwnRB+sWiA EcrmlkpjWRIG90nqtBZpp3r2UWJ774jQOjdUCwezRBTSVMORyGZSH4J6zY9Dv/KKiuSE bEOA== 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=XaJAl2WpAnkYa6BzjK2mjagiaIrgZLknN50IbuXSv4A=; b=GOvEykPcYnFUx0XOjd6+g6b8SY9YXm8vo6qs0VVwVu3xAo4gkU7Ge1QbZtckPRK5tZ 27fkH+mCr1mJ+KBjNhWgLoRr8a5CAS2JckQfTPf59dQ4XHu22foMZO4/eBlaq67scGkP fSHUP3UorlxOQHsjvHLcTvxd1sh6zy71nbc4+S10QmNrwe/o+S4FGQeN7VRKt2zigAB7 RHI+F4Sp5kLYFqwe42DXxnO7Dj+PsZk//jtXUt5I7nVc/ygh5D26xCNf3ou/cBajKK1E S9+q26lsv6FwX+1CzX/i7dEwPpQbgJl00YaWE+asT9AK9OMNxkp/K6jfuMOtHot7WdiF NWCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=mR/gzrPR; 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 t21-v6si14633631plj.269.2018.03.07.21.27.12; Wed, 07 Mar 2018 21:27:13 -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=mR/gzrPR; 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 S966582AbeCHF1K (ORCPT + 28 others); Thu, 8 Mar 2018 00:27:10 -0500 Received: from mail-bn3nam01on0139.outbound.protection.outlook.com ([104.47.33.139]:41401 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966541AbeCHFHI (ORCPT ); Thu, 8 Mar 2018 00:07:08 -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=XaJAl2WpAnkYa6BzjK2mjagiaIrgZLknN50IbuXSv4A=; b=mR/gzrPRfY929GBfXTSMlAlDgqNMs/ntj929o/TF0rLsJuUJImFbI99sxkFWxmpIp5BlVgqP8ZKAEG5QviS4SZ9BJyerNsOMM/wasGII5mC1HXTZBHJgajdukm51K+neHYxTMzkMy1y2LFtCfZOMzOD0IpUz5nS8I4qwJepJhbw= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1077.namprd21.prod.outlook.com (52.132.130.11) 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:07:06 +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:07:06 +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.4 078/101] Bluetooth: hci_qca: Avoid setup failure on missing rampatch Thread-Topic: [PATCH AUTOSEL for 4.4 078/101] Bluetooth: hci_qca: Avoid setup failure on missing rampatch Thread-Index: AQHTtpqbVcj6f9wG9UG9fhKP8c2fFw== Date: Thu, 8 Mar 2018 05:02:07 +0000 Message-ID: <20180308050023.8548-78-alexander.levin@microsoft.com> References: <20180308050023.8548-1-alexander.levin@microsoft.com> In-Reply-To: <20180308050023.8548-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; DM5PR2101MB1077; 7:tj2nA7JBLQ5/J/OMPLadJ0n46D6N5mNPT4NzIeuwVa/9ugxOKgOS4z3CD9KJ5KrbB8tqvq73YUfxwJyXqCcHm67rxnXOVAf/P7lIDz2PFnELm3PUGs2+4G48ozPBEC5+iJhhU2XlwJ9OZRDw4PkP+y3Ko/GakLVg2j5weu7LalqWchiLrua/k3mP+za/NS4IV5Wr2u0F9NzQFwfm8XW7EfJltsfmroFMynj+jFOgbg7fnVzmUMchSpiT/vH3XnXt; 20:B+YySTD8ANx3dDuPqPgb6mi+d8QATtFOLEOnUXu80QUst0vqCxAwsa1DfV01igcXp2+kKZ5S5SDhsQaNqrQyr+QrM2+JkbLuwM6F07zvcAWe7DJsSEESL8QdsSh7bcaCONBjuzZpO/KsdYyXDkwLyggsJfZ1IMbz2ZeaJrC3EhY= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: bda393c8-b351-416f-dfb9-08d584b27051 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1077; x-ms-traffictypediagnostic: DM5PR2101MB1077: 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB1077; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1077; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(376002)(346002)(39380400002)(396003)(39860400002)(199004)(189003)(86362001)(102836004)(575784001)(6506007)(22452003)(2950100002)(186003)(68736007)(26005)(106356001)(105586002)(66066001)(86612001)(3846002)(3280700002)(2900100001)(25786009)(53936002)(5660300001)(2906002)(3660700001)(10090500001)(6512007)(1076002)(4326008)(6116002)(305945005)(110136005)(107886003)(54906003)(2501003)(5250100002)(8676002)(8936002)(81156014)(81166006)(14454004)(76176011)(7736002)(72206003)(10290500003)(478600001)(6486002)(6436002)(99286004)(36756003)(97736004)(316002)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1077; 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: fsDx4BXDOF+QV/3itoGP+dlcWWhD1qdtS0X8yAKjoU2ZU7T4k4WyPr0u/Mk2KvvXdYeVEVtb4c++s9WDTYcbMEfi/sh6tzN488a/wucNWVr7HDVvL2Hhyx0gHQwBb7FSrI1m+B0oRhCMpIArxTae4aD+05Z7beCHiOZ0Rb7FwfBOcz5EszqJzzwrQBLI05PRQoCQWQPZkK8yPKndhHa9m4VN9+SlCLcm7qk4puPZNJEpQ6y5U4N7yTScIwotd9HRSsGdKtG7CLxpZ0BOUhVA26OH/Umxy0OIYxYPiysKGmeXAflWLxCyCJ8GM36DtZKDSiE8JgHiZMtLfKE7Ta5ybA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: bda393c8-b351-416f-dfb9-08d584b27051 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 05:02:07.2664 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1077 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 71325e443e46..8a3bf0a8c31d 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 */