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

Commit 21c5c83c authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

mwifiex: support sysfs initiated device coredump 



Since commit 3c47d19f ("drivers: base: add coredump driver ops")
it is possible to initiate a device coredump from user-space. This
patch adds support for it adding the .coredump() driver callback.
As there is no longer a need to initiate it through debugfs remove
that code.

Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 8e072168

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -674,6 +674,7 @@ int mwifiex_send_cmd(struct mwifiex_private *priv, u16 cmd_no, 




	return ret;

	return ret;

}

}

EXPORT_SYMBOL_GPL(mwifiex_send_cmd);





/*

/*

 * This function queues a command to the command pending queue.

 * This function queues a command to the command pending queue.

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

+1 −30
Original line number Original line Diff line number Diff line
@@ -153,34 +153,6 @@ mwifiex_info_read(struct file *file, char __user *ubuf, 
	return ret;

	return ret;

}

}





/*

 * Proc device dump read handler.

 *

 * This function is called when the 'device_dump' file is opened for

 * reading.

 * This function dumps driver information and firmware memory segments

 * (ex. DTCM, ITCM, SQRAM etc.) for

 * debugging.

 */

static ssize_t

mwifiex_device_dump_read(struct file *file, char __user *ubuf,

			 size_t count, loff_t *ppos)

{

	struct mwifiex_private *priv = file->private_data;



	/* For command timeouts, USB firmware will automatically emit

	 * firmware dump events, so we don't implement device_dump().

	 * For user-initiated dumps, we trigger it ourselves.

	 */

	if (priv->adapter->iface_type == MWIFIEX_USB)

		mwifiex_send_cmd(priv, HostCmd_CMD_FW_DUMP_EVENT,

				 HostCmd_ACT_GEN_SET, 0, NULL, true);

	else

		priv->adapter->if_ops.device_dump(priv->adapter);



	return 0;

}



/*

/*

 * Proc getlog file read handler.

 * Proc getlog file read handler.

 *

 *
@@ -980,7 +952,6 @@ static const struct file_operations mwifiex_dfs_##name##_fops = { \ 
MWIFIEX_DFS_FILE_READ_OPS(info);

MWIFIEX_DFS_FILE_READ_OPS(info);

MWIFIEX_DFS_FILE_READ_OPS(debug);

MWIFIEX_DFS_FILE_READ_OPS(debug);

MWIFIEX_DFS_FILE_READ_OPS(getlog);

MWIFIEX_DFS_FILE_READ_OPS(getlog);

MWIFIEX_DFS_FILE_READ_OPS(device_dump);

MWIFIEX_DFS_FILE_OPS(regrdwr);

MWIFIEX_DFS_FILE_OPS(regrdwr);

MWIFIEX_DFS_FILE_OPS(rdeeprom);

MWIFIEX_DFS_FILE_OPS(rdeeprom);

MWIFIEX_DFS_FILE_OPS(memrw);

MWIFIEX_DFS_FILE_OPS(memrw);
@@ -1011,7 +982,7 @@ mwifiex_dev_debugfs_init(struct mwifiex_private *priv) 
	MWIFIEX_DFS_ADD_FILE(getlog);

	MWIFIEX_DFS_ADD_FILE(getlog);

	MWIFIEX_DFS_ADD_FILE(regrdwr);

	MWIFIEX_DFS_ADD_FILE(regrdwr);

	MWIFIEX_DFS_ADD_FILE(rdeeprom);

	MWIFIEX_DFS_ADD_FILE(rdeeprom);

	MWIFIEX_DFS_ADD_FILE(device_dump);



	MWIFIEX_DFS_ADD_FILE(memrw);

	MWIFIEX_DFS_ADD_FILE(memrw);

	MWIFIEX_DFS_ADD_FILE(hscfg);

	MWIFIEX_DFS_ADD_FILE(hscfg);

	MWIFIEX_DFS_ADD_FILE(histogram);

	MWIFIEX_DFS_ADD_FILE(histogram);

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

+16 −2
Original line number Original line Diff line number Diff line
@@ -320,6 +320,19 @@ static void mwifiex_pcie_shutdown(struct pci_dev *pdev) 
	return;

	return;

}

}





static void mwifiex_pcie_coredump(struct device *dev)

{

	struct pci_dev *pdev;

	struct pcie_service_card *card;



	pdev = container_of(dev, struct pci_dev, dev);

	card = pci_get_drvdata(pdev);



	if (!test_and_set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP,

			      &card->work_flags))

		schedule_work(&card->work);

}



static const struct pci_device_id mwifiex_ids[] = {

static const struct pci_device_id mwifiex_ids[] = {

	{

	{

		PCIE_VENDOR_ID_MARVELL, PCIE_DEVICE_ID_MARVELL_88W8766P,

		PCIE_VENDOR_ID_MARVELL, PCIE_DEVICE_ID_MARVELL_88W8766P,
@@ -415,11 +428,12 @@ static struct pci_driver __refdata mwifiex_pcie = { 
	.id_table = mwifiex_ids,

	.id_table = mwifiex_ids,

	.probe    = mwifiex_pcie_probe,

	.probe    = mwifiex_pcie_probe,

	.remove   = mwifiex_pcie_remove,

	.remove   = mwifiex_pcie_remove,

#ifdef CONFIG_PM_SLEEP

	.driver   = {

	.driver   = {

		.coredump = mwifiex_pcie_coredump,

#ifdef CONFIG_PM_SLEEP

		.pm = &mwifiex_pcie_pm_ops,

		.pm = &mwifiex_pcie_pm_ops,

	},

#endif

#endif

	},

	.shutdown = mwifiex_pcie_shutdown,

	.shutdown = mwifiex_pcie_shutdown,

	.err_handler = &mwifiex_pcie_err_handler,

	.err_handler = &mwifiex_pcie_err_handler,

};

};

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

+12 −0
Original line number Original line Diff line number Diff line
@@ -466,6 +466,17 @@ static int mwifiex_sdio_suspend(struct device *dev) 
	return ret;

	return ret;

}

}





static void mwifiex_sdio_coredump(struct device *dev)

{

	struct sdio_func *func = dev_to_sdio_func(dev);

	struct sdio_mmc_card *card;



	card = sdio_get_drvdata(func);

	if (!test_and_set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP,

			      &card->work_flags))

		schedule_work(&card->work);

}



/* Device ID for SD8786 */

/* Device ID for SD8786 */

#define SDIO_DEVICE_ID_MARVELL_8786   (0x9116)

#define SDIO_DEVICE_ID_MARVELL_8786   (0x9116)

/* Device ID for SD8787 */

/* Device ID for SD8787 */
@@ -515,6 +526,7 @@ static struct sdio_driver mwifiex_sdio = { 
	.remove = mwifiex_sdio_remove,

	.remove = mwifiex_sdio_remove,

	.drv = {

	.drv = {

		.owner = THIS_MODULE,

		.owner = THIS_MODULE,

		.coredump = mwifiex_sdio_coredump,

		.pm = &mwifiex_sdio_pm_ops,

		.pm = &mwifiex_sdio_pm_ops,

	}

	}

};

};

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

+13 −0
Original line number Original line Diff line number Diff line
@@ -653,6 +653,16 @@ static void mwifiex_usb_disconnect(struct usb_interface *intf) 
	usb_put_dev(interface_to_usbdev(intf));

	usb_put_dev(interface_to_usbdev(intf));

}

}





static void mwifiex_usb_coredump(struct device *dev)

{

	struct usb_interface *intf = to_usb_interface(dev);

	struct usb_card_rec *card = usb_get_intfdata(intf);



	mwifiex_send_cmd(mwifiex_get_priv(card->adapter, MWIFIEX_BSS_ROLE_ANY),

			 HostCmd_CMD_FW_DUMP_EVENT, HostCmd_ACT_GEN_SET, 0,

			 NULL, true);

}



static struct usb_driver mwifiex_usb_driver = {

static struct usb_driver mwifiex_usb_driver = {

	.name = "mwifiex_usb",

	.name = "mwifiex_usb",

	.probe = mwifiex_usb_probe,

	.probe = mwifiex_usb_probe,
@@ -661,6 +671,9 @@ static struct usb_driver mwifiex_usb_driver = { 
	.suspend = mwifiex_usb_suspend,

	.suspend = mwifiex_usb_suspend,

	.resume = mwifiex_usb_resume,

	.resume = mwifiex_usb_resume,

	.soft_unbind = 1,

	.soft_unbind = 1,

	.drvwrap.driver = {

		.coredump = mwifiex_usb_coredump,

	},

};

};





static int mwifiex_write_data_sync(struct mwifiex_adapter *adapter, u8 *pbuf,

static int mwifiex_write_data_sync(struct mwifiex_adapter *adapter, u8 *pbuf,