Bluetooth: revert TX timestamping

JIRA: https://issues.redhat.com/browse/RHEL-107923

Upstream Status: RHEL-only

    The following upstream commits:
        134f4b3  Bluetooth: add support for skb TX SND/COMPLETION timestamping
        d415ba2  Bluetooth: ISO: add TX timestamping
        11770f4  Bluetooth: L2CAP: add TX timestamping
        bdbcd52  Bluetooth: SCO: add TX timestamping
        c174cd0  Bluetooth: increment TX timestamping tskey always for stream sockets
        3908feb  Bluetooth: L2CAP: copy RX timestamp to new fragments
	dd0ccf8  Bluetooth: add support for SIOCETHTOOL ETHTOOL_GET_TS_INFO
	ee3e420  Bluetooth: btmtksdio: Fix wakeup source leaks on device unbind
	ba6535e  Bluetooth: btmrvl_sdio: Fix wakeup source leaks on device unbind
    require commits that are not yet part of the Common Network Backport, but
    are scheduled to be included in RHEL-9.8, so temporarily remove them so
    the Bluetooth rebase build can be completed.

    reference: https://issues.redhat.com/browse/RHEL-101337
       CNB98: net_tstamp: add SCM_TS_OPT_ID to provide OPT_ID in control message

    Note - These commits were reverted at the end rather than being omitted,
           since they impact the context of later commits in the rebase.
           Once RHEL-101337 is merged, this can be reverted.

Signed-off-by: David Marlin <dmarlin@redhat.com>

Author: damarlin

drivers/bluetooth/btmrvl_sdio.c

@@ -100,9 +100,7 @@ static int btmrvl_sdio_probe_of(struct device *dev,
 			}
 
 			/* Configure wakeup (enabled by default) */
-			ret = devm_device_init_wakeup(dev);
-			if (ret)
-				return dev_err_probe(dev, ret, "Failed to init wakeup\n");
+			device_init_wakeup(dev, true);
 		}
 	}
 

drivers/bluetooth/btmtksdio.c

@@ -1419,7 +1419,7 @@ static int btmtksdio_probe(struct sdio_func *func,
 	 */
 	pm_runtime_put_noidle(bdev->dev);
 
-	err = devm_device_init_wakeup(bdev->dev);
+	err = device_init_wakeup(bdev->dev, true);
 	if (err)
 		bt_dev_err(hdev, "failed to initialize device wakeup");
 

include/net/bluetooth/bluetooth.h

@@ -29,7 +29,6 @@
 #include <linux/poll.h>
 #include <net/sock.h>
 #include <linux/seq_file.h>
-#include <linux/ethtool.h>
 
 #define BT_SUBSYS_VERSION	2
 #define BT_SUBSYS_REVISION	22
@@ -157,7 +156,6 @@ struct bt_voice {
 #define BT_PKT_STATUS           16
 
 #define BT_SCM_PKT_STATUS	0x03
-#define BT_SCM_ERROR		0x04
 
 #define BT_ISO_QOS		17
 
@@ -449,9 +447,6 @@ void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status,
 			  hci_req_complete_t *req_complete,
 			  hci_req_complete_skb_t *req_complete_skb);
 
-int hci_ethtool_ts_info(unsigned int index, int sk_proto,
-			struct kernel_ethtool_ts_info *ts_info);
-
 #define HCI_REQ_START	BIT(0)
 #define HCI_REQ_SKB	BIT(1)
 

include/net/bluetooth/hci_core.h

@@ -266,12 +266,6 @@ struct adv_info {
 	struct delayed_work	rpa_expired_cb;
 };
 
-struct tx_queue {
-	struct sk_buff_head queue;
-	unsigned int extra;
-	unsigned int tracked;
-};
-
 #define HCI_MAX_ADV_INSTANCES		5
 #define HCI_DEFAULT_ADV_DURATION	2
 
@@ -752,8 +746,6 @@ struct hci_conn {
 	struct sk_buff_head data_q;
 	struct list_head chan_list;
 
-	struct tx_queue tx_q;
-
 	struct delayed_work disc_work;
 	struct delayed_work auto_accept_work;
 	struct delayed_work idle_work;
@@ -1606,18 +1598,6 @@ void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active);
 void hci_conn_failed(struct hci_conn *conn, u8 status);
 u8 hci_conn_set_handle(struct hci_conn *conn, u16 handle);
 
-void hci_conn_tx_queue(struct hci_conn *conn, struct sk_buff *skb);
-void hci_conn_tx_dequeue(struct hci_conn *conn);
-void hci_setup_tx_timestamp(struct sk_buff *skb, size_t key_offset,
-			    const struct sockcm_cookie *sockc);
-
-static inline void hci_sockcm_init(struct sockcm_cookie *sockc, struct sock *sk)
-{
-	*sockc = (struct sockcm_cookie) {
-		.tsflags = READ_ONCE(sk->sk_tsflags),
-	};
-}
-
 /*
  * hci_conn_get() and hci_conn_put() are used to control the life-time of an
  * "hci_conn" object. They do not guarantee that the hci_conn object is running,

include/net/bluetooth/l2cap.h

@@ -955,8 +955,7 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason);
 int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
 		       bdaddr_t *dst, u8 dst_type, u16 timeout);
 int l2cap_chan_reconfigure(struct l2cap_chan *chan, __u16 mtu);
-int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
-		    const struct sockcm_cookie *sockc);
+int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len);
 void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
 void l2cap_chan_rx_avail(struct l2cap_chan *chan, ssize_t rx_avail);
 int l2cap_chan_check_security(struct l2cap_chan *chan, bool initiator);

net/bluetooth/6lowpan.c

@@ -443,7 +443,7 @@ static int send_pkt(struct l2cap_chan *chan, struct sk_buff *skb,
 	memset(&msg, 0, sizeof(msg));
 	iov_iter_kvec(&msg.msg_iter, ITER_SOURCE, &iv, 1, skb->len);
 
-	err = l2cap_chan_send(chan, &msg, skb->len, NULL);
+	err = l2cap_chan_send(chan, &msg, skb->len);
 	if (err > 0) {
 		netdev->stats.tx_bytes += err;
 		netdev->stats.tx_packets++;

net/bluetooth/af_bluetooth.c

@@ -34,9 +34,6 @@
 #include <net/bluetooth/bluetooth.h>
 #include <linux/proc_fs.h>
 
-#include <linux/ethtool.h>
-#include <linux/sockios.h>
-
 #include "leds.h"
 #include "selftest.h"
 
@@ -566,86 +563,6 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock,
 }
 EXPORT_SYMBOL(bt_sock_poll);
 
-static int bt_ethtool_get_ts_info(struct sock *sk, unsigned int index,
-				  void __user *useraddr)
-{
-	struct ethtool_ts_info info;
-	struct kernel_ethtool_ts_info ts_info = {};
-	int ret;
-
-	ret = hci_ethtool_ts_info(index, sk->sk_protocol, &ts_info);
-	if (ret == -ENODEV)
-		return ret;
-	else if (ret < 0)
-		return -EIO;
-
-	memset(&info, 0, sizeof(info));
-
-	info.cmd = ETHTOOL_GET_TS_INFO;
-	info.so_timestamping = ts_info.so_timestamping;
-	info.phc_index = ts_info.phc_index;
-	info.tx_types = ts_info.tx_types;
-	info.rx_filters = ts_info.rx_filters;
-
-	if (copy_to_user(useraddr, &info, sizeof(info)))
-		return -EFAULT;
-
-	return 0;
-}
-
-static int bt_ethtool(struct sock *sk, const struct ifreq *ifr,
-		      void __user *useraddr)
-{
-	unsigned int index;
-	u32 ethcmd;
-	int n;
-
-	if (copy_from_user(&ethcmd, useraddr, sizeof(ethcmd)))
-		return -EFAULT;
-
-	if (sscanf(ifr->ifr_name, "hci%u%n", &index, &n) != 1 ||
-	    n != strlen(ifr->ifr_name))
-		return -ENODEV;
-
-	switch (ethcmd) {
-	case ETHTOOL_GET_TS_INFO:
-		return bt_ethtool_get_ts_info(sk, index, useraddr);
-	}
-
-	return -EOPNOTSUPP;
-}
-
-static int bt_dev_ioctl(struct socket *sock, unsigned int cmd, void __user *arg)
-{
-	struct sock *sk = sock->sk;
-	struct ifreq ifr = {};
-	void __user *data;
-	char *colon;
-	int ret = -ENOIOCTLCMD;
-
-	if (get_user_ifreq(&ifr, &data, arg))
-		return -EFAULT;
-
-	ifr.ifr_name[IFNAMSIZ - 1] = 0;
-	colon = strchr(ifr.ifr_name, ':');
-	if (colon)
-		*colon = 0;
-
-	switch (cmd) {
-	case SIOCETHTOOL:
-		ret = bt_ethtool(sk, &ifr, data);
-		break;
-	}
-
-	if (colon)
-		*colon = ':';
-
-	if (put_user_ifreq(&ifr, arg))
-		return -EFAULT;
-
-	return ret;
-}
-
 int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
 	struct sock *sk = sock->sk;
@@ -678,10 +595,6 @@ int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 		err = put_user(amount, (int __user *)arg);
 		break;
 
-	case SIOCETHTOOL:
-		err = bt_dev_ioctl(sock, cmd, (void __user *)arg);
-		break;
-
 	default:
 		err = -ENOIOCTLCMD;
 		break;