mei: push pci cfg structure me hw (4ad96db6) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/misc/mei/hw-me.c

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -110,8 +110,9 @@ static inline void mei_hcsr_set(struct mei_me_hw *hw, u32 hcsr)
	static int mei_me_fw_status(struct mei_device *dev,		static int mei_me_fw_status(struct mei_device *dev,
	struct mei_fw_status *fw_status)		struct mei_fw_status *fw_status)
	{		{
	const struct mei_fw_status *fw_src = &dev->cfg->fw_status;
	struct pci_dev *pdev = to_pci_dev(dev->dev);		struct pci_dev *pdev = to_pci_dev(dev->dev);
			struct mei_me_hw *hw = to_me_hw(dev);
			const struct mei_fw_status *fw_src = &hw->cfg->fw_status;
	int ret;		int ret;
	int i;		int i;

	@@ -846,14 +847,16 @@ struct mei_device mei_me_dev_init(struct pci_dev pdev,
	const struct mei_cfg *cfg)		const struct mei_cfg *cfg)
	{		{
	struct mei_device *dev;		struct mei_device *dev;
			struct mei_me_hw *hw;

	dev = kzalloc(sizeof(struct mei_device) +		dev = kzalloc(sizeof(struct mei_device) +
	sizeof(struct mei_me_hw), GFP_KERNEL);		sizeof(struct mei_me_hw), GFP_KERNEL);
	if (!dev)		if (!dev)
	return NULL;		return NULL;
			hw = to_me_hw(dev);

	mei_device_init(dev, &pdev->dev, &mei_me_hw_ops);		mei_device_init(dev, &pdev->dev, &mei_me_hw_ops);
	dev->cfg = cfg;		hw->cfg = cfg;
	return dev;		return dev;
	}		}

drivers/misc/mei/hw-me.h

+25 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,14 +19,38 @@
	#ifndef _MEI_INTERFACE_H_		#ifndef _MEI_INTERFACE_H_
	#define _MEI_INTERFACE_H_		#define _MEI_INTERFACE_H_

	#include <linux/mei.h>
	#include <linux/irqreturn.h>		#include <linux/irqreturn.h>
			#include <linux/pci.h>
			#include <linux/mei.h>

	#include "mei_dev.h"		#include "mei_dev.h"
	#include "client.h"		#include "client.h"

			/*
			* mei_cfg - mei device configuration
			*
			* @fw_status: FW status
			* @quirk_probe: device exclusion quirk
			*/
			struct mei_cfg {
			const struct mei_fw_status fw_status;
			bool (quirk_probe)(struct pci_dev pdev);
			};


			#define MEI_PCI_DEVICE(dev, cfg) \
			.vendor = PCI_VENDOR_ID_INTEL, .device = (dev), \
			.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, \
			.driver_data = (kernel_ulong_t)&(cfg)


	#define MEI_ME_RPM_TIMEOUT 500 /* ms */		#define MEI_ME_RPM_TIMEOUT 500 /* ms */

			/**
			* @cfg: per device generation config and ops
			*/
	struct mei_me_hw {		struct mei_me_hw {
			const struct mei_cfg *cfg;
	void __iomem *mem_addr;		void __iomem *mem_addr;
	/*		/*
	* hw states of host and fw(ME)		* hw states of host and fw(ME)

drivers/misc/mei/hw-txe.c

+7 −15

Original line number	Original line	Diff line number	Diff line
	@@ -573,6 +573,11 @@ static int mei_txe_readiness_wait(struct mei_device *dev)
	return 0;		return 0;
	}		}

			const struct mei_fw_status mei_txe_fw_sts = {
			.count = 2,
			.status[0] = PCI_CFG_TXE_FW_STS0,
			.status[1] = PCI_CFG_TXE_FW_STS1
			};

	/**		/**
	* mei_txe_fw_status - read fw status register from pci config space		* mei_txe_fw_status - read fw status register from pci config space
	@@ -583,7 +588,7 @@ static int mei_txe_readiness_wait(struct mei_device *dev)
	static int mei_txe_fw_status(struct mei_device *dev,		static int mei_txe_fw_status(struct mei_device *dev,
	struct mei_fw_status *fw_status)		struct mei_fw_status *fw_status)
	{		{
	const struct mei_fw_status *fw_src = &dev->cfg->fw_status;		const struct mei_fw_status *fw_src = &mei_txe_fw_sts;
	struct pci_dev *pdev = to_pci_dev(dev->dev);		struct pci_dev *pdev = to_pci_dev(dev->dev);
	int ret;		int ret;
	int i;		int i;
	@@ -1120,27 +1125,15 @@ static const struct mei_hw_ops mei_txe_hw_ops = {

	};		};

	#define MEI_CFG_TXE_FW_STS \
	.fw_status.count = 2, \
	.fw_status.status[0] = PCI_CFG_TXE_FW_STS0, \
	.fw_status.status[1] = PCI_CFG_TXE_FW_STS1

	const struct mei_cfg mei_txe_cfg = {
	MEI_CFG_TXE_FW_STS,
	};


	/**		/**
	* mei_txe_dev_init - allocates and initializes txe hardware specific structure		* mei_txe_dev_init - allocates and initializes txe hardware specific structure
	*		*
	* @pdev - pci device		* @pdev - pci device
	* @cfg - per device generation config
	*		*
	* returns struct mei_device * on success or NULL;		* returns struct mei_device * on success or NULL;
	*		*
	*/		*/
	struct mei_device mei_txe_dev_init(struct pci_dev pdev,		struct mei_device mei_txe_dev_init(struct pci_dev pdev)
	const struct mei_cfg *cfg)
	{		{
	struct mei_device *dev;		struct mei_device *dev;
	struct mei_txe_hw *hw;		struct mei_txe_hw *hw;
	@@ -1156,7 +1149,6 @@ struct mei_device mei_txe_dev_init(struct pci_dev pdev,

	init_waitqueue_head(&hw->wait_aliveness_resp);		init_waitqueue_head(&hw->wait_aliveness_resp);

	dev->cfg = cfg;
	return dev;		return dev;
	}		}

drivers/misc/mei/hw-txe.h

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -61,10 +61,7 @@ static inline struct mei_device hw_txe_to_mei(struct mei_txe_hw hw)
	return container_of((void *)hw, struct mei_device, hw);		return container_of((void *)hw, struct mei_device, hw);
	}		}

	extern const struct mei_cfg mei_txe_cfg;		struct mei_device mei_txe_dev_init(struct pci_dev pdev);

	struct mei_device mei_txe_dev_init(struct pci_dev pdev,
	const struct mei_cfg *cfg);

	irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id);		irqreturn_t mei_txe_irq_quick_handler(int irq, void *dev_id);
	irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id);		irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id);

drivers/misc/mei/mei_dev.h

+0 −20

Original line number	Original line	Diff line number	Diff line
	@@ -380,24 +380,6 @@ enum mei_pg_state {

	const char *mei_pg_state_str(enum mei_pg_state state);		const char *mei_pg_state_str(enum mei_pg_state state);

	/*
	* mei_cfg
	*
	* @fw_status - FW status
	* @quirk_probe - device exclusion quirk
	*/
	struct mei_cfg {
	const struct mei_fw_status fw_status;
	bool (quirk_probe)(struct pci_dev pdev);
	};


	#define MEI_PCI_DEVICE(dev, cfg) \
	.vendor = PCI_VENDOR_ID_INTEL, .device = (dev), \
	.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, \
	.driver_data = (kernel_ulong_t)&(cfg)


	/**		/**
	* struct mei_device - MEI private device struct		* struct mei_device - MEI private device struct

	@@ -416,7 +398,6 @@ struct mei_cfg {
	* @hbuf_depth - depth of hardware host/write buffer is slots		* @hbuf_depth - depth of hardware host/write buffer is slots
	* @hbuf_is_ready - query if the host host/write buffer is ready		* @hbuf_is_ready - query if the host host/write buffer is ready
	* @wr_msg - the buffer for hbm control messages		* @wr_msg - the buffer for hbm control messages
	* @cfg - per device generation config and ops
	*/		*/
	struct mei_device {		struct mei_device {
	struct device *dev;		struct device *dev;
	@@ -530,7 +511,6 @@ struct mei_device {


	const struct mei_hw_ops *ops;		const struct mei_hw_ops *ops;
	const struct mei_cfg *cfg;
	char hw[0] __aligned(sizeof(void *));		char hw[0] __aligned(sizeof(void *));
	};		};