Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acebb475 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.245 into android11-5.4-lts 



Changes in 5.4.245
	cdc_ncm: Implement the 32-bit version of NCM Transfer Block
	net: cdc_ncm: Deal with too low values of dwNtbOutMaxSize
	power: supply: bq27xxx: After charger plug in/out wait 0.5s for things to stabilize
	power: supply: core: Refactor power_supply_set_input_current_limit_from_supplier()
	power: supply: bq24190: Call power_supply_changed() after updating input current
	fs: fix undefined behavior in bit shift for SB_NOUSER
	net/mlx5: devcom only supports 2 ports
	net/mlx5: Devcom, serialize devcom registration
	cdc_ncm: Fix the build warning
	io_uring: always grab lock in io_cancel_async_work()
	io_uring: don't drop completion lock before timer is fully initialized
	io_uring: have io_kill_timeout() honor the request references
	bluetooth: Add cmd validity checks at the start of hci_sock_ioctl()
	binder: fix UAF caused by faulty buffer cleanup
	ipv{4,6}/raw: fix output xfrm lookup wrt protocol
	netfilter: ctnetlink: Support offloaded conntrack entry deletion
	Linux 5.4.245

Change-Id: I25e786ed304f80b6ccb3896a8b8d2f16384f0cd6
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b5d7df0c cf0b1e54

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 244

SUBLEVEL = 245

EXTRAVERSION =

NAME = Kleptomaniac Octopus

drivers/net/ethernet/mellanox/mlx5/core/lib/devcom.c

+23 −12
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/mlx5/vport.h>

#include "lib/devcom.h"

#include "mlx5_core.h"



static LIST_HEAD(devcom_list);
@@ -14,7 +15,7 @@ static LIST_HEAD(devcom_list); 
struct mlx5_devcom_component {

	struct {

		void *data;

	} device[MLX5_MAX_PORTS];

	} device[MLX5_DEVCOM_PORTS_SUPPORTED];



	mlx5_devcom_event_handler_t handler;

	struct rw_semaphore sem;
@@ -25,7 +26,7 @@ struct mlx5_devcom_list { 
	struct list_head list;



	struct mlx5_devcom_component components[MLX5_DEVCOM_NUM_COMPONENTS];

	struct mlx5_core_dev *devs[MLX5_MAX_PORTS];

	struct mlx5_core_dev *devs[MLX5_DEVCOM_PORTS_SUPPORTED];

};



struct mlx5_devcom {
@@ -74,13 +75,16 @@ struct mlx5_devcom *mlx5_devcom_register_device(struct mlx5_core_dev *dev) 


	if (!mlx5_core_is_pf(dev))

		return NULL;

	if (MLX5_CAP_GEN(dev, num_lag_ports) != MLX5_DEVCOM_PORTS_SUPPORTED)

		return NULL;



	mlx5_dev_list_lock();

	sguid0 = mlx5_query_nic_system_image_guid(dev);

	list_for_each_entry(iter, &devcom_list, list) {

		struct mlx5_core_dev *tmp_dev = NULL;



		idx = -1;

		for (i = 0; i < MLX5_MAX_PORTS; i++) {

		for (i = 0; i < MLX5_DEVCOM_PORTS_SUPPORTED; i++) {

			if (iter->devs[i])

				tmp_dev = iter->devs[i];

			else
@@ -100,8 +104,10 @@ struct mlx5_devcom *mlx5_devcom_register_device(struct mlx5_core_dev *dev) 


	if (!priv) {

		priv = mlx5_devcom_list_alloc();

		if (!priv)

			return ERR_PTR(-ENOMEM);

		if (!priv) {

			devcom = ERR_PTR(-ENOMEM);

			goto out;

		}



		idx = 0;

		new_priv = true;
@@ -112,12 +118,14 @@ struct mlx5_devcom *mlx5_devcom_register_device(struct mlx5_core_dev *dev) 
	if (!devcom) {

		if (new_priv)

			kfree(priv);

		return ERR_PTR(-ENOMEM);

		devcom = ERR_PTR(-ENOMEM);

		goto out;

	}



	if (new_priv)

		list_add(&priv->list, &devcom_list);



out:

	mlx5_dev_list_unlock();

	return devcom;

}
@@ -130,20 +138,23 @@ void mlx5_devcom_unregister_device(struct mlx5_devcom *devcom) 
	if (IS_ERR_OR_NULL(devcom))

		return;



	mlx5_dev_list_lock();

	priv = devcom->priv;

	priv->devs[devcom->idx] = NULL;



	kfree(devcom);



	for (i = 0; i < MLX5_MAX_PORTS; i++)

	for (i = 0; i < MLX5_DEVCOM_PORTS_SUPPORTED; i++)

		if (priv->devs[i])

			break;



	if (i != MLX5_MAX_PORTS)

		return;

	if (i != MLX5_DEVCOM_PORTS_SUPPORTED)

		goto out;



	list_del(&priv->list);

	kfree(priv);

out:

	mlx5_dev_list_unlock();

}



void mlx5_devcom_register_component(struct mlx5_devcom *devcom,
@@ -192,7 +203,7 @@ int mlx5_devcom_send_event(struct mlx5_devcom *devcom, 


	comp = &devcom->priv->components[id];

	down_write(&comp->sem);

	for (i = 0; i < MLX5_MAX_PORTS; i++)

	for (i = 0; i < MLX5_DEVCOM_PORTS_SUPPORTED; i++)

		if (i != devcom->idx && comp->device[i].data) {

			err = comp->handler(event, comp->device[i].data,

					    event_data);
@@ -240,7 +251,7 @@ void *mlx5_devcom_get_peer_data(struct mlx5_devcom *devcom, 
		return NULL;

	}



	for (i = 0; i < MLX5_MAX_PORTS; i++)

	for (i = 0; i < MLX5_DEVCOM_PORTS_SUPPORTED; i++)

		if (i != devcom->idx)

			break;

drivers/net/ethernet/mellanox/mlx5/core/lib/devcom.h

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 


#include <linux/mlx5/driver.h>



#define MLX5_DEVCOM_PORTS_SUPPORTED 2



enum mlx5_devcom_components {

	MLX5_DEVCOM_ESW_OFFLOADS,

drivers/net/usb/cdc_ncm.c

+339 −96

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/usb/huawei_cdc_ncm.c

+4 −4
Original line number Diff line number Diff line
@@ -77,11 +77,11 @@ static int huawei_cdc_ncm_bind(struct usbnet *usbnet_dev, 
	 */

	drvflags |= CDC_NCM_FLAG_NDP_TO_END;



	/* Additionally, it has been reported that some Huawei E3372H devices, with

	 * firmware version 21.318.01.00.541, come out of reset in NTB32 format mode, hence

	 * needing to be set to the NTB16 one again.

	/* For many Huawei devices the NTB32 mode is the default and the best mode

	 * they work with. Huawei E5785 and E5885 devices refuse to work in NTB16 mode at all.

	 */

	drvflags |= CDC_NCM_FLAG_RESET_NTB16;

	drvflags |= CDC_NCM_FLAG_PREFER_NTB32;



	ret = cdc_ncm_bind_common(usbnet_dev, intf, 1, drvflags);

	if (ret)

		goto err;