Commit 0dd5dd63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Paolo Abeni:
 "Including fixes from bluetooth, wireless and netfilter.

  No known outstanding regressions.

  Current release - regressions:

   - wifi: iwlwifi: fix hibernation

   - eth: ionic: prevent tx_timeout due to frequent doorbell ringing

  Previous releases - regressions:

   - sched: fix sch_fq incorrect behavior for small weights

   - wifi:
      - iwlwifi: take the mutex before running link selection
      - wfx: repair open network AP mode

   - netfilter: restore IP sanity checks for netdev/egress

   - tcp: fix forever orphan socket caused by tcp_abort

   - mptcp: close subflow when receiving TCP+FIN

   - bluetooth: fix random crash seen while removing btnxpuart driver

  Previous releases - always broken:

   - mptcp: more fixes for the in-kernel PM

   - eth: bonding: change ipsec_lock from spin lock to mutex

   - eth: mana: fix race of mana_hwc_post_rx_wqe and new hwc response

  Misc:

   - documentation: drop special comment style for net code"

* tag 'net-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (57 commits)
  nfc: pn533: Add poll mod list filling check
  mailmap: update entry for Sriram Yagnaraman
  selftests: mptcp: join: check re-re-adding ID 0 signal
  mptcp: pm: ADD_ADDR 0 is not a new address
  selftests: mptcp: join: validate event numbers
  mptcp: avoid duplicated SUB_CLOSED events
  selftests: mptcp: join: check re-re-adding ID 0 endp
  mptcp: pm: fix ID 0 endp usage after multiple re-creations
  mptcp: pm: do not remove already closed subflows
  selftests: mptcp: join: no extra msg if no counter
  selftests: mptcp: join: check re-adding init endp with != id
  mptcp: pm: reset MPC endp ID when re-added
  mptcp: pm: skip connecting to already established sf
  mptcp: pm: send ACK on an active subflow
  selftests: mptcp: join: check removing ID 0 endpoint
  mptcp: pm: fix RM_ADDR ID for the initial subflow
  mptcp: pm: reuse ID 0 after delete and re-add
  net: busy-poll: use ktime_get_ns() instead of local_clock()
  sctp: fix association labeling in the duplicate COOKIE-ECHO case
  mptcp: pr_debug: add missing \n at the end
  ...
parents d5d547aa febccb39

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ Simon Kelley <simon@thekelleys.org.uk> 
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>

Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>

Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>

Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>

Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>

Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Documentation/process/coding-style.rst

+0 −12
Original line number Diff line number Diff line
@@ -629,18 +629,6 @@ The preferred style for long (multi-line) comments is: 
	 * with beginning and ending almost-blank lines.

	 */



For files in net/ and drivers/net/ the preferred style for long (multi-line)

comments is a little different.



.. code-block:: c



	/* The preferred comment style for files in net/ and drivers/net

	 * looks like this.

	 *

	 * It is nearly the same as the generally preferred comment style,

	 * but there is no initial almost-blank line.

	 */



It's also important to comment data, whether they are basic types or derived

types.  To this end, use just one data declaration per line (no commas for

multiple data declarations).  This leaves you room for a small comment on each

Documentation/process/maintainer-netdev.rst

+0 −17
Original line number Diff line number Diff line
@@ -355,23 +355,6 @@ just do it. As a result, a sequence of smaller series gets merged quicker and 
with better review coverage. Re-posting large series also increases the mailing

list traffic.



Multi-line comments

~~~~~~~~~~~~~~~~~~~



Comment style convention is slightly different for networking and most of

the tree.  Instead of this::



  /*

   * foobar blah blah blah

   * another line of text

   */



it is requested that you make it look like this::



  /* foobar blah blah blah

   * another line of text

   */



Local variable ordering ("reverse xmas tree", "RCS")

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

drivers/bluetooth/btintel.c

+124 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/acpi.h>

#include <acpi/acpi_bus.h>

#include <asm/unaligned.h>

#include <linux/efi.h>



#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>
@@ -26,6 +27,8 @@ 
#define ECDSA_OFFSET		644

#define ECDSA_HEADER_LEN	320



#define BTINTEL_EFI_DSBR	L"UefiCnvCommonDSBR"



enum {

	DSM_SET_WDISABLE2_DELAY = 1,

	DSM_SET_RESET_METHOD = 3,
@@ -2616,6 +2619,120 @@ static u8 btintel_classify_pkt_type(struct hci_dev *hdev, struct sk_buff *skb) 
	return hci_skb_pkt_type(skb);

}



/*

 * UefiCnvCommonDSBR UEFI variable provides information from the OEM platforms

 * if they have replaced the BRI (Bluetooth Radio Interface) resistor to

 * overcome the potential STEP errors on their designs. Based on the

 * configauration, bluetooth firmware shall adjust the BRI response line drive

 * strength. The below structure represents DSBR data.

 * struct {

 *	u8 header;

 *	u32 dsbr;

 * } __packed;

 *

 * header - defines revision number of the structure

 * dsbr - defines drive strength BRI response

 *	bit0

 *		0 - instructs bluetooth firmware to use default values

 *		1 - instructs bluetooth firmware to override default values

 *	bit3:1

 *		Reserved

 *	bit7:4

 *		DSBR override values (only if bit0 is set. Default value is 0xF

 *	bit31:7

 *		Reserved

 * Expected values for dsbr field:

 *	1. 0xF1 - indicates that the resistor on board is 33 Ohm

 *	2. 0x00 or 0xB1 - indicates that the resistor on board is 10 Ohm

 *	3. Non existing UEFI variable or invalid (none of the above) - indicates

 *	   that the resistor on board is 10 Ohm

 * Even if uefi variable is not present, driver shall send 0xfc0a command to

 * firmware to use default values.

 *

 */

static int btintel_uefi_get_dsbr(u32 *dsbr_var)

{

	struct btintel_dsbr {

		u8 header;

		u32 dsbr;

	} __packed data;



	efi_status_t status;

	unsigned long data_size = 0;

	efi_guid_t guid = EFI_GUID(0xe65d8884, 0xd4af, 0x4b20, 0x8d, 0x03,

				   0x77, 0x2e, 0xcc, 0x3d, 0xa5, 0x31);



	if (!IS_ENABLED(CONFIG_EFI))

		return -EOPNOTSUPP;



	if (!efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE))

		return -EOPNOTSUPP;



	status = efi.get_variable(BTINTEL_EFI_DSBR, &guid, NULL, &data_size,

				  NULL);



	if (status != EFI_BUFFER_TOO_SMALL || !data_size)

		return -EIO;



	status = efi.get_variable(BTINTEL_EFI_DSBR, &guid, NULL, &data_size,

				  &data);



	if (status != EFI_SUCCESS)

		return -ENXIO;



	*dsbr_var = data.dsbr;

	return 0;

}



static int btintel_set_dsbr(struct hci_dev *hdev, struct intel_version_tlv *ver)

{

	struct btintel_dsbr_cmd {

		u8 enable;

		u8 dsbr;

	} __packed;



	struct btintel_dsbr_cmd cmd;

	struct sk_buff *skb;

	u8 status;

	u32 dsbr;

	bool apply_dsbr;

	int err;



	/* DSBR command needs to be sent for BlazarI + B0 step product after

	 * downloading IML image.

	 */

	apply_dsbr = (ver->img_type == BTINTEL_IMG_IML &&

		((ver->cnvi_top & 0xfff) == BTINTEL_CNVI_BLAZARI) &&

		INTEL_CNVX_TOP_STEP(ver->cnvi_top) == 0x01);



	if (!apply_dsbr)

		return 0;



	dsbr = 0;

	err = btintel_uefi_get_dsbr(&dsbr);

	if (err < 0)

		bt_dev_dbg(hdev, "Error reading efi: %ls  (%d)",

			   BTINTEL_EFI_DSBR, err);



	cmd.enable = dsbr & BIT(0);

	cmd.dsbr = dsbr >> 4 & 0xF;



	bt_dev_info(hdev, "dsbr: enable: 0x%2.2x value: 0x%2.2x", cmd.enable,

		    cmd.dsbr);



	skb = __hci_cmd_sync(hdev, 0xfc0a, sizeof(cmd), &cmd,  HCI_CMD_TIMEOUT);

	if (IS_ERR(skb))

		return -bt_to_errno(PTR_ERR(skb));



	status = skb->data[0];

	kfree_skb(skb);



	if (status)

		return -bt_to_errno(status);



	return 0;

}



int btintel_bootloader_setup_tlv(struct hci_dev *hdev,

				 struct intel_version_tlv *ver)

{
@@ -2650,6 +2767,13 @@ int btintel_bootloader_setup_tlv(struct hci_dev *hdev, 
	if (err)

		return err;



	/* set drive strength of BRI response */

	err = btintel_set_dsbr(hdev, ver);

	if (err) {

		bt_dev_err(hdev, "Failed to send dsbr command (%d)", err);

		return err;

	}



	/* If image type returned is BTINTEL_IMG_IML, then controller supports

	 * intermediate loader image

	 */

drivers/bluetooth/btnxpuart.c

+18 −2
Original line number Diff line number Diff line
@@ -449,6 +449,23 @@ static bool ps_wakeup(struct btnxpuart_dev *nxpdev) 
	return false;

}



static void ps_cleanup(struct btnxpuart_dev *nxpdev)

{

	struct ps_data *psdata = &nxpdev->psdata;

	u8 ps_state;



	mutex_lock(&psdata->ps_lock);

	ps_state = psdata->ps_state;

	mutex_unlock(&psdata->ps_lock);



	if (ps_state != PS_STATE_AWAKE)

		ps_control(psdata->hdev, PS_STATE_AWAKE);



	ps_cancel_timer(nxpdev);

	cancel_work_sync(&psdata->work);

	mutex_destroy(&psdata->ps_lock);

}



static int send_ps_cmd(struct hci_dev *hdev, void *data)

{

	struct btnxpuart_dev *nxpdev = hci_get_drvdata(hdev);
@@ -1363,7 +1380,6 @@ static int btnxpuart_close(struct hci_dev *hdev) 
{

	struct btnxpuart_dev *nxpdev = hci_get_drvdata(hdev);



	ps_wakeup(nxpdev);

	serdev_device_close(nxpdev->serdev);

	skb_queue_purge(&nxpdev->txq);

	if (!IS_ERR_OR_NULL(nxpdev->rx_skb)) {
@@ -1516,8 +1532,8 @@ static void nxp_serdev_remove(struct serdev_device *serdev) 
			nxpdev->new_baudrate = nxpdev->fw_init_baudrate;

			nxp_set_baudrate_cmd(hdev, NULL);

		}

		ps_cancel_timer(nxpdev);

	}

	ps_cleanup(nxpdev);

	hci_unregister_dev(hdev);

	hci_free_dev(hdev);

}