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

Commit 938c7c80 authored by Tamás Szűcs's avatar Tamás Szűcs Committed by Kalle Valo
Browse files

mwifiex: add support for SD8987 chipset 



This patch adds support for Marvell 88W8987 chipset with SDIO interface.
Register offsets and supported feature flags are updated. The corresponding
firmware image file shall be "mrvl/sd8987_uapsta.bin".

Signed-off-by: default avatarTamás Szűcs <tszucs@protonmail.ch>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 6b583201

drivers/net/wireless/marvell/mwifiex/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ config MWIFIEX 
	  mwifiex.



config MWIFIEX_SDIO

	tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897/SD8977/SD8997"

	tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897/SD8977/SD8987/SD8997"

	depends on MWIFIEX && MMC

	select FW_LOADER

	select WANT_DEV_COREDUMP

	---help---

	  This adds support for wireless adapters based on Marvell

	  8786/8787/8797/8887/8897/8997 chipsets with SDIO interface.

	  8786/8787/8797/8887/8897/8977/8987/8997 chipsets with SDIO interface.



	  If you choose to build it as a module, it will be called

	  mwifiex_sdio.

drivers/net/wireless/marvell/mwifiex/sdio.c

+5 −0
Original line number Diff line number Diff line
@@ -491,6 +491,8 @@ static void mwifiex_sdio_coredump(struct device *dev) 
#define SDIO_DEVICE_ID_MARVELL_8801   (0x9139)

/* Device ID for SD8977 */

#define SDIO_DEVICE_ID_MARVELL_8977   (0x9145)

/* Device ID for SD8987 */

#define SDIO_DEVICE_ID_MARVELL_8987   (0x9149)

/* Device ID for SD8997 */

#define SDIO_DEVICE_ID_MARVELL_8997   (0x9141)
@@ -511,6 +513,8 @@ static const struct sdio_device_id mwifiex_ids[] = { 
		.driver_data = (unsigned long)&mwifiex_sdio_sd8801},

	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977),

		.driver_data = (unsigned long)&mwifiex_sdio_sd8977},

	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987),

		.driver_data = (unsigned long)&mwifiex_sdio_sd8987},

	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997),

		.driver_data = (unsigned long)&mwifiex_sdio_sd8997},

	{},
@@ -2731,4 +2735,5 @@ MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME); 
MODULE_FIRMWARE(SD8897_DEFAULT_FW_NAME);

MODULE_FIRMWARE(SD8887_DEFAULT_FW_NAME);

MODULE_FIRMWARE(SD8977_DEFAULT_FW_NAME);

MODULE_FIRMWARE(SD8987_DEFAULT_FW_NAME);

MODULE_FIRMWARE(SD8997_DEFAULT_FW_NAME);

drivers/net/wireless/marvell/mwifiex/sdio.h

+69 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#define SD8887_DEFAULT_FW_NAME "mrvl/sd8887_uapsta.bin"

#define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_uapsta.bin"

#define SD8977_DEFAULT_FW_NAME "mrvl/sd8977_uapsta.bin"

#define SD8987_DEFAULT_FW_NAME "mrvl/sd8987_uapsta.bin"

#define SD8997_DEFAULT_FW_NAME "mrvl/sd8997_uapsta.bin"



#define BLOCK_MODE	1
@@ -526,6 +527,58 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8887 = { 
				 0x68, 0x69, 0x6a},

};



static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8987 = {

	.start_rd_port = 0,

	.start_wr_port = 0,

	.base_0_reg = 0xF8,

	.base_1_reg = 0xF9,

	.poll_reg = 0x5C,

	.host_int_enable = UP_LD_HOST_INT_MASK | DN_LD_HOST_INT_MASK |

			CMD_PORT_UPLD_INT_MASK | CMD_PORT_DNLD_INT_MASK,

	.host_int_rsr_reg = 0x4,

	.host_int_status_reg = 0x0C,

	.host_int_mask_reg = 0x08,

	.status_reg_0 = 0xE8,

	.status_reg_1 = 0xE9,

	.sdio_int_mask = 0xff,

	.data_port_mask = 0xffffffff,

	.io_port_0_reg = 0xE4,

	.io_port_1_reg = 0xE5,

	.io_port_2_reg = 0xE6,

	.max_mp_regs = 196,

	.rd_bitmap_l = 0x10,

	.rd_bitmap_u = 0x11,

	.rd_bitmap_1l = 0x12,

	.rd_bitmap_1u = 0x13,

	.wr_bitmap_l = 0x14,

	.wr_bitmap_u = 0x15,

	.wr_bitmap_1l = 0x16,

	.wr_bitmap_1u = 0x17,

	.rd_len_p0_l = 0x18,

	.rd_len_p0_u = 0x19,

	.card_misc_cfg_reg = 0xd8,

	.card_cfg_2_1_reg = 0xd9,

	.cmd_rd_len_0 = 0xc0,

	.cmd_rd_len_1 = 0xc1,

	.cmd_rd_len_2 = 0xc2,

	.cmd_rd_len_3 = 0xc3,

	.cmd_cfg_0 = 0xc4,

	.cmd_cfg_1 = 0xc5,

	.cmd_cfg_2 = 0xc6,

	.cmd_cfg_3 = 0xc7,

	.fw_dump_host_ready = 0xcc,

	.fw_dump_ctrl = 0xf9,

	.fw_dump_start = 0xf1,

	.fw_dump_end = 0xf8,

	.func1_dump_reg_start = 0x10,

	.func1_dump_reg_end = 0x17,

	.func1_scratch_reg = 0xE8,

	.func1_spec_reg_num = 13,

	.func1_spec_reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60,

				 0x61, 0x62, 0x64, 0x65, 0x66,

				 0x68, 0x69, 0x6a},

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8786 = {

	.firmware = SD8786_DEFAULT_FW_NAME,

	.reg = &mwifiex_reg_sd87xx,
@@ -633,6 +686,22 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = { 
	.can_ext_scan = true,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8987 = {

	.firmware = SD8987_DEFAULT_FW_NAME,

	.reg = &mwifiex_reg_sd8987,

	.max_ports = 32,

	.mp_agg_pkt_limit = 16,

	.tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,

	.mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_MAX,

	.mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_MAX,

	.supports_sdio_new_mode = true,

	.has_control_mask = false,

	.can_dump_fw = true,

	.fw_dump_enh = true,

	.can_auto_tdls = true,

	.can_ext_scan = true,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8801 = {

	.firmware = SD8801_DEFAULT_FW_NAME,

	.reg = &mwifiex_reg_sd87xx,