a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Block: convert maple to state notifier

Browse Source
This commit is contained in:
Noxxx 2017-12-30 02:36:26 +01:00 committed by BlackMesa123
parent ac2a4d35d1
commit 0a2275a19d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
block/maple-iosched.c
View File

@ -8,7 +8,7 @@
*
* Maple uses a first come first serve style algorithm with seperated read/write
* handling to allow for read biases. By prioritizing reads, simple tasks should improve
* in performance. Maple also uses hooks for the powersuspend driver to increase
* in performance. Maple also uses hooks for the state notifier driver to increase
* expirations when power is suspended to decrease workload.
*/
#include <linux/blkdev.h>
@ -17,7 +17,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/display_state.h>
#include <linux/state_notifier.h>
#define MAPLE_IOSCHED_PATCHLEVEL (8)
@ -78,19 +78,18 @@ maple_add_request(struct request_queue *q, struct request *rq)
struct maple_data *mdata = maple_get_data(q);
const int sync = rq_is_sync(rq);
const int dir = rq_data_dir(rq);
const bool display_on = is_display_on();
/*
* Add request to the proper fifo list and set its
* expire time.
*/
/* inrease expiration when device is asleep */
/* increase expiration when device is asleep */
unsigned int fifo_expire_suspended = mdata->fifo_expire[sync][dir] * sleep_latency_multiple;
if (display_on && mdata->fifo_expire[sync][dir]) {
if (!state_suspended && mdata->fifo_expire[sync][dir]) {
rq->fifo_time = jiffies + mdata->fifo_expire[sync][dir];
list_add_tail(&rq->queuelist, &mdata->fifo_list[sync][dir]);
} else if (!display_on && fifo_expire_suspended) {
} else if (state_suspended && fifo_expire_suspended) {
rq->fifo_time = jiffies + mdata->fifo_expire[sync][dir];
list_add_tail(&rq->queuelist, &mdata->fifo_list[sync][dir]);
}
@ -206,7 +205,6 @@ maple_dispatch_requests(struct request_queue *q, int force)
struct maple_data *mdata = maple_get_data(q);
struct request *rq = NULL;
int data_dir = READ;
const bool display_on = is_display_on();
/*
* Retrieve any expired request after a batch of
@ -218,9 +216,9 @@ maple_dispatch_requests(struct request_queue *q, int force)
/* Retrieve request */
if (!rq) {
/* Treat writes fairly while suspended, otherwise allow them to be starved */
if (display_on && mdata->starved >= mdata->writes_starved)
if (!state_suspended && mdata->starved >= mdata->writes_starved)
data_dir = WRITE;
else if (!display_on && mdata->starved >= 1)
else if (state_suspended && mdata->starved >= 1)
data_dir = WRITE;
rq = maple_choose_request(mdata, data_dir);