diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-09-15 14:58:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-09-16 14:32:53 +0100 |
| commit | d1ab2647de3272e878604720ac0af66442e8d1d3 (patch) | |
| tree | 93eb8b63d72be96c126faa5a1257a72c05e71851 /drivers/net/wwan/iosm/iosm_ipc_imem.h | |
| parent | 63f85c401ebaa62094c373c780d4051a84608ac3 (diff) | |
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 13bb8429ca98 ("net: wwan: iosm: firmware
flashing and coredump collection").
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wwan/iosm/iosm_ipc_imem.h')
| -rw-r--r-- | drivers/net/wwan/iosm/iosm_ipc_imem.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/net/wwan/iosm/iosm_ipc_imem.h b/drivers/net/wwan/iosm/iosm_ipc_imem.h index 6be6708b4eec..dc65b0712261 100644 --- a/drivers/net/wwan/iosm/iosm_ipc_imem.h +++ b/drivers/net/wwan/iosm/iosm_ipc_imem.h @@ -69,7 +69,7 @@ struct ipc_chnl_cfg; #define IMEM_IRQ_DONT_CARE (-1) -#define IPC_MEM_MAX_CHANNELS 8 +#define IPC_MEM_MAX_CHANNELS 7 #define IPC_MEM_MUX_IP_SESSION_ENTRIES 8 @@ -98,7 +98,6 @@ struct ipc_chnl_cfg; #define IPC_MEM_DL_ETH_OFFSET 16 #define IPC_CB(skb) ((struct ipc_skb_cb *)((skb)->cb)) -#define IOSM_CHIP_INFO_SIZE_MAX 100 #define FULLY_FUNCTIONAL 0 @@ -305,9 +304,9 @@ enum ipc_phase { * @ipc_port: IPC PORT data structure pointer * @pcie: IPC PCIe * @dev: Pointer to device structure + * @flash_channel_id: Reserved channel id for flashing to RAM. * @ipc_requested_state: Expected IPC state on CP. * @channels: Channel list with UL/DL pipe pairs. - * @ipc_devlink: IPC Devlink data structure pointer * @ipc_status: local ipc_status * @nr_of_channels: number of configured channels * @startup_timer: startup timer for NAND support. @@ -350,9 +349,9 @@ struct iosm_imem { struct iosm_cdev *ipc_port[IPC_MEM_MAX_CHANNELS]; struct iosm_pcie *pcie; struct device *dev; + int flash_channel_id; enum ipc_mem_device_ipc_state ipc_requested_state; struct ipc_mem_channel channels[IPC_MEM_MAX_CHANNELS]; - struct iosm_devlink *ipc_devlink; u32 ipc_status; u32 nr_of_channels; struct hrtimer startup_timer; @@ -576,15 +575,4 @@ void ipc_imem_ipc_init_check(struct iosm_imem *ipc_imem); */ void ipc_imem_channel_init(struct iosm_imem *ipc_imem, enum ipc_ctype ctype, struct ipc_chnl_cfg chnl_cfg, u32 irq_moderation); - -/** - * ipc_imem_devlink_trigger_chip_info - Inform devlink that the chip - * information are available if the - * flashing to RAM interworking shall be - * executed. - * @ipc_imem: Pointer to imem structure - * - * Returns: 0 on success, -1 on failure - */ -int ipc_imem_devlink_trigger_chip_info(struct iosm_imem *ipc_imem); #endif |