mwifiex: add support for 8997 chipset (6d85ef00) · Commits · e / devices / kernel_gigaset_gs290

drivers/net/wireless/mwifiex/Kconfig

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -9,36 +9,36 @@ config MWIFIEX
	mwifiex.		mwifiex.

	config MWIFIEX_SDIO		config MWIFIEX_SDIO
	tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897"		tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897/SD8997"
	depends on MWIFIEX && MMC		depends on MWIFIEX && MMC
	select FW_LOADER		select FW_LOADER
	select WANT_DEV_COREDUMP		select WANT_DEV_COREDUMP
	---help---		---help---
	This adds support for wireless adapters based on Marvell		This adds support for wireless adapters based on Marvell
	8786/8787/8797/8887/8897 chipsets with SDIO interface.		8786/8787/8797/8887/8897/8997 chipsets with SDIO interface.

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

	config MWIFIEX_PCIE		config MWIFIEX_PCIE
	tristate "Marvell WiFi-Ex Driver for PCIE 8766/8897"		tristate "Marvell WiFi-Ex Driver for PCIE 8766/8897/8997"
	depends on MWIFIEX && PCI		depends on MWIFIEX && PCI
	select FW_LOADER		select FW_LOADER
	select WANT_DEV_COREDUMP		select WANT_DEV_COREDUMP
	---help---		---help---
	This adds support for wireless adapters based on Marvell		This adds support for wireless adapters based on Marvell
	8766/8897 chipsets with PCIe interface.		8766/8897/8997 chipsets with PCIe interface.

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

	config MWIFIEX_USB		config MWIFIEX_USB
	tristate "Marvell WiFi-Ex Driver for USB8766/8797/8897"		tristate "Marvell WiFi-Ex Driver for USB8766/8797/8897/8997"
	depends on MWIFIEX && USB		depends on MWIFIEX && USB
	select FW_LOADER		select FW_LOADER
	---help---		---help---
	This adds support for wireless adapters based on Marvell		This adds support for wireless adapters based on Marvell
	8797/8897 chipset with USB interface.		8797/8897/8997 chipset with USB interface.

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

drivers/net/wireless/mwifiex/pcie.c

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -273,6 +273,11 @@ static const struct pci_device_id mwifiex_ids[] = {
	PCI_ANY_ID, PCI_ANY_ID, 0, 0,		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	.driver_data = (unsigned long)&mwifiex_pcie8897,		.driver_data = (unsigned long)&mwifiex_pcie8897,
	},		},
			{
			PCIE_VENDOR_ID_MARVELL, PCIE_DEVICE_ID_MARVELL_88W8997,
			PCI_ANY_ID, PCI_ANY_ID, 0, 0,
			.driver_data = (unsigned long)&mwifiex_pcie8997,
			},
	{},		{},
	};		};

	@@ -1082,6 +1087,7 @@ static int mwifiex_pcie_send_data_complete(struct mwifiex_adapter *adapter)
	card->txbd_rdptr++;		card->txbd_rdptr++;
	break;		break;
	case PCIE_DEVICE_ID_MARVELL_88W8897:		case PCIE_DEVICE_ID_MARVELL_88W8897:
			case PCIE_DEVICE_ID_MARVELL_88W8997:
	card->txbd_rdptr += reg->ring_tx_start_ptr;		card->txbd_rdptr += reg->ring_tx_start_ptr;
	break;		break;
	}		}
	@@ -1179,6 +1185,7 @@ mwifiex_pcie_send_data(struct mwifiex_adapter adapter, struct sk_buff skb,
	card->txbd_wrptr++;		card->txbd_wrptr++;
	break;		break;
	case PCIE_DEVICE_ID_MARVELL_88W8897:		case PCIE_DEVICE_ID_MARVELL_88W8897:
			case PCIE_DEVICE_ID_MARVELL_88W8997:
	card->txbd_wrptr += reg->ring_tx_start_ptr;		card->txbd_wrptr += reg->ring_tx_start_ptr;
	break;		break;
	}		}
	@@ -2733,3 +2740,4 @@ MODULE_VERSION(PCIE_VERSION);
	MODULE_LICENSE("GPL v2");		MODULE_LICENSE("GPL v2");
	MODULE_FIRMWARE(PCIE8766_DEFAULT_FW_NAME);		MODULE_FIRMWARE(PCIE8766_DEFAULT_FW_NAME);
	MODULE_FIRMWARE(PCIE8897_DEFAULT_FW_NAME);		MODULE_FIRMWARE(PCIE8897_DEFAULT_FW_NAME);
			MODULE_FIRMWARE(PCIE8997_DEFAULT_FW_NAME);

drivers/net/wireless/mwifiex/pcie.h

+44 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,10 +30,12 @@

	#define PCIE8766_DEFAULT_FW_NAME "mrvl/pcie8766_uapsta.bin"		#define PCIE8766_DEFAULT_FW_NAME "mrvl/pcie8766_uapsta.bin"
	#define PCIE8897_DEFAULT_FW_NAME "mrvl/pcie8897_uapsta.bin"		#define PCIE8897_DEFAULT_FW_NAME "mrvl/pcie8897_uapsta.bin"
			#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcie8997_uapsta.bin"

	#define PCIE_VENDOR_ID_MARVELL (0x11ab)		#define PCIE_VENDOR_ID_MARVELL (0x11ab)
	#define PCIE_DEVICE_ID_MARVELL_88W8766P (0x2b30)		#define PCIE_DEVICE_ID_MARVELL_88W8766P (0x2b30)
	#define PCIE_DEVICE_ID_MARVELL_88W8897 (0x2b38)		#define PCIE_DEVICE_ID_MARVELL_88W8897 (0x2b38)
			#define PCIE_DEVICE_ID_MARVELL_88W8997 (0x2b42)

	/* Constants for Buffer Descriptor (BD) rings */		/* Constants for Buffer Descriptor (BD) rings */
	#define MWIFIEX_MAX_TXRX_BD 0x20		#define MWIFIEX_MAX_TXRX_BD 0x20
	@@ -197,7 +199,38 @@ static const struct mwifiex_pcie_card_reg mwifiex_reg_8897 = {
	.sleep_cookie = 0,		.sleep_cookie = 0,
	.fw_dump_ctrl = 0xcf4,		.fw_dump_ctrl = 0xcf4,
	.fw_dump_start = 0xcf8,		.fw_dump_start = 0xcf8,
	.fw_dump_end = 0xcff		.fw_dump_end = 0xcff,
			};

			static const struct mwifiex_pcie_card_reg mwifiex_reg_8997 = {
			.cmd_addr_lo = PCIE_SCRATCH_0_REG,
			.cmd_addr_hi = PCIE_SCRATCH_1_REG,
			.cmd_size = PCIE_SCRATCH_2_REG,
			.fw_status = PCIE_SCRATCH_3_REG,
			.cmdrsp_addr_lo = PCIE_SCRATCH_4_REG,
			.cmdrsp_addr_hi = PCIE_SCRATCH_5_REG,
			.tx_rdptr = 0xC1A4,
			.tx_wrptr = 0xC1A8,
			.rx_rdptr = 0xC1A8,
			.rx_wrptr = 0xC1A4,
			.evt_rdptr = PCIE_SCRATCH_10_REG,
			.evt_wrptr = PCIE_SCRATCH_11_REG,
			.drv_rdy = PCIE_SCRATCH_12_REG,
			.tx_start_ptr = 16,
			.tx_mask = 0x0FFF0000,
			.tx_wrap_mask = 0x01FF0000,
			.rx_mask = 0x00000FFF,
			.rx_wrap_mask = 0x000001FF,
			.tx_rollover_ind = BIT(28),
			.rx_rollover_ind = BIT(12),
			.evt_rollover_ind = MWIFIEX_BD_FLAG_EVT_ROLLOVER_IND,
			.ring_flag_sop = MWIFIEX_BD_FLAG_SOP,
			.ring_flag_eop = MWIFIEX_BD_FLAG_EOP,
			.ring_flag_xs_sop = MWIFIEX_BD_FLAG_XS_SOP,
			.ring_flag_xs_eop = MWIFIEX_BD_FLAG_XS_EOP,
			.ring_tx_start_ptr = MWIFIEX_BD_FLAG_TX_START_PTR,
			.pfu_enabled = 1,
			.sleep_cookie = 0,
	};		};

	struct mwifiex_pcie_device {		struct mwifiex_pcie_device {
	@@ -227,6 +260,15 @@ static const struct mwifiex_pcie_device mwifiex_pcie8897 = {
	.can_ext_scan = true,		.can_ext_scan = true,
	};		};

			static const struct mwifiex_pcie_device mwifiex_pcie8997 = {
			.firmware = PCIE8997_DEFAULT_FW_NAME,
			.reg = &mwifiex_reg_8997,
			.blksz_fw_dl = MWIFIEX_PCIE_BLOCK_SIZE_FW_DNLD,
			.tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K,
			.can_dump_fw = false,
			.can_ext_scan = true,
			};

	struct mwifiex_evt_buf_desc {		struct mwifiex_evt_buf_desc {
	u64 paddr;		u64 paddr;
	u16 len;		u16 len;
	@@ -325,6 +367,7 @@ mwifiex_pcie_txbd_not_full(struct pcie_service_card *card)
	return 1;		return 1;
	break;		break;
	case PCIE_DEVICE_ID_MARVELL_88W8897:		case PCIE_DEVICE_ID_MARVELL_88W8897:
			case PCIE_DEVICE_ID_MARVELL_88W8997:
	if (((card->txbd_wrptr & reg->tx_mask) !=		if (((card->txbd_wrptr & reg->tx_mask) !=
	(card->txbd_rdptr & reg->tx_mask)) \|\|		(card->txbd_rdptr & reg->tx_mask)) \|\|
	((card->txbd_wrptr & reg->tx_rollover_ind) ==		((card->txbd_wrptr & reg->tx_rollover_ind) ==

drivers/net/wireless/mwifiex/sdio.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -288,6 +288,8 @@ static int mwifiex_sdio_suspend(struct device *dev)
	#define SDIO_DEVICE_ID_MARVELL_8887 (0x9135)		#define SDIO_DEVICE_ID_MARVELL_8887 (0x9135)
	/* Device ID for SD8801 */		/* Device ID for SD8801 */
	#define SDIO_DEVICE_ID_MARVELL_8801 (0x9139)		#define SDIO_DEVICE_ID_MARVELL_8801 (0x9139)
			/* Device ID for SD8997 */
			#define SDIO_DEVICE_ID_MARVELL_8997 (0x9141)


	/* WLAN IDs */		/* WLAN IDs */
	@@ -304,6 +306,8 @@ static const struct sdio_device_id mwifiex_ids[] = {
	.driver_data = (unsigned long)&mwifiex_sdio_sd8887},		.driver_data = (unsigned long)&mwifiex_sdio_sd8887},
	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8801),		{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8801),
	.driver_data = (unsigned long)&mwifiex_sdio_sd8801},		.driver_data = (unsigned long)&mwifiex_sdio_sd8801},
			{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997),
			.driver_data = (unsigned long)&mwifiex_sdio_sd8997},
	{},		{},
	};		};

	@@ -2531,3 +2535,4 @@ MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME);
	MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME);		MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME);
	MODULE_FIRMWARE(SD8897_DEFAULT_FW_NAME);		MODULE_FIRMWARE(SD8897_DEFAULT_FW_NAME);
	MODULE_FIRMWARE(SD8887_DEFAULT_FW_NAME);		MODULE_FIRMWARE(SD8887_DEFAULT_FW_NAME);
			MODULE_FIRMWARE(SD8997_DEFAULT_FW_NAME);

drivers/net/wireless/mwifiex/sdio.h

+65 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@
	#define SD8897_DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin"		#define SD8897_DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin"
	#define SD8887_DEFAULT_FW_NAME "mrvl/sd8887_uapsta.bin"		#define SD8887_DEFAULT_FW_NAME "mrvl/sd8887_uapsta.bin"
	#define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_uapsta.bin"		#define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_uapsta.bin"
			#define SD8997_DEFAULT_FW_NAME "mrvl/sd8997_uapsta.bin"

	#define BLOCK_MODE 1		#define BLOCK_MODE 1
	#define BYTE_MODE 0		#define BYTE_MODE 0
	@@ -364,6 +365,55 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8897 = {
	0x59, 0x5c, 0x5d},		0x59, 0x5c, 0x5d},
	};		};

			static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8997 = {
			.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,
			.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_sd8887 = {		static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8887 = {
	.start_rd_port = 0,		.start_rd_port = 0,
	.start_wr_port = 0,		.start_wr_port = 0,
	@@ -472,6 +522,21 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8897 = {
	.can_ext_scan = true,		.can_ext_scan = true,
	};		};

			static const struct mwifiex_sdio_device mwifiex_sdio_sd8997 = {
			.firmware = SD8997_DEFAULT_FW_NAME,
			.reg = &mwifiex_reg_sd8997,
			.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 = false,
			.can_auto_tdls = false,
			.can_ext_scan = true,
			};

	static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = {		static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = {
	.firmware = SD8887_DEFAULT_FW_NAME,		.firmware = SD8887_DEFAULT_FW_NAME,
	.reg = &mwifiex_reg_sd8887,		.reg = &mwifiex_reg_sd8887,