Skip to content

Commit d1ab264

Browse files
kuba-moodavem330
authored andcommitted
Revert "net: wwan: iosm: firmware flashing and coredump collection"
The devlink parameters are not the right mechanism to pass extra parameters to device flashing. The params added are also undocumented. This reverts commit 13bb842 ("net: wwan: iosm: firmware flashing and coredump collection"). Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 63f85c4 commit d1ab264

14 files changed

+31
-2054
lines changed

drivers/net/wwan/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ config RPMSG_WWAN_CTRL
7171
config IOSM
7272
tristate "IOSM Driver for Intel M.2 WWAN Device"
7373
depends on INTEL_IOMMU
74-
select NET_DEVLINK
7574
help
7675
This driver enables Intel M.2 WWAN Device communication.
7776

drivers/net/wwan/iosm/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ iosm-y = \
1818
iosm_ipc_protocol.o \
1919
iosm_ipc_protocol_ops.o \
2020
iosm_ipc_mux.o \
21-
iosm_ipc_mux_codec.o \
22-
iosm_ipc_devlink.o \
23-
iosm_ipc_flash.o \
24-
iosm_ipc_coredump.o
21+
iosm_ipc_mux_codec.o
2522

2623
obj-$(CONFIG_IOSM) := iosm.o

drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "iosm_ipc_chnl_cfg.h"
99

1010
/* Max. sizes of a downlink buffers */
11-
#define IPC_MEM_MAX_DL_FLASH_BUF_SIZE (64 * 1024)
11+
#define IPC_MEM_MAX_DL_FLASH_BUF_SIZE (16 * 1024)
1212
#define IPC_MEM_MAX_DL_LOOPBACK_SIZE (1 * 1024 * 1024)
1313
#define IPC_MEM_MAX_DL_AT_BUF_SIZE 2048
1414
#define IPC_MEM_MAX_DL_RPC_BUF_SIZE (32 * 1024)
@@ -60,10 +60,6 @@ static struct ipc_chnl_cfg modem_cfg[] = {
6060
{ IPC_MEM_CTRL_CHL_ID_6, IPC_MEM_PIPE_12, IPC_MEM_PIPE_13,
6161
IPC_MEM_MAX_TDS_MBIM, IPC_MEM_MAX_TDS_MBIM,
6262
IPC_MEM_MAX_DL_MBIM_BUF_SIZE, WWAN_PORT_MBIM },
63-
/* Flash Channel/Coredump Channel */
64-
{ IPC_MEM_CTRL_CHL_ID_7, IPC_MEM_PIPE_0, IPC_MEM_PIPE_1,
65-
IPC_MEM_MAX_TDS_FLASH_UL, IPC_MEM_MAX_TDS_FLASH_DL,
66-
IPC_MEM_MAX_DL_FLASH_BUF_SIZE, WWAN_PORT_UNKNOWN },
6763
};
6864

6965
int ipc_chnl_cfg_get(struct ipc_chnl_cfg *chnl_cfg, int index)

drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ enum ipc_channel_id {
2323
IPC_MEM_CTRL_CHL_ID_4,
2424
IPC_MEM_CTRL_CHL_ID_5,
2525
IPC_MEM_CTRL_CHL_ID_6,
26-
IPC_MEM_CTRL_CHL_ID_7,
2726
};
2827

2928
/**

drivers/net/wwan/iosm/iosm_ipc_coredump.c

Lines changed: 0 additions & 110 deletions
This file was deleted.

drivers/net/wwan/iosm/iosm_ipc_coredump.h

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)