From patchwork Tue Jun 20 23:52:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "K, Kiran" X-Patchwork-Id: 13286502 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD2D3EB64D7 for ; Tue, 20 Jun 2023 23:41:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229640AbjFTXlg (ORCPT ); Tue, 20 Jun 2023 19:41:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbjFTXlf (ORCPT ); Tue, 20 Jun 2023 19:41:35 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76AD51710 for ; Tue, 20 Jun 2023 16:41:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687304494; x=1718840494; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=RiCnlnhf4wLnmauT0y5tHCtmegZ48eaHagptOAjGTwQ=; b=WFWOsWOMnMNplu96FNs7W+x3Iphh967fwO5YQF7giY+SR9YZy2WayoQX EIiWy7RCC6tzkQ3+3sllFcWOGcvH5KxNMrtv/ow8MO3Vnv8K5rCc2CbO+ eqd9QU2Cz5aE9NJIuxbOaE+YM1kwVl/fwbC98S9y/ryXQJ7EAHzQCat0J TJwwcmWCFVEYh8uRKxNooGB1OyKyL3ZMPmTrbMukoGgwJTzQqtDEh6VEm hZP3Gvs5MgQ5YrE1xZ92FjDaCuDKJ79RzDw58TIfMvU3hM76DLfHKqD7y tXKsQqCjdiZTDrA4fwk5BicDdehBajEWhoVDq1dq+8ZMiau1YjjTCS58i g==; X-IronPort-AV: E=McAfee;i="6600,9927,10747"; a="340353547" X-IronPort-AV: E=Sophos;i="6.00,258,1681196400"; d="scan'208";a="340353547" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jun 2023 16:41:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10747"; a="888429692" X-IronPort-AV: E=Sophos;i="6.00,258,1681196400"; d="scan'208";a="888429692" Received: from intel-lenovo-legion-y540-15irh-pg0.iind.intel.com ([10.224.186.95]) by orsmga005.jf.intel.com with ESMTP; 20 Jun 2023 16:41:31 -0700 From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: ravishankar.srivatsa@intel.com, chethan.tumkur.narayan@intel.com, pmenzel@molgen.mpg.de, Kiran K Subject: [PATCH v1 1/2] Bluetooth: btintel: print friendly error message for acpi errors Date: Wed, 21 Jun 2023 05:22:32 +0530 Message-Id: <20230620235233.1845036-1-kiran.k@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Print user friendly error messages for errors returned by ACPI methods. Signed-off-by: Kiran K --- drivers/bluetooth/btintel.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index dd1e48808ee2..1110289ccd02 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -2463,28 +2463,29 @@ static int btintel_acpi_reset_method(struct hci_dev *hdev) status = acpi_evaluate_object(ACPI_HANDLE(GET_HCIDEV_DEV(hdev)), "_PRR", NULL, &buffer); if (ACPI_FAILURE(status)) { - bt_dev_err(hdev, "Failed to run _PRR method"); + bt_dev_err(hdev, "Failed to run _PRR method: %s", acpi_format_exception(status)); ret = -ENODEV; return ret; } p = buffer.pointer; if (p->package.count != 1 || p->type != ACPI_TYPE_PACKAGE) { - bt_dev_err(hdev, "Invalid arguments"); + bt_dev_err(hdev, "Invalid arguments: count: %u type: 0x%x", p->package.count, + p->type); ret = -EINVAL; goto exit_on_error; } ref = &p->package.elements[0]; if (ref->type != ACPI_TYPE_LOCAL_REFERENCE) { - bt_dev_err(hdev, "Invalid object type: 0x%x", ref->type); + bt_dev_err(hdev, "Object type is not ACPI_TYPE_LOCAL_REFERENCE: 0x%x", ref->type); ret = -EINVAL; goto exit_on_error; } status = acpi_evaluate_object(ref->reference.handle, "_RST", NULL, NULL); if (ACPI_FAILURE(status)) { - bt_dev_err(hdev, "Failed to run_RST method"); + bt_dev_err(hdev, "Failed to run_RST method: %s", acpi_format_exception(status)); ret = -ENODEV; goto exit_on_error; } From patchwork Tue Jun 20 23:52:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "K, Kiran" X-Patchwork-Id: 13286503 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B1C2EB64D8 for ; Tue, 20 Jun 2023 23:41:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229749AbjFTXlo (ORCPT ); Tue, 20 Jun 2023 19:41:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbjFTXln (ORCPT ); Tue, 20 Jun 2023 19:41:43 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F8B3170D for ; Tue, 20 Jun 2023 16:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687304502; x=1718840502; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KdiuOtf8BDGx94SN4j2iQFgXAiCTPNq2xldGSgn3QWw=; b=Ysn0sz0i3JeW14BuUfBCLWwKfm4RglI5BnzHMm1SJdQJlfYJmSOj1FUy w27czW3QApZMexEgUQ5tekQ0h6ZXPcknDd0q8QTIBXvTA8hS7xi/w4qhC 9etRXRSNDOgVGNXM5GdnUXlscZqkCF8MHY/f+6egfExpHGMyvlXVkUr/8 2mJAUcd6uumCt0t2qgXVmOYinNSEnIjFyGffJAYqUgoGblr+nUyUzpi9e j7jKCBI5jW7ra0ZaGRgy1A3YPb9GfuG42GXeanPvNtnaJcplruAl08cq7 0CZanifdCa+XkLWAmwxApUnYuGumSCTUNVoqCB038SM8JaUfKCcDfbySd A==; X-IronPort-AV: E=McAfee;i="6600,9927,10747"; a="340353586" X-IronPort-AV: E=Sophos;i="6.00,258,1681196400"; d="scan'208";a="340353586" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jun 2023 16:41:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10747"; a="888429747" X-IronPort-AV: E=Sophos;i="6.00,258,1681196400"; d="scan'208";a="888429747" Received: from intel-lenovo-legion-y540-15irh-pg0.iind.intel.com ([10.224.186.95]) by orsmga005.jf.intel.com with ESMTP; 20 Jun 2023 16:41:40 -0700 From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: ravishankar.srivatsa@intel.com, chethan.tumkur.narayan@intel.com, pmenzel@molgen.mpg.de, Kiran K Subject: [PATCH v1 2/2] Bluetooth: btintel: Add comment for DSM metbods Date: Wed, 21 Jun 2023 05:22:33 +0530 Message-Id: <20230620235233.1845036-2-kiran.k@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230620235233.1845036-1-kiran.k@intel.com> References: <20230620235233.1845036-1-kiran.k@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org 1. Add comment about reset method types. 2. Minor indentation and typo fixes. Signed-off-by: Kiran K --- drivers/bluetooth/btintel.c | 8 ++++++-- drivers/bluetooth/btusb.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index 1110289ccd02..000ab44c303d 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -2500,10 +2500,14 @@ static void btintel_set_dsm_reset_method(struct hci_dev *hdev, { struct btintel_data *data = hci_get_priv(hdev); acpi_handle handle = ACPI_HANDLE(GET_HCIDEV_DEV(hdev)); - u8 reset_payload[4] = {0x01, 0x00, 0x01, 0x00}; + u8 reset_payload[4] = { 0x01, 0x00, 0x01, 0x00 }; union acpi_object *obj, argv4; enum { + /* supported from TigerLake platform onwards on both discrete + * and integrated solutions + */ RESET_TYPE_WDISABLE2, + /* supported from MeteorLake platform with GalePeak2 NIC only */ RESET_TYPE_VSEC }; @@ -2533,7 +2537,7 @@ static void btintel_set_dsm_reset_method(struct hci_dev *hdev, return; } argv4.integer.type = ACPI_TYPE_INTEGER; - /* delay required to toggle BT power */ + /* delay between WDISABLE2 pin assertion and deassertion */ argv4.integer.value = 160; obj = acpi_evaluate_dsm(handle, &btintel_guid_dsm, 0, DSM_SET_WDISABLE2_DELAY, &argv4); diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 1c0879601735..34659255a14f 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -864,7 +864,7 @@ static void btusb_intel_cmd_timeout(struct hci_dev *hdev) if (intel_data->acpi_reset_method) { if (test_and_set_bit(INTEL_ACPI_RESET_ACTIVE, intel_data->flags)) { - bt_dev_err(hdev, "acpi: last reset failed ? Not resetting again"); + bt_dev_err(hdev, "acpi: last reset failed? Not resetting again"); return; }