From patchwork Wed Dec 21 16:32:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 35429 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp3622090wrn; Wed, 21 Dec 2022 08:36:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXuN6QuiOZjn+5sEohxOI3J2MfRtoG4RbOW9EGc5ni9op1aOW0l7eZ/qB87tYe8083pQoMzg X-Received: by 2002:a17:906:70c:b0:7c4:fe41:f0da with SMTP id y12-20020a170906070c00b007c4fe41f0damr6427565ejb.25.1671640575782; Wed, 21 Dec 2022 08:36:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671640575; cv=none; d=google.com; s=arc-20160816; b=QsZ0qWrE23Ke6T3/qMSYDfwE9fh6OfDEfcVhYYqqCFxaBYUZqFBFMwKjAsf/kbnRP0 ePP22QEosSiavq9sLnDsVDeTwF6Y+nAHnH63E6qSAjwuS3FEMy9XeUqwEr0Ls72yvjb6 lID64Q4Ov62opWSUMIatCNz5avDJVSMrVPfTVhtR6RhY3rkgnJ6CYezkpfxlYX6PfGyY 4Ncv+hQ6T+8CPoQ4D2yyRwUc2rkYWR+gETmAaOAyHDD7ZUuEftQe95YboHOaCssC7Ygb jEVwJqhXoDHO/EZywe+vNbmoYKvpFUREaNmCKEKmtEU3lAj5jrSCQjdU4x8LlQ+ZcfPy oI2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yYKTBXQj692clZmnUBZb/0OhG5GDW1ZOmKCzRmlI5HU=; b=ayWY5PDNOsZ/rZ+RKKPkR30cYlCGM7S15XGmyezDJCqCxysGhleLcbZUkfvaUEIESH CyPls+Q7DxnCE28cD1BhcQJem847Q7QpwuFBCSt4VqDGPVr+kaMVhTcsAMwImYd4u78i dKUXHtLsE3L9oAH5rYyGtQkOfSQ62Ji4FW7OVlfzUfKos8uBzHGIug3DL/4DuByol+wu uD/diBuYIHgQqwSpwU9OqlxR4Bdp40OZmHDHK96BAGu0u+0gmh/206CBmToq9q7fxfDo jTJc8j9BMS7tPZUBFdEKUSqBrwQ96DNs6SP+18cTd3wt1WfW2JtivBiAWCvEHto6UJS4 mzzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rcrlx8QU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g6-20020a056402320600b004735dee412fsi14232559eda.572.2022.12.21.08.35.52; Wed, 21 Dec 2022 08:36:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rcrlx8QU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234511AbiLUQdf (ORCPT + 99 others); Wed, 21 Dec 2022 11:33:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232786AbiLUQd3 (ORCPT ); Wed, 21 Dec 2022 11:33:29 -0500 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D6C422BD2 for ; Wed, 21 Dec 2022 08:33:24 -0800 (PST) Received: by mail-lj1-x22d.google.com with SMTP id s10so16218241ljg.1 for ; Wed, 21 Dec 2022 08:33:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yYKTBXQj692clZmnUBZb/0OhG5GDW1ZOmKCzRmlI5HU=; b=rcrlx8QU636cRDmAc1IWueD8zv/ImH3X9JV8jxzf26/ASpQdSBc68iqk7T7elbPK+C UDmyjbl+/I/LkQOL4/XeUrLMAuWXRizkZbGOA4BiqpIhYNSoZNC+fNwoYl/Xmn4bVR/H cKElIwKgGDqPEZ8f9fQaNlrUrW5LeVRogsCskfiVrWnbc7PZ4Lg6NVpkIgvKMLzV/wi2 3RI7mYQfQqX2ufRcNG1JWkmJ/jYW8WD66oKaykFwlX2h4NnAwaO1NVIsWqvAppDr3EBa 2xX6AA3JNhWYSZmM9Dn2h9DP9puCn++3EHyGYFiGKi8HSiuyNcfhfPadwB7zyVWcOPv+ iITA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yYKTBXQj692clZmnUBZb/0OhG5GDW1ZOmKCzRmlI5HU=; b=5Vrkai8MmoSkbO1fVa9KV1ksTF+XKNlj3JcVL/7iIfRyJKE2sGZhJRbS0nfKpO6M/x 1LRW42doF4G4OdXtKm9leglbdC8+gRyMREwIDhl63tV+dRrIDt0qjTo1ehejAxvIgr+M NDJFvKzbis4L0UCHn1PdYAHyrjzvBGbptZsO/ZHaUf7lko6sIJG34uq1r5WMBAacej/Y sbL8uQtWQKTEvvA4cPRVewHKjwsp56ViG6zq1icseDHb5enlD95+X0gaD08OnOf3n9oT QBjsxQrKqbKs7iQJ9JV2ekJqzN7oYDRQpFfL9Yj1Iji03PtElM51BQQw/7Eo9GTmUA4J Y/zw== X-Gm-Message-State: AFqh2koPE4FSN93306dBU2jHWEkt9kNFl8D8SZjcBeiPtGFdVrwcuAt5 YdnAkqQLwxhoY3OseC4zc2GNSA== X-Received: by 2002:a05:651c:154e:b0:27a:874:cd2d with SMTP id y14-20020a05651c154e00b0027a0874cd2dmr2300650ljp.9.1671640402963; Wed, 21 Dec 2022 08:33:22 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id a7-20020a2eb547000000b0026daf4fc0f7sm1380147ljn.92.2022.12.21.08.33.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 08:33:22 -0800 (PST) From: Krzysztof Kozlowski To: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Rob Herring , Greg Kroah-Hartman , Jiri Slaby , Zijun Hu , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Cc: Sai Teja Aluvala , Panicker Harish , Johan Hovold , Krzysztof Kozlowski , stable@vger.kernel.org Subject: [PATCH 2/2] Bluetooth: hci_qca: Fix driver shutdown on closed serdev Date: Wed, 21 Dec 2022 17:32:49 +0100 Message-Id: <20221221163249.1058459-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221163249.1058459-1-krzysztof.kozlowski@linaro.org> References: <20221221163249.1058459-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752842188195052560?= X-GMAIL-MSGID: =?utf-8?q?1752842188195052560?= The driver shutdown callback (which sends EDL_SOC_RESET to the device over serdev) should not be invoked when HCI device is not open (e.g. if hci_dev_open_sync() failed), because the serdev and its TTY are not open either. Also skip this step if device is powered off (qca_power_shutdown()). Fixes: 7e7bbddd029b ("Bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot") Cc: Signed-off-by: Krzysztof Kozlowski --- drivers/bluetooth/hci_qca.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 6eddc23e49d9..3325c8be66f8 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -2164,10 +2164,17 @@ static void qca_serdev_shutdown(struct device *dev) int timeout = msecs_to_jiffies(CMD_TRANS_TIMEOUT_MS); struct serdev_device *serdev = to_serdev_device(dev); struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev); + struct hci_uart *hu = &qcadev->serdev_hu; + struct hci_dev *hdev = hu->hdev; + struct qca_data *qca = hu->priv; const u8 ibs_wake_cmd[] = { 0xFD }; const u8 edl_reset_soc_cmd[] = { 0x01, 0x00, 0xFC, 0x01, 0x05 }; if (qcadev->btsoc_type == QCA_QCA6390) { + if (test_bit(QCA_BT_OFF, &qca->flags) || \ + !test_bit(HCI_RUNNING, &hdev->flags)) + return; + serdev_device_write_flush(serdev); ret = serdev_device_write_buf(serdev, ibs_wake_cmd, sizeof(ibs_wake_cmd));