Commit 2d1995fc authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

mei: me: change power gating function name conventions 



The current power gating naming was confusing,
we wish to swap meanings of register and flow level power gating terms,

For registers writing level use terms set and unset:
	mei_me_pg_set, mei_me_pg_unset

For flow/high level use power gating enter and power gating exit terms
	mei_me_pg_enter_sync, mei_me_pg_exit_sync

Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0a927d0

drivers/misc/mei/hw-me.c

+10 −10
Original line number Diff line number Diff line
@@ -561,11 +561,11 @@ static int mei_me_read_slots(struct mei_device *dev, unsigned char *buffer, 
}



/**

 * mei_me_pg_enter - write pg enter register

 * mei_me_pg_set - write pg enter register

 *

 * @dev: the device structure

 */

static void mei_me_pg_enter(struct mei_device *dev)

static void mei_me_pg_set(struct mei_device *dev)

{

	struct mei_me_hw *hw = to_me_hw(dev);

	u32 reg;
@@ -580,11 +580,11 @@ static void mei_me_pg_enter(struct mei_device *dev) 
}



/**

 * mei_me_pg_exit - write pg exit register

 * mei_me_pg_unset - write pg exit register

 *

 * @dev: the device structure

 */

static void mei_me_pg_exit(struct mei_device *dev)

static void mei_me_pg_unset(struct mei_device *dev)

{

	struct mei_me_hw *hw = to_me_hw(dev);

	u32 reg;
@@ -601,13 +601,13 @@ static void mei_me_pg_exit(struct mei_device *dev) 
}



/**

 * mei_me_pg_set_sync - perform pg entry procedure

 * mei_me_pg_enter_sync - perform pg entry procedure

 *

 * @dev: the device structure

 *

 * Return: 0 on success an error code otherwise

 */

int mei_me_pg_set_sync(struct mei_device *dev)

int mei_me_pg_enter_sync(struct mei_device *dev)

{

	struct mei_me_hw *hw = to_me_hw(dev);

	unsigned long timeout = mei_secs_to_jiffies(MEI_PGI_TIMEOUT);
@@ -625,7 +625,7 @@ int mei_me_pg_set_sync(struct mei_device *dev) 
	mutex_lock(&dev->device_lock);



	if (dev->pg_event == MEI_PG_EVENT_RECEIVED) {

		mei_me_pg_enter(dev);

		mei_me_pg_set(dev);

		ret = 0;

	} else {

		ret = -ETIME;
@@ -638,13 +638,13 @@ int mei_me_pg_set_sync(struct mei_device *dev) 
}



/**

 * mei_me_pg_unset_sync - perform pg exit procedure

 * mei_me_pg_exit_sync - perform pg exit procedure

 *

 * @dev: the device structure

 *

 * Return: 0 on success an error code otherwise

 */

int mei_me_pg_unset_sync(struct mei_device *dev)

int mei_me_pg_exit_sync(struct mei_device *dev)

{

	struct mei_me_hw *hw = to_me_hw(dev);

	unsigned long timeout = mei_secs_to_jiffies(MEI_PGI_TIMEOUT);
@@ -655,7 +655,7 @@ int mei_me_pg_unset_sync(struct mei_device *dev) 


	dev->pg_event = MEI_PG_EVENT_WAIT;



	mei_me_pg_exit(dev);

	mei_me_pg_unset(dev);



	mutex_unlock(&dev->device_lock);

	wait_event_timeout(dev->wait_pg,

drivers/misc/mei/hw-me.h

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ extern const struct mei_cfg mei_me_pch8_sps_cfg; 
struct mei_device *mei_me_dev_init(struct pci_dev *pdev,

				   const struct mei_cfg *cfg);



int mei_me_pg_set_sync(struct mei_device *dev);

int mei_me_pg_unset_sync(struct mei_device *dev);

int mei_me_pg_enter_sync(struct mei_device *dev);

int mei_me_pg_exit_sync(struct mei_device *dev);



irqreturn_t mei_me_irq_quick_handler(int irq, void *dev_id);

irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id);

drivers/misc/mei/pci-me.c

+2 −2
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static int mei_me_pm_runtime_suspend(struct device *device) 
	mutex_lock(&dev->device_lock);



	if (mei_write_is_idle(dev))

		ret = mei_me_pg_set_sync(dev);

		ret = mei_me_pg_enter_sync(dev);

	else

		ret = -EAGAIN;
@@ -414,7 +414,7 @@ static int mei_me_pm_runtime_resume(struct device *device) 


	mutex_lock(&dev->device_lock);



	ret = mei_me_pg_unset_sync(dev);

	ret = mei_me_pg_exit_sync(dev);



	mutex_unlock(&dev->device_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE