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

Commit e7e0c231 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: make host csr and me csr internal to hw-me 



Move csr reading into me hardware functional calls.
Since we gave up on registers caching we remove some of the unnecessary
queries in mei_hw_init ane mei_reset functions.

We add mei_hw_config function to wrap up host buffer depth configuration.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88eb99f2

drivers/misc/mei/hw-me.c

+16 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ u32 mei_mecbrw_read(const struct mei_device *dev) 
 *

 * returns ME_CSR_HA register value (u32)

 */

u32 mei_mecsr_read(const struct mei_device *dev)

static inline u32 mei_mecsr_read(const struct mei_device *dev)

{

	return mei_reg_read(dev, ME_CSR_HA);

}
@@ -79,7 +79,7 @@ u32 mei_mecsr_read(const struct mei_device *dev) 
 *

 * returns H_CSR register value (u32)

 */

u32 mei_hcsr_read(const struct mei_device *dev)

static inline u32 mei_hcsr_read(const struct mei_device *dev)

{

	return mei_reg_read(dev, H_CSR);

}
@@ -96,6 +96,18 @@ static inline void mei_hcsr_set(struct mei_device *dev, u32 hcsr) 
	mei_reg_write(dev, H_CSR, hcsr);

}





/**

 * me_hw_config - configure hw dependent settings

 *

 * @dev: mei device

 */

void mei_hw_config(struct mei_device *dev)

{

	u32 hcsr = mei_hcsr_read(dev);

	/* Doesn't change in runtime */

	dev->hbuf_depth = (hcsr & H_CBD) >> 24;

}

/**

 * mei_clear_interrupts - clear and stop interrupts

 *
@@ -183,6 +195,7 @@ void mei_host_set_ready(struct mei_device *dev) 
 */

bool mei_host_is_ready(struct mei_device *dev)

{

	dev->host_hw_state = mei_hcsr_read(dev);

	return (dev->host_hw_state & H_RDY) == H_RDY;

}
@@ -194,6 +207,7 @@ bool mei_host_is_ready(struct mei_device *dev) 
 */

bool mei_me_is_ready(struct mei_device *dev)

{

	dev->me_hw_state = mei_mecsr_read(dev);

	return (dev->me_hw_state & ME_RDY_HRA) == ME_RDY_HRA;

}
@@ -313,7 +327,6 @@ int mei_write_message(struct mei_device *dev, struct mei_msg_hdr *header, 


	hcsr = mei_hcsr_read(dev) | H_IG;

	mei_hcsr_set(dev, hcsr);

	dev->me_hw_state = mei_mecsr_read(dev);

	if (!mei_me_is_ready(dev))

		return -EIO;

drivers/misc/mei/init.c

+19 −44
Original line number Diff line number Diff line
@@ -89,82 +89,64 @@ struct mei_device *mei_device_init(struct pci_dev *pdev) 
 */

int mei_hw_init(struct mei_device *dev)

{

	int err = 0;

	int ret;

	int ret = 0;



	mutex_lock(&dev->device_lock);



	dev->host_hw_state = mei_hcsr_read(dev);

	dev->me_hw_state = mei_mecsr_read(dev);

	dev_dbg(&dev->pdev->dev, "host_hw_state = 0x%08x, mestate = 0x%08x.\n",

	    dev->host_hw_state, dev->me_hw_state);



	/* acknowledge interrupt and stop interupts */

	mei_clear_interrupts(dev);



	/* Doesn't change in runtime */

	dev->hbuf_depth = (dev->host_hw_state & H_CBD) >> 24;

	mei_hw_config(dev);



	dev->recvd_msg = false;

	dev_dbg(&dev->pdev->dev, "reset in start the mei device.\n");



	mei_reset(dev, 1);



	dev_dbg(&dev->pdev->dev, "host_hw_state = 0x%08x, me_hw_state = 0x%08x.\n",

	    dev->host_hw_state, dev->me_hw_state);



	/* wait for ME to turn on ME_RDY */

	if (!dev->recvd_msg) {

		mutex_unlock(&dev->device_lock);

		err = wait_event_interruptible_timeout(dev->wait_recvd_msg,

		ret = wait_event_interruptible_timeout(dev->wait_recvd_msg,

			dev->recvd_msg,

			mei_secs_to_jiffies(MEI_INTEROP_TIMEOUT));

		mutex_lock(&dev->device_lock);

	}



	if (err <= 0 && !dev->recvd_msg) {

	if (ret <= 0 && !dev->recvd_msg) {

		dev->dev_state = MEI_DEV_DISABLED;

		dev_dbg(&dev->pdev->dev,

			"wait_event_interruptible_timeout failed"

			"on wait for ME to turn on ME_RDY.\n");

		ret = -ENODEV;

		goto out;

		goto err;

	}



	if (!(mei_host_is_ready(dev) && mei_me_is_ready(dev))) {

		dev->dev_state = MEI_DEV_DISABLED;



		dev_dbg(&dev->pdev->dev,

			"host_hw_state = 0x%08x, me_hw_state = 0x%08x.\n",

			dev->host_hw_state, dev->me_hw_state);



		if (!mei_host_is_ready(dev))

			dev_dbg(&dev->pdev->dev, "host is not ready.\n");



		if (!mei_me_is_ready(dev))

			dev_dbg(&dev->pdev->dev, "ME is not ready.\n");

	if (!mei_host_is_ready(dev)) {

		dev_err(&dev->pdev->dev, "host is not ready.\n");

		goto err;

	}



		dev_err(&dev->pdev->dev, "link layer initialization failed.\n");

		ret = -ENODEV;

		goto out;

	if (!mei_me_is_ready(dev)) {

		dev_err(&dev->pdev->dev, "ME is not ready.\n");

		goto err;

	}



	if (dev->version.major_version != HBM_MAJOR_VERSION ||

	    dev->version.minor_version != HBM_MINOR_VERSION) {

		dev_dbg(&dev->pdev->dev, "MEI start failed.\n");

		ret = -ENODEV;

		goto out;

		goto err;

	}



	dev->recvd_msg = false;

	dev_dbg(&dev->pdev->dev, "host_hw_state = 0x%08x, me_hw_state = 0x%08x.\n",

	    dev->host_hw_state, dev->me_hw_state);

	dev_dbg(&dev->pdev->dev, "link layer has been established.\n");

	ret = 0;



out:

	mutex_unlock(&dev->device_lock);

	return ret;

	return 0;

err:

	dev_err(&dev->pdev->dev, "link layer initialization failed.\n");

	dev->dev_state = MEI_DEV_DISABLED;

	mutex_unlock(&dev->device_lock);

	return -ENODEV;

}



/**
@@ -221,13 +203,6 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled) 
	dev->rd_msg_hdr = 0;

	dev->wd_pending = false;



	/* update the state of the registers after reset */

	dev->host_hw_state = mei_hcsr_read(dev);

	dev->me_hw_state = mei_mecsr_read(dev);



	dev_dbg(&dev->pdev->dev, "after reset host_hw_state = 0x%08x, me_hw_state = 0x%08x.\n",

	    dev->host_hw_state, dev->me_hw_state);



	if (unexpected)

		dev_warn(&dev->pdev->dev, "unexpected reset: dev_state = %s\n",

			 mei_dev_state_str(dev->dev_state));

drivers/misc/mei/interrupt.c

+0 −4
Original line number Diff line number Diff line
@@ -697,8 +697,6 @@ irqreturn_t mei_interrupt_thread_handler(int irq, void *dev_id) 
	if (pci_dev_msi_enabled(dev->pdev))

		mei_clear_interrupts(dev);



	dev->me_hw_state = mei_mecsr_read(dev);



	/* check if ME wants a reset */

	if (!mei_me_is_ready(dev) &&

	    dev->dev_state != MEI_DEV_RESETING &&
@@ -709,7 +707,6 @@ irqreturn_t mei_interrupt_thread_handler(int irq, void *dev_id) 
		return IRQ_HANDLED;

	}



	dev->host_hw_state = mei_hcsr_read(dev);

	/*  check if we need to start the dev */

	if (!mei_host_is_ready(dev)) {

		if (mei_me_is_ready(dev)) {
@@ -746,7 +743,6 @@ irqreturn_t mei_interrupt_thread_handler(int irq, void *dev_id) 
	rets = mei_irq_thread_write_handler(dev, &complete_list);

end:

	dev_dbg(&dev->pdev->dev, "end of bottom half function.\n");

	dev->host_hw_state = mei_hcsr_read(dev);

	dev->mei_host_buffer_is_empty = mei_hbuf_is_empty(dev);



	bus_message_received = false;

drivers/misc/mei/mei_dev.h

+2 −2
Original line number Diff line number Diff line
@@ -385,12 +385,12 @@ void mei_watchdog_unregister(struct mei_device *dev); 
 * Register Access Function

 */



void mei_hw_config(struct mei_device *dev);

void mei_hw_reset(struct mei_device *dev, bool intr_enable);

u32 mei_hcsr_read(const struct mei_device *dev);

u32 mei_mecsr_read(const struct mei_device *dev);

u32 mei_mecbrw_read(const struct mei_device *dev);







void mei_clear_interrupts(struct mei_device *dev);

void mei_enable_interrupts(struct mei_device *dev);

void mei_disable_interrupts(struct mei_device *dev);