chore: Add Valve's patches for bluez

2025-01-01 03:21:41 +00:00 · 2023-12-06 23:40:30 -08:00 · 2023-12-06 23:40:30 -08:00 · c8af5e29a8
commit c8af5e29a8
parent c564abdb16
4 changed files with 265 additions and 0 deletions
--- a/spec_files/bluez/0001-valve-bluetooth-config.patch
+++ b/spec_files/bluez/0001-valve-bluetooth-config.patch
@ -0,0 +1,24 @@
+diff --git a/src/main.conf b/src/main.conf
+index 085c81a..ca2abcd 100644
+--- a/src/main.conf
+++ b/src/main.conf
+@@ -60,7 +60,7 @@
+ # or both Multiple Profiles Single Device (MPSD) and Multiple Profiles Multiple
+ # Devices (MPMD) configurations.
+ # Possible values: "off", "single", "multiple"
+-#MultiProfile = off
+MultiProfile = multiple
+ 
+ # Permanently enables the Fast Connectable setting for adapters that
+ # support it. When enabled other devices can connect faster to us,
+@@ -193,8 +193,8 @@
+ 
+ # LE scanning parameters used for passive scanning supporting wake from suspend
+ # scenarios
+-#ScanIntervalSuspend=
+-#ScanWindowSuspend=
+ScanIntervalSuspend=2240
+ScanWindowSuspend=224
+ 
+ # LE scanning parameters used for active scanning supporting discovery
+ # proceedure
--- a/spec_files/bluez/0002-valve-bluetooth-phy.patch
+++ b/spec_files/bluez/0002-valve-bluetooth-phy.patch
@ -0,0 +1,221 @@
+diff --git a/src/adapter.c b/src/adapter.c
+index 8a7c53a..b941559 100644
+--- a/src/adapter.c
+++ b/src/adapter.c
+@@ -86,6 +86,18 @@
+ #define DISTANCE_VAL_INVALID	0x7FFF
+ #define PATHLOSS_MAX		137
+ 
+#define LE_PHY_1M 0x01
+#define LE_PHY_2M 0x02
+#define LE_PHY_CODED 0x04
+
+#define PHYVAL_REQUIRED 0x07ff
+#define PHYVAL_1M_TX (1<<9)
+#define PHYVAL_1M_RX (1<<10)
+#define PHYVAL_2M_TX (1<<11)
+#define PHYVAL_2M_RX (1<<12)
+#define PHYVAL_CODED_TX (1<<13)
+#define PHYVAL_CODED_RX (1<<14)
+
+ /*
+  * These are known security keys that have been compromised.
+  * If this grows or there are needs to be platform specific, it is
+@@ -844,6 +856,36 @@ static bool set_discoverable(struct btd_adapter *adapter, uint8_t mode,
+ 	return false;
+ }
+ 
+static void set_phy_support_complete(uint8_t status, uint16_t length,
+					const void *param, void *user_data)
+{
+	if (status != 0) {
+		struct btd_adapter *adapter = (struct btd_adapter *)user_data;
+
+		btd_error(adapter->dev_id, "PHY setting rejected for %u: %s",
+								adapter->dev_id, mgmt_errstr(status));
+	}
+}
+
+static bool set_phy_support(struct btd_adapter *adapter, uint32_t phy_mask)
+{
+	struct mgmt_cp_set_phy_confguration cp;
+
+	memset(&cp, 0, sizeof(cp));
+	cp.selected_phys = cpu_to_le32(phy_mask | PHYVAL_REQUIRED);
+
+	if (mgmt_send(adapter->mgmt, MGMT_OP_SET_PHY_CONFIGURATION,
+				adapter->dev_id, sizeof(cp), &cp,
+				set_phy_support_complete, (void*)adapter, NULL) > 0)
+		return true;
+
+	btd_error(adapter->dev_id, "Failed to set PHY for index %u",
+							adapter->dev_id);
+
+	return false;
+
+}
+
+ static bool pairable_timeout_handler(gpointer user_data)
+ {
+ 	struct btd_adapter *adapter = user_data;
+@@ -10389,6 +10431,10 @@ static void read_info_complete(uint8_t status, uint16_t length,
+ 	if (btd_adapter_get_powered(adapter))
+ 		adapter_start(adapter);
+ 
+	// Some adapters do not want to accept this before being started/powered.
+	if (btd_opts.phys > 0)
+		set_phy_support(adapter, btd_opts.phys);
+
+ 	return;
+ 
+ failed:
+diff --git a/src/btd.h b/src/btd.h
+index b7e7ebd..2b84f7a 100644
+--- a/src/btd.h
+++ b/src/btd.h
+@@ -151,6 +151,8 @@ struct btd_opts {
+ 	struct btd_advmon_opts	advmon;
+ 
+ 	struct btd_csis csis;
+
+	uint32_t	phys;
+ };
+ 
+ extern struct btd_opts btd_opts;
+diff --git a/src/main.c b/src/main.c
+index cddf139..1f3301b 100644
+--- a/src/main.c
+++ b/src/main.c
+@@ -128,6 +128,7 @@ static const char *le_options[] = {
+ 	"AdvMonAllowlistScanDuration",
+ 	"AdvMonNoFilterScanDuration",
+ 	"EnableAdvMonInterleaveScan",
+	"SupportedPHYs",
+ 	NULL
+ };
+ 
+@@ -182,10 +183,32 @@ static const struct group_table {
+ 	{ }
+ };
+ 
+static const char *conf_phys_str[] = {
+	"BR1M1SLOT",
+	"BR1M3SLOT",
+	"BR1M5SLOT",
+	"EDR2M1SLOT",
+	"EDR2M3SLOT",
+	"EDR2M5SLOT",
+	"EDR3M1SLOT",
+	"EDR3M3SLOT",
+	"EDR3M5SLOT",
+	"LE1MTX",
+	"LE1MRX",
+	"LE2MTX",
+	"LE2MRX",
+	"LECODEDTX",
+	"LECODEDRX",
+};
+
+ #ifndef MIN
+ #define MIN(x, y) ((x) < (y) ? (x) : (y))
+ #endif
+ 
+#ifndef NELEM
+#define NELEM(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+
+ static int8_t check_sirk_alpha_numeric(char *str)
+ {
+ 	int8_t val = 0;
+@@ -226,6 +249,54 @@ static size_t hex2bin(const char *hexstr, uint8_t *buf, size_t buflen)
+ 	return len;
+ }
+ 
+static const char *conf_phys2str(uint32_t phys)
+{
+	static char str[256];
+	unsigned int i;
+	int off;
+
+	off = 0;
+	str[0] = '\0';
+
+	for (i = 0; i < NELEM(conf_phys_str); i++) {
+		if ((phys & (1 << i)) != 0)
+			off += snprintf(str + off, sizeof(str) - off, "%s ",
+							conf_phys_str[i]);
+	}
+
+	return str;
+}
+
+static bool str2phy(const char *phy_str, uint32_t *phy_val)
+{
+	unsigned int i;
+
+	for (i = 0; i < NELEM(conf_phys_str); i++) {
+		if (strcasecmp(conf_phys_str[i], phy_str) == 0) {
+			*phy_val = (1 << i);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+static void btd_parse_phy_list(char **list)
+{
+	uint32_t phys = 0;
+
+	for (int i = 0; list[i]; i++) {
+		uint32_t phy_val;
+
+		info("Enabling PHY option: %s", list[i]);
+
+		if (str2phy(list[i], &phy_val))
+			phys |= phy_val;
+	}
+
+	btd_opts.phys = phys;
+}
+
+ GKeyFile *btd_get_main_conf(void)
+ {
+ 	return main_conf;
+@@ -678,6 +749,20 @@ static void parse_le_config(GKeyFile *config)
+ 		return;
+ 
+ 	parse_mode_config(config, "LE", params, ARRAY_SIZE(params));
+
+	char **strlist;
+	GError *err = NULL;
+	strlist = g_key_file_get_string_list(config, "LE",
+						"SupportedPHYs",
+						NULL, &err);
+	if (err) {
+		DBG("%s", err->message);
+		g_clear_error(&err);
+	}
+	else {
+		btd_parse_phy_list(strlist);
+		g_strfreev(strlist);
+	}
+ }
+ 
+ static bool match_experimental(const void *data, const void *match_data)
+diff --git a/src/main.conf b/src/main.conf
+index ca2abcd..cd535e1 100644
+--- a/src/main.conf
+++ b/src/main.conf
+@@ -231,6 +231,11 @@ ScanWindowSuspend=224
+ # Defaults to 1
+ #EnableAdvMonInterleaveScan=
+ 
+# Which Bluetooth LE PHYs should be enabled/supported?
+# Options are LE1MTX LE1MRX LE2MTX LE2MRX LECODEDTX LECODEDRX
+# Defaults to LE1MTX,LE1MRX
+SupportedPHYs=LE1MTX,LE1MRX,LE2MTX,LE2MRX,LECODEDTX,LECODEDRX
+
+ [GATT]
+ # GATT attribute cache.
+ # Possible values:
--- a/spec_files/bluez/AVRCP_TG_MDI_BV-04-C.patch
+++ b/spec_files/bluez/AVRCP_TG_MDI_BV-04-C.patch
@ -0,0 +1,15 @@
+diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
+index dda9a30..d0ae0a4 100644
+--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
+@@ -1210,6 +1210,10 @@ static GList *player_list_metadata(struct avrcp_player *player)
+ 					GUINT_TO_POINTER(str_to_metadata(key)));
+ 	}
+ 
+	if (attrs == NULL)
+		return g_list_prepend(NULL,
+				GUINT_TO_POINTER(AVRCP_MEDIA_ATTRIBUTE_TITLE));
+
+ 	return attrs;
+ }
+ 
--- a/spec_files/bluez/bluez.spec
+++ b/spec_files/bluez/bluez.spec
@ -23,6 +23,11 @@ Patch2: power-state-adapter-property.patch
 # https://github.com/bluez/bluez/commit/3a9c637010f8dc1ba3e8382abe01065761d4f5bb
 Patch3: controllers.patch

+# Valve
+Patch4: AVRCP_TG_MDI_BV-04-C.patch
+Patch5: 0001-valve-bluetooth-config.patch
+Patch6: 0002-valve-bluetooth-phy.patch
+
 BuildRequires: dbus-devel >= 1.6
 BuildRequires: glib2-devel
 BuildRequires: libell-devel >= 0.37