Commit 1a0f5478 authored by Hemantkumar Suthar's avatar Hemantkumar Suthar Committed by Kalle Valo
Browse files

mwifiex: add support for sd8977 chipset 



This patch adds support for 8977 chipset to mwifiex with SDIO
interface. Register offsets and supported feature flags are
updated. Firmware image used will be mrvl/sd8977_uapsta.bin.

Signed-off-by: default avatarHemantkumar Suthar <shemant@marvell.com>
Signed-off-by: default avatarRakesh Parmar <rakeshp@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarGanapathi Bhat <gbhat@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 051337d4

drivers/net/wireless/marvell/mwifiex/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ config MWIFIEX 
	  mwifiex.



config MWIFIEX_SDIO

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

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

	depends on MWIFIEX && MMC

	select FW_LOADER

	select WANT_DEV_COREDUMP

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

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

/* Device ID for SD8801 */

#define SDIO_DEVICE_ID_MARVELL_8801   (0x9139)

/* Device ID for SD8977 */

#define SDIO_DEVICE_ID_MARVELL_8977   (0x9145)

/* Device ID for SD8997 */

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

	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8801),

		.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_8997),

		.driver_data = (unsigned long)&mwifiex_sdio_sd8997},

	{},
@@ -2726,4 +2730,5 @@ MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME); 
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(SD8997_DEFAULT_FW_NAME);

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

+70 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#define SD8897_DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin"

#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 SD8997_DEFAULT_FW_NAME "mrvl/sd8997_uapsta.bin"



#define BLOCK_MODE	1
@@ -371,6 +372,59 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8897 = { 
				 0x59, 0x5c, 0x5d},

};



static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8977 = {

	.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 = 0xf0,

	.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_card_reg mwifiex_reg_sd8997 = {

	.start_rd_port = 0,

	.start_wr_port = 0,
@@ -532,6 +586,22 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8897 = { 
	.can_ext_scan = true,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8977 = {

	.firmware = SD8977_DEFAULT_FW_NAME,

	.reg = &mwifiex_reg_sd8977,

	.max_ports = 32,

	.mp_agg_pkt_limit = 16,

	.tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K,

	.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 = false,

	.can_ext_scan = true,

};



static const struct mwifiex_sdio_device mwifiex_sdio_sd8997 = {

	.firmware = SD8997_DEFAULT_FW_NAME,

	.reg = &mwifiex_reg_sd8997,