Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp8534318rwd; Tue, 20 Jun 2023 17:06:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6NZJOZMAiQWFjGPgU6lh3+tyrAMgENyYPKKmt4/JIampZv1qaUNTLg1fh7IzobfZtePtzK X-Received: by 2002:a05:6214:2347:b0:625:1c04:6761 with SMTP id hu7-20020a056214234700b006251c046761mr15839319qvb.27.1687305982572; Tue, 20 Jun 2023 17:06:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687305982; cv=none; d=google.com; s=arc-20160816; b=Cqxe+mS4+6hQ+e5KxY9OnfsSmLILaO1hKg9xFP2/b4GdpOpqQOHMSh9nzfF4/fL5q7 hzsXW5YrugEmWu3DmcBDi6zMEaJl+wby7ZRGnABL/PrYQ6sDSS1ASdBWkw4jVrTJq+pI Ik/1jAO2+TNzWokVBmdaBdy+KJLwL0Xq/ij2PFA4XjF5dlReQz2VKnyl0+Z4iB94hUnm zzparmgLxH+LKSkCZx5VCchsnAyhRC+xoqpjNrlCvsBfwE1MBQkt7J8h7rj/Mm74WJQ8 VKw16T/vC2xXF8EojKUG/lQoyzdsIF62W1WT96/Mq8f+nD1xF8MpIKKcvWHQVWmwa8lm E8FA== 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=IWJaj8VigvUq/DSo8R3ghA9Gs0SibEQjVwgeMRQiLMo=; b=lTxl6etK7hDTfgLuGjv0Y5Urb0ZB5baxb6QQbmXM3WxXQb4kcKc36OTHZaNdmk8XeB uGV+moV62madeuLJqGeL+nYjd8ZI5NAtus+f2+C0iyyP3iklrdyayqrOcVQHhBRru9Ix hmUTd+sVtgg5GgQcf+O92wh4VPWN7HelEHJrMuSOplaf8p8sToxbl+bfR2PUJEoP6Bl4 e7vkOQlrvJi9f0x0L3fP4OoaUEIKGRdfmQ8+3bnZxKz4DRL0wQsZ0/QYck2opUx11R6s 7mlfd/WdTrR7vZNYrAEYDiVEoWF2arYsgZnYVP4XuB1ISjuNA9ousK3Md4DcHpPJJuNP sWJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Ysn0sz0i; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p29-20020a637f5d000000b0054403507e7bsi2945111pgn.77.2023.06.20.17.06.06; Tue, 20 Jun 2023 17:06:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-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=@intel.com header.s=Intel header.b=Ysn0sz0i; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229696AbjFTXlo (ORCPT + 99 others); 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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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-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; } -- 2.25.1