Commit 5d041588 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'wwan-iosm-fixes' 



M Chetan Kumar says:

====================
net: wwan: iosm: fixes

This patch series contains iosm fixes.

PATCH1: Fix memory leak in ipc_pcie_read_bios_cfg.

PATCH2: Fix driver not working with INTEL_IOMMU disabled config.

PATCH3: Fix invalid mux header type.

PATCH4: Fix kernel build robot reported errors.

Please refer to individual commit message for details.

--
v2:
 * PATCH1: No Change
 * PATCH2: Kconfig change
           - Add dependency on PCI to resolve kernel build robot errors.
 * PATCH3: No Change
 * PATCH4: New (Fix kernel build robot errors)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 742c60e1 980ec04a

drivers/net/wwan/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ config RPMSG_WWAN_CTRL 


config IOSM

	tristate "IOSM Driver for Intel M.2 WWAN Device"

	depends on INTEL_IOMMU

	depends on PCI

	select NET_DEVLINK

	select RELAY if WWAN_DEBUGFS

	help

drivers/net/wwan/iosm/iosm_ipc_coredump.c

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/*

 * Copyright (C) 2020-2021 Intel Corporation.

 */

#include <linux/vmalloc.h>



#include "iosm_ipc_coredump.h"

drivers/net/wwan/iosm/iosm_ipc_devlink.c

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/*

 * Copyright (C) 2020-2021 Intel Corporation.

 */

#include <linux/vmalloc.h>



#include "iosm_ipc_chnl_cfg.h"

#include "iosm_ipc_coredump.h"

drivers/net/wwan/iosm/iosm_ipc_imem_ops.c

+8 −0
Original line number Diff line number Diff line
@@ -91,6 +91,14 @@ void ipc_imem_wwan_channel_init(struct iosm_imem *ipc_imem, 
	}



	ipc_chnl_cfg_get(&chnl_cfg, ipc_imem->nr_of_channels);



	if (ipc_imem->mmio->mux_protocol == MUX_AGGREGATION &&

	    ipc_imem->nr_of_channels == IPC_MEM_IP_CHL_ID_0) {

		chnl_cfg.ul_nr_of_entries = IPC_MEM_MAX_TDS_MUX_AGGR_UL;

		chnl_cfg.dl_nr_of_entries = IPC_MEM_MAX_TDS_MUX_AGGR_DL;

		chnl_cfg.dl_buf_size = IPC_MEM_MAX_ADB_BUF_SIZE;

	}



	ipc_imem_channel_init(ipc_imem, IPC_CTYPE_WWAN, chnl_cfg,

			      IRQ_MOD_OFF);

drivers/net/wwan/iosm/iosm_ipc_mux.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#define IPC_MEM_MAX_UL_DG_ENTRIES	100

#define IPC_MEM_MAX_TDS_MUX_AGGR_UL	60

#define IPC_MEM_MAX_TDS_MUX_AGGR_DL	60



#define IPC_MEM_MAX_ADB_BUF_SIZE (16 * 1024)

#define IPC_MEM_MAX_UL_ADB_BUF_SIZE IPC_MEM_MAX_ADB_BUF_SIZE