From 9130c204e59a3225bcdaf79dc30747c3f949473c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 25 May 2011 23:08:39 +0200 Subject: [PATCH 48/69] Revert "mmc: mmc_test: add test for none blocking transfers" This reverts commit 39e2e8264c430520dd28372e4155fc0473c2be5c. --- drivers/mmc/card/mmc_test.c | 312 +----------------------------------------- 1 files changed, 8 insertions(+), 304 deletions(-) diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c index 8f7ffad..c1c3c5a 100644 --- a/drivers/mmc/card/mmc_test.c +++ b/drivers/mmc/card/mmc_test.c @@ -22,7 +22,6 @@ #include #include #include -#include #define RESULT_OK 0 #define RESULT_FAIL 1 @@ -52,12 +51,10 @@ struct mmc_test_pages { * struct mmc_test_mem - allocated memory. * @arr: array of allocations * @cnt: number of allocations - * @size_min_cmn: lowest common size in array of allocations */ struct mmc_test_mem { struct mmc_test_pages *arr; unsigned int cnt; - unsigned int size_min_cmn; }; /** @@ -151,21 +148,6 @@ struct mmc_test_card { struct mmc_test_general_result *gr; }; -enum mmc_test_prep_media { - MMC_TEST_PREP_NONE = 0, - MMC_TEST_PREP_WRITE_FULL = 1 << 0, - MMC_TEST_PREP_ERASE = 1 << 1, -}; - -struct mmc_test_multiple_rw { - unsigned int *bs; - unsigned int len; - unsigned int size; - bool do_write; - bool do_nonblock_req; - enum mmc_test_prep_media prepare; -}; - /*******************************************************************/ /* General helper functions */ /*******************************************************************/ @@ -325,7 +307,6 @@ static struct mmc_test_mem *mmc_test_alloc_mem(unsigned long min_sz, unsigned long max_seg_page_cnt = DIV_ROUND_UP(max_seg_sz, PAGE_SIZE); unsigned long page_cnt = 0; unsigned long limit = nr_free_buffer_pages() >> 4; - unsigned int min_cmn = 0; struct mmc_test_mem *mem; if (max_page_cnt > limit) @@ -369,12 +350,6 @@ static struct mmc_test_mem *mmc_test_alloc_mem(unsigned long min_sz, mem->arr[mem->cnt].page = page; mem->arr[mem->cnt].order = order; mem->cnt += 1; - if (!min_cmn) - min_cmn = PAGE_SIZE << order; - else - min_cmn = min(min_cmn, - (unsigned int) (PAGE_SIZE << order)); - if (max_page_cnt <= (1UL << order)) break; max_page_cnt -= 1UL << order; @@ -385,7 +360,6 @@ static struct mmc_test_mem *mmc_test_alloc_mem(unsigned long min_sz, break; } } - mem->size_min_cmn = min_cmn; return mem; @@ -412,6 +386,7 @@ static int mmc_test_map_sg(struct mmc_test_mem *mem, unsigned long sz, do { for (i = 0; i < mem->cnt; i++) { unsigned long len = PAGE_SIZE << mem->arr[i].order; + if (len > sz) len = sz; if (len > max_seg_sz) @@ -750,94 +725,6 @@ static int mmc_test_check_broken_result(struct mmc_test_card *test, } /* - * Tests nonblock transfer with certain parameters - */ -static void mmc_test_nonblock_reset(struct mmc_request *mrq, - struct mmc_command *cmd, - struct mmc_command *stop, - struct mmc_data *data) -{ - memset(mrq, 0, sizeof(struct mmc_request)); - memset(cmd, 0, sizeof(struct mmc_command)); - memset(data, 0, sizeof(struct mmc_data)); - memset(stop, 0, sizeof(struct mmc_command)); - - mrq->cmd = cmd; - mrq->data = data; - mrq->stop = stop; -} -static int mmc_test_nonblock_transfer(struct mmc_test_card *test, - struct scatterlist *sg, unsigned sg_len, - unsigned dev_addr, unsigned blocks, - unsigned blksz, int write, int count) -{ - struct mmc_request mrq1; - struct mmc_command cmd1; - struct mmc_command stop1; - struct mmc_data data1; - - struct mmc_request mrq2; - struct mmc_command cmd2; - struct mmc_command stop2; - struct mmc_data data2; - - struct mmc_request *cur_mrq; - struct mmc_request *prev_mrq; - int i; - int ret = 0; - - if (!test->card->host->ops->pre_req || - !test->card->host->ops->post_req) - return -RESULT_UNSUP_HOST; - - mmc_test_nonblock_reset(&mrq1, &cmd1, &stop1, &data1); - mmc_test_nonblock_reset(&mrq2, &cmd2, &stop2, &data2); - - cur_mrq = &mrq1; - prev_mrq = NULL; - - for (i = 0; i < count; i++) { - mmc_test_prepare_mrq(test, cur_mrq, sg, sg_len, dev_addr, - blocks, blksz, write); - mmc_pre_req(test->card->host, cur_mrq, !prev_mrq); - - if (prev_mrq) { - mmc_wait_for_req_done(prev_mrq); - mmc_test_wait_busy(test); - ret = mmc_test_check_result(test, prev_mrq); - if (ret) - goto err; - } - - mmc_start_req(test->card->host, cur_mrq); - - if (prev_mrq) - mmc_post_req(test->card->host, prev_mrq, 0); - - prev_mrq = cur_mrq; - if (cur_mrq == &mrq1) { - mmc_test_nonblock_reset(&mrq2, &cmd2, &stop2, &data2); - cur_mrq = &mrq2; - } else { - mmc_test_nonblock_reset(&mrq1, &cmd1, &stop1, &data1); - cur_mrq = &mrq1; - } - dev_addr += blocks; - } - - mmc_wait_for_req_done(prev_mrq); - mmc_test_wait_busy(test); - ret = mmc_test_check_result(test, prev_mrq); - if (ret) - goto err; - mmc_post_req(test->card->host, prev_mrq, 0); - - return ret; -err: - return ret; -} - -/* * Tests a basic transfer with certain parameters */ static int mmc_test_simple_transfer(struct mmc_test_card *test, @@ -1464,17 +1351,14 @@ static int mmc_test_area_transfer(struct mmc_test_card *test, } /* - * Map and transfer bytes for multiple transfers. + * Map and transfer bytes. */ -static int mmc_test_area_io_seq(struct mmc_test_card *test, unsigned long sz, - unsigned int dev_addr, int write, - int max_scatter, int timed, int count, - bool nonblock) +static int mmc_test_area_io(struct mmc_test_card *test, unsigned long sz, + unsigned int dev_addr, int write, int max_scatter, + int timed) { struct timespec ts1, ts2; - int ret = 0; - int i; - struct mmc_test_area *t = &test->area; + int ret; /* * In the case of a maximally scattered transfer, the maximum transfer @@ -1498,15 +1382,8 @@ static int mmc_test_area_io_seq(struct mmc_test_card *test, unsigned long sz, if (timed) getnstimeofday(&ts1); - if (nonblock) - ret = mmc_test_nonblock_transfer(test, t->sg, t->sg_len, - dev_addr, t->blocks, 512, write, count); - else - for (i = 0; i < count && ret == 0; i++) { - ret = mmc_test_area_transfer(test, dev_addr, write); - dev_addr += sz >> 9; - } + ret = mmc_test_area_transfer(test, dev_addr, write); if (ret) return ret; @@ -1514,19 +1391,11 @@ static int mmc_test_area_io_seq(struct mmc_test_card *test, unsigned long sz, getnstimeofday(&ts2); if (timed) - mmc_test_print_avg_rate(test, sz, count, &ts1, &ts2); + mmc_test_print_rate(test, sz, &ts1, &ts2); return 0; } -static int mmc_test_area_io(struct mmc_test_card *test, unsigned long sz, - unsigned int dev_addr, int write, int max_scatter, - int timed) -{ - return mmc_test_area_io_seq(test, sz, dev_addr, write, max_scatter, - timed, 1, false); -} - /* * Write the test area entirely. */ @@ -2087,144 +1956,6 @@ static int mmc_test_large_seq_write_perf(struct mmc_test_card *test) return mmc_test_large_seq_perf(test, 1); } -static int mmc_test_rw_multiple(struct mmc_test_card *test, - struct mmc_test_multiple_rw *tdata, - unsigned int reqsize, unsigned int size) -{ - unsigned int dev_addr; - struct mmc_test_area *t = &test->area; - int ret = 0; - int max_reqsize = max(t->mem->size_min_cmn * - min(t->max_segs, t->mem->cnt), t->max_tfr); - - /* Set up test area */ - if (size > mmc_test_capacity(test->card) / 2 * 512) - size = mmc_test_capacity(test->card) / 2 * 512; - if (reqsize > max_reqsize) - reqsize = max_reqsize; - dev_addr = mmc_test_capacity(test->card) / 4; - if ((dev_addr & 0xffff0000)) - dev_addr &= 0xffff0000; /* Round to 64MiB boundary */ - else - dev_addr &= 0xfffff800; /* Round to 1MiB boundary */ - if (!dev_addr) - goto err; - - /* prepare test area */ - if (mmc_can_erase(test->card) && - tdata->prepare & MMC_TEST_PREP_ERASE) { - ret = mmc_erase(test->card, dev_addr, - size / 512, MMC_SECURE_ERASE_ARG); - if (ret) - ret = mmc_erase(test->card, dev_addr, - size / 512, MMC_ERASE_ARG); - if (ret) - goto err; - } - - /* Run test */ - ret = mmc_test_area_io_seq(test, reqsize, dev_addr, - tdata->do_write, 0, 1, size / reqsize, - tdata->do_nonblock_req); - if (ret) - goto err; - - return ret; - err: - printk(KERN_INFO "[%s] error\n", __func__); - return ret; -} - -static int mmc_test_rw_multiple_size(struct mmc_test_card *test, - struct mmc_test_multiple_rw *rw) -{ - int ret = 0; - int i; - - for (i = 0 ; i < rw->len && ret == 0; i++) { - ret = mmc_test_rw_multiple(test, rw, rw->bs[i], rw->size); - if (ret) - break; - } - return ret; -} - -/* - * Multiple blocking write 4k to 4 MB chunks - */ -static int mmc_test_profile_mult_write_blocking_perf(struct mmc_test_card *test) -{ - unsigned int bs[] = {1 << 12, 1 << 13, 1 << 14, 1 << 15, 1 << 16, - 1 << 17, 1 << 18, 1 << 19, 1 << 20, 1 << 22}; - struct mmc_test_multiple_rw test_data = { - .bs = bs, - .size = 128*1024*1024, - .len = ARRAY_SIZE(bs), - .do_write = true, - .do_nonblock_req = false, - .prepare = MMC_TEST_PREP_ERASE, - }; - - return mmc_test_rw_multiple_size(test, &test_data); -}; - -/* - * Multiple none blocking write 4k to 4 MB chunks - */ -static int mmc_test_profile_mult_write_nonblock_perf(struct mmc_test_card *test) -{ - unsigned int bs[] = {1 << 12, 1 << 13, 1 << 14, 1 << 15, 1 << 16, - 1 << 17, 1 << 18, 1 << 19, 1 << 20, 1 << 22}; - struct mmc_test_multiple_rw test_data = { - .bs = bs, - .size = 128*1024*1024, - .len = ARRAY_SIZE(bs), - .do_write = true, - .do_nonblock_req = true, - .prepare = MMC_TEST_PREP_ERASE, - }; - - return mmc_test_rw_multiple_size(test, &test_data); -} - -/* - * Multiple blocking read 4k to 4 MB chunks - */ -static int mmc_test_profile_mult_read_blocking_perf(struct mmc_test_card *test) -{ - unsigned int bs[] = {1 << 12, 1 << 13, 1 << 14, 1 << 15, 1 << 16, - 1 << 17, 1 << 18, 1 << 19, 1 << 20, 1 << 22}; - struct mmc_test_multiple_rw test_data = { - .bs = bs, - .size = 128*1024*1024, - .len = ARRAY_SIZE(bs), - .do_write = false, - .do_nonblock_req = false, - .prepare = MMC_TEST_PREP_NONE, - }; - - return mmc_test_rw_multiple_size(test, &test_data); -} - -/* - * Multiple none blocking read 4k to 4 MB chunks - */ -static int mmc_test_profile_mult_read_nonblock_perf(struct mmc_test_card *test) -{ - unsigned int bs[] = {1 << 12, 1 << 13, 1 << 14, 1 << 15, 1 << 16, - 1 << 17, 1 << 18, 1 << 19, 1 << 20, 1 << 22}; - struct mmc_test_multiple_rw test_data = { - .bs = bs, - .size = 128*1024*1024, - .len = ARRAY_SIZE(bs), - .do_write = false, - .do_nonblock_req = true, - .prepare = MMC_TEST_PREP_NONE, - }; - - return mmc_test_rw_multiple_size(test, &test_data); -} - static const struct mmc_test_case mmc_test_cases[] = { { .name = "Basic write (no data verification)", @@ -2492,33 +2223,6 @@ static const struct mmc_test_case mmc_test_cases[] = { .cleanup = mmc_test_area_cleanup, }, - { - .name = "Write performance with blocking req 4k to 4MB", - .prepare = mmc_test_area_prepare, - .run = mmc_test_profile_mult_write_blocking_perf, - .cleanup = mmc_test_area_cleanup, - }, - - { - .name = "Write performance with none blocking req 4k to 4MB", - .prepare = mmc_test_area_prepare, - .run = mmc_test_profile_mult_write_nonblock_perf, - .cleanup = mmc_test_area_cleanup, - }, - - { - .name = "Read performance with blocking req 4k to 4MB", - .prepare = mmc_test_area_prepare, - .run = mmc_test_profile_mult_read_blocking_perf, - .cleanup = mmc_test_area_cleanup, - }, - - { - .name = "Read performance with none blocking req 4k to 4MB", - .prepare = mmc_test_area_prepare, - .run = mmc_test_profile_mult_read_nonblock_perf, - .cleanup = mmc_test_area_cleanup, - }, }; static DEFINE_MUTEX(mmc_test_lock); -- 1.7.2.5