From patchwork Thu Aug 10 14:56:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Singh, Lokendra" X-Patchwork-Id: 712415 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 240F0C04E69 for ; Thu, 10 Aug 2023 14:53:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234619AbjHJOx0 (ORCPT ); Thu, 10 Aug 2023 10:53:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232030AbjHJOxZ (ORCPT ); Thu, 10 Aug 2023 10:53:25 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57B5A26A0 for ; Thu, 10 Aug 2023 07:53:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691679205; x=1723215205; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=45X/ZfiDWS2puw40oOVVOOkMvVBayKSkp2hmndMyr6Q=; b=BQFMYK7p2VKTp+woAg/hpfR6ISt1l0P5lXbCGSYPwtWcsODZLfSQ/wks ok0qZCRU+DpNHPatZIQ6XG1DQhuODdlDm+hkFu1fElSbiOd8F3Mjp9HtN v6Zabo/F7u4UdrtbmtK7zOxCsD9mjPRBjfUSXfkzJIJfZoYT/PsUdmhhe fvMTOTm+T+M90iWK3bwaTkuhIp6AlDsbbXjC6NqzlkKshcB+8GHKuFDC4 ymBf4heY2F6RuedfZgbANpOARlAmDcRBQEg0Kgr24H0xn6f1VOxu6Bmja SnOCD80UqL2yeTysQFcEVWe8TgILzB2xqRsUSjxwE6ROdLQZm/zjCSvto A==; X-IronPort-AV: E=McAfee;i="6600,9927,10798"; a="371435175" X-IronPort-AV: E=Sophos;i="6.01,162,1684825200"; d="scan'208";a="371435175" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2023 07:53:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10798"; a="682148503" X-IronPort-AV: E=Sophos;i="6.01,162,1684825200"; d="scan'208";a="682148503" Received: from castle-black.iind.intel.com ([10.66.185.63]) by orsmga003.jf.intel.com with ESMTP; 10 Aug 2023 07:53:21 -0700 From: Lokendra Singh To: linux-bluetooth@vger.kernel.org Cc: ravishankar.srivatsa@intel.com, chethan.tumkur.narayan@intel.com, luiz.von.dentz@intel.com, tedd.an@intel.com, kiran.k@intel.com, Lokendra Singh , Seema Sreemantha Subject: [PATCH v2] Bluetooth: btintel: Send new command for PPAG Date: Thu, 10 Aug 2023 20:26:55 +0530 Message-Id: <20230810145653.1780-1-lokendra.singh@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 Added support for the new command opcode FE0B (HCI Intel PPAG Enable). btmon log: < HCI Command: Intel PPAG Enable (0x3f|0x020b) plen 4 Enable: 0x00000002 > HCI Event: Command Complete (0x0e) plen 4 Intel PPAG Enable (0x3f|0x020b) ncmd 1 Status: Success (0x00) Signed-off-by: Seema Sreemantha Signed-off-by: Lokendra Singh --- drivers/bluetooth/btintel.c | 28 +++++++++++++++++++--------- drivers/bluetooth/btintel.h | 8 +++----- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index 633e8d9bf58f..d2c93b88c527 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -2401,7 +2401,7 @@ static void btintel_set_ppag(struct hci_dev *hdev, struct intel_version_tlv *ver { struct btintel_ppag ppag; struct sk_buff *skb; - struct btintel_loc_aware_reg ppag_cmd; + struct hci_ppag_enable_cmd ppag_cmd; acpi_handle handle; /* PPAG is not supported if CRF is HrP2, Jfp2, JfP1 */ @@ -2409,6 +2409,8 @@ static void btintel_set_ppag(struct hci_dev *hdev, struct intel_version_tlv *ver case 0x504: /* Hrp2 */ case 0x202: /* Jfp2 */ case 0x201: /* Jfp1 */ + bt_dev_warn(hdev, "PPAG not supported for Intel CNVr (0x%3x)", + ver->cnvr_top & 0xFFF); return; } @@ -2434,24 +2436,32 @@ static void btintel_set_ppag(struct hci_dev *hdev, struct intel_version_tlv *ver } if (ppag.domain != 0x12) { - bt_dev_warn(hdev, "PPAG-BT: domain is not bluetooth"); + bt_dev_warn(hdev, "PPAG-BT: Bluetooth domain is disabled in ACPI firmware"); return; } - /* PPAG mode, BIT0 = 0 Disabled, BIT0 = 1 Enabled */ - if (!(ppag.mode & BIT(0))) { - bt_dev_dbg(hdev, "PPAG-BT: disabled"); + /* PPAG mode + * BIT 0 : 0 Disabled in EU + * 1 Enabled in EU + * BIT 1 : 0 Disabled in China + * 1 Enabled in China + */ + if ((ppag.mode & 0x01) != BIT(0) && (ppag.mode & 0x02) != BIT(1)) { + bt_dev_warn(hdev, "PPAG-BT: EU, China mode are disabled in CB/BIOS"); return; } - ppag_cmd.mcc = cpu_to_le32(0); - ppag_cmd.sel = cpu_to_le32(0); /* 0 - Enable , 1 - Disable, 2 - Testing mode */ - ppag_cmd.delta = cpu_to_le32(0); - skb = __hci_cmd_sync(hdev, 0xfe19, sizeof(ppag_cmd), &ppag_cmd, HCI_CMD_TIMEOUT); + /* HCI_Intel_PpagEnable_CMD - opcode: 0xFE0B + * ppag_enable_flags - ppag mode + */ + ppag_cmd.ppag_enable_flags = ppag.mode; + + skb = __hci_cmd_sync(hdev, 0xfe0b, sizeof(ppag_cmd), &ppag_cmd, HCI_CMD_TIMEOUT); if (IS_ERR(skb)) { bt_dev_warn(hdev, "Failed to send PPAG Enable (%ld)", PTR_ERR(skb)); return; } + bt_dev_info(hdev, "PPAG-BT: Enabled (Mode %d)", ppag.mode); kfree_skb(skb); } diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index 2ed646609dee..01e87f68fab0 100644 --- a/drivers/bluetooth/btintel.h +++ b/drivers/bluetooth/btintel.h @@ -137,11 +137,9 @@ struct intel_offload_use_cases { __u8 preset[8]; } __packed; -struct btintel_loc_aware_reg { - __le32 mcc; - __le32 sel; - __le32 delta; -} __packed; +struct hci_ppag_enable_cmd { + u32 ppag_enable_flags; +}; #define INTEL_TLV_TYPE_ID 0x01