ASoC: intel: Use kvzalloc() for suspend buffers
Subsystems (3)
PATCH 1/1 ASoC: intel: Use kvzalloc() for suspend buffers
Intel SST driver allocates lots of pages at suspend for saving the firmware states, and this may occasionally lead to the allocation error due to the high order, ending up with the suspend failure.
Use kvzalloc() so that it can fall back to vmalloc() gracefully.
--- sound/soc/intel/atom/sst/sst.c | 22 +++++++++++----------- sound/soc/intel/atom/sst/sst.h | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-)
sound/soc/intel/atom/sst/sst.c +11 -11
@@ -499,23 +499,23 @@ static int intel_sst_suspend(struct device *dev) fw_save =kzalloc (sizeof (*fw_save),GFP_KERNEL );if (!fw_save)return -ENOMEM ; - fw_save->iram =kzalloc (ctx->iram_end - ctx->iram_base,GFP_KERNEL ); + fw_save->iram =kvzalloc (ctx->iram_end - ctx->iram_base,GFP_KERNEL );if (!fw_save->iram) { ret = -ENOMEM ; goto iram; } - fw_save->dram =kzalloc (ctx->dram_end - ctx->dram_base,GFP_KERNEL ); + fw_save->dram =kvzalloc (ctx->dram_end - ctx->dram_base,GFP_KERNEL );if (!fw_save->dram) { ret = -ENOMEM ; goto dram; } - fw_save->sram =kzalloc (SST_MAILBOX_SIZE ,GFP_KERNEL ); + fw_save->sram =kvzalloc (SST_MAILBOX_SIZE ,GFP_KERNEL );if (!fw_save->sram) { ret = -ENOMEM ; goto sram; } - fw_save->ddr =kzalloc (ctx->ddr_end - ctx->ddr_base,GFP_KERNEL ); + fw_save->ddr =kvzalloc (ctx->ddr_end - ctx->ddr_base,GFP_KERNEL );if (!fw_save->ddr) { ret = -ENOMEM ; goto ddr;
@@ -530,11 +530,11 @@ static int intel_sst_suspend(struct device *dev) ctx->ops->reset (ctx);return 0 ; ddr: -kfree (fw_save->sram); +kvfree (fw_save->sram); sram: -kfree (fw_save->dram); +kvfree (fw_save->dram); dram: -kfree (fw_save->iram); +kvfree (fw_save->iram); iram:kfree (fw_save);return ret;
@@ -562,10 +562,10 @@ static int intel_sst_resume(struct device *dev)memcpy32_toio (ctx->mailbox, fw_save->sram,SST_MAILBOX_SIZE );memcpy32_toio (ctx->ddr, fw_save->ddr, ctx->ddr_end - ctx->ddr_base); -kfree (fw_save->sram); -kfree (fw_save->dram); -kfree (fw_save->iram); -kfree (fw_save->ddr); +kvfree (fw_save->sram); +kvfree (fw_save->dram); +kvfree (fw_save->iram); +kvfree (fw_save->ddr);kfree (fw_save); block =sst_create_block (ctx,0 ,FW_DWNL_ID );
sound/soc/intel/atom/sst/sst.h +4 -4
@@ -338,10 +338,10 @@ struct sst_shim_regs64 { };struct sst_fw_save { -void *iram; -void *dram; -void *sram; -void *ddr; +void *iram;/* allocated via kvmalloc() */ +void *dram;/* allocated via kvmalloc() */ +void *sram;/* allocated via kvmalloc() */ +void *ddr;/* allocated via kvmalloc() */ };/**
Signature · 1 line
2.13.1
Mark Brown
maintainerApplied "ASoC: intel: Use kvzalloc() for suspend buffers" to the asoc tree
The patch
ASoC: intel: Use kvzalloc() for suspend buffers
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
75bd90860a1f6d4671403f5b7beb9c4430ca9750Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Fri, 16 Jun 2017 11:20:29 +0200
Subject: [PATCH] ASoC: intel: Use kvzalloc() for suspend buffers
Intel SST driver allocates lots of pages at suspend for saving the firmware states, and this may occasionally lead to the allocation error due to the high order, ending up with the suspend failure.
Use kvzalloc() so that it can fall back to vmalloc() gracefully.
--- sound/soc/intel/atom/sst/sst.c | 22 +++++++++++----------- sound/soc/intel/atom/sst/sst.h | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-)
sound/soc/intel/atom/sst/sst.c +11 -11
@@ -464,23 +464,23 @@ static int intel_sst_suspend(struct device *dev) fw_save =kzalloc (sizeof (*fw_save),GFP_KERNEL );if (!fw_save)return -ENOMEM ; - fw_save->iram =kzalloc (ctx->iram_end - ctx->iram_base,GFP_KERNEL ); + fw_save->iram =kvzalloc (ctx->iram_end - ctx->iram_base,GFP_KERNEL );if (!fw_save->iram) { ret = -ENOMEM ; goto iram; } - fw_save->dram =kzalloc (ctx->dram_end - ctx->dram_base,GFP_KERNEL ); + fw_save->dram =kvzalloc (ctx->dram_end - ctx->dram_base,GFP_KERNEL );if (!fw_save->dram) { ret = -ENOMEM ; goto dram; } - fw_save->sram =kzalloc (SST_MAILBOX_SIZE ,GFP_KERNEL ); + fw_save->sram =kvzalloc (SST_MAILBOX_SIZE ,GFP_KERNEL );if (!fw_save->sram) { ret = -ENOMEM ; goto sram; } - fw_save->ddr =kzalloc (ctx->ddr_end - ctx->ddr_base,GFP_KERNEL ); + fw_save->ddr =kvzalloc (ctx->ddr_end - ctx->ddr_base,GFP_KERNEL );if (!fw_save->ddr) { ret = -ENOMEM ; goto ddr;
@@ -495,11 +495,11 @@ static int intel_sst_suspend(struct device *dev) ctx->ops->reset (ctx);return 0 ; ddr: -kfree (fw_save->sram); +kvfree (fw_save->sram); sram: -kfree (fw_save->dram); +kvfree (fw_save->dram); dram: -kfree (fw_save->iram); +kvfree (fw_save->iram); iram:kfree (fw_save);return ret;
@@ -527,10 +527,10 @@ static int intel_sst_resume(struct device *dev)memcpy32_toio (ctx->mailbox, fw_save->sram,SST_MAILBOX_SIZE );memcpy32_toio (ctx->ddr, fw_save->ddr, ctx->ddr_end - ctx->ddr_base); -kfree (fw_save->sram); -kfree (fw_save->dram); -kfree (fw_save->iram); -kfree (fw_save->ddr); +kvfree (fw_save->sram); +kvfree (fw_save->dram); +kvfree (fw_save->iram); +kvfree (fw_save->ddr);kfree (fw_save); block =sst_create_block (ctx,0 ,FW_DWNL_ID );
sound/soc/intel/atom/sst/sst.h +4 -4
@@ -318,10 +318,10 @@ struct sst_ipc_reg { };struct sst_fw_save { -void *iram; -void *dram; -void *sram; -void *ddr; +void *iram;/* allocated via kvmalloc() */ +void *dram;/* allocated via kvmalloc() */ +void *sram;/* allocated via kvmalloc() */ +void *ddr;/* allocated via kvmalloc() */ };/**
Signature · 1 line
2.11.0