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

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

Merge 5.4.130 into android11-5.4-lts 



Changes in 5.4.130
	x86/efi: remove unused variables
	scsi: sr: Return appropriate error code when disk is ejected
	drm/nouveau: fix dma_address check for CPU/GPU sync
	gpio: AMD8111 and TQMX86 require HAS_IOPORT_MAP
	RDMA/mlx5: Block FDB rules when not in switchdev mode
	Linux 5.4.130

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I81aa4b6d954afeda3fe6971a5611547db6b9fb7a
parents 904c2c6c 8b24c7ed

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 129

SUBLEVEL = 130

EXTRAVERSION =

NAME = Kleptomaniac Octopus

drivers/gpio/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1232,6 +1232,7 @@ config GPIO_TPS68470 
config GPIO_TQMX86

	tristate "TQ-Systems QTMX86 GPIO"

	depends on MFD_TQMX86 || COMPILE_TEST

	depends on HAS_IOPORT_MAP

	select GPIOLIB_IRQCHIP

	help

	  This driver supports GPIO on the TQMX86 IO controller.
@@ -1299,6 +1300,7 @@ menu "PCI GPIO expanders" 
config GPIO_AMD8111

	tristate "AMD 8111 GPIO driver"

	depends on X86 || COMPILE_TEST

	depends on HAS_IOPORT_MAP

	help

	  The AMD 8111 south bridge contains 32 GPIO pins which can be used.

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo) 
	struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;

	int i;



	if (!ttm_dma)

	if (!ttm_dma || !ttm_dma->dma_address)

		return;



	/* Don't waste time looping if the object is coherent */
@@ -562,7 +562,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) 
	struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;

	int i;



	if (!ttm_dma)

	if (!ttm_dma || !ttm_dma->dma_address)

		return;



	/* Don't waste time looping if the object is coherent */

drivers/infiniband/hw/mlx5/flow.c

+8 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <rdma/ib_umem.h>

#include <linux/mlx5/driver.h>

#include <linux/mlx5/fs.h>

#include <linux/mlx5/eswitch.h>

#include "mlx5_ib.h"



#define UVERBS_MODULE_NAME mlx5_ib
@@ -316,6 +317,13 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_MATCHER_CREATE)( 
	if (err)

		goto end;



	if (obj->ns_type == MLX5_FLOW_NAMESPACE_FDB &&

	    mlx5_eswitch_mode(dev->mdev->priv.eswitch) !=

			      MLX5_ESWITCH_OFFLOADS) {

		err = -EINVAL;

		goto end;

	}



	uobj->object = obj;

	obj->mdev = dev->mdev;

	atomic_set(&obj->usecnt, 0);

drivers/scsi/sr.c

+2 −0
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ static unsigned int sr_get_events(struct scsi_device *sdev) 
		return DISK_EVENT_EJECT_REQUEST;

	else if (med->media_event_code == 2)

		return DISK_EVENT_MEDIA_CHANGE;

	else if (med->media_event_code == 3)

		return DISK_EVENT_EJECT_REQUEST;

	return 0;

}