Skip to content

Commit 070f033

Browse files
DispatchCodeUlf Hansson
authored andcommitted
mmc: mtk-sd: replace use of system_wq with system_percpu_wq
Currently if a user enqueues a work item using schedule_delayed_work() the used wq is "system_wq" (per-cpu wq) while queue_delayed_work() use WORK_CPU_UNBOUND (used when a cpu is not specified). The same applies to schedule_work() that is using system_wq and queue_work(), that makes use again of WORK_CPU_UNBOUND. This lack of consistency cannot be addressed without refactoring the API. This patch continues the effort to refactor worqueue APIs, which has begun with the change introducing new workqueues and a new alloc_workqueue flag: commit 128ea9f ("workqueue: Add system_percpu_wq and system_dfl_wq") commit 930c2ea ("workqueue: Add new WQ_PERCPU flag") Replace system_wq with system_percpu_wq, keeping the same old behavior. The old wq (system_wq) will be kept for a few release cycles. Suggested-by: Tejun Heo <tj@kernel.org> Signed-off-by: Marco Crivellari <marco.crivellari@suse.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 5f87aaf commit 070f033

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/mmc/host/mtk-sd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ static void msdc_start_data(struct msdc_host *host, struct mmc_command *cmd,
12141214
host->data = data;
12151215
read = data->flags & MMC_DATA_READ;
12161216

1217-
mod_delayed_work(system_wq, &host->req_timeout, DAT_TIMEOUT);
1217+
mod_delayed_work(system_percpu_wq, &host->req_timeout, DAT_TIMEOUT);
12181218
msdc_dma_setup(host, &host->dma, data);
12191219
sdr_set_bits(host->base + MSDC_INTEN, data_ints_mask);
12201220
sdr_set_field(host->base + MSDC_DMA_CTRL, MSDC_DMA_CTRL_START, 1);
@@ -1444,7 +1444,7 @@ static void msdc_start_command(struct msdc_host *host,
14441444
WARN_ON(host->cmd);
14451445
host->cmd = cmd;
14461446

1447-
mod_delayed_work(system_wq, &host->req_timeout, DAT_TIMEOUT);
1447+
mod_delayed_work(system_percpu_wq, &host->req_timeout, DAT_TIMEOUT);
14481448
if (!msdc_cmd_is_ready(host, mrq, cmd))
14491449
return;
14501450

0 commit comments

Comments
 (0)