diff options
| author | Mark Brown <broonie@kernel.org> | 2019-10-02 12:50:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-10-02 12:50:40 +0100 |
| commit | 25317997cbcd0497a9460f79c322e0fde0b5b1a9 (patch) | |
| tree | 215512440bd5a9ce931789d7c0f24d47e7c5d572 /sound/soc/sof/intel/bdw.c | |
| parent | 3a9e204d4e36904a464a2e53206b053a7ffc7bad (diff) | |
| parent | 2bdf194e2030fce4f2e91300817338353414ab3b (diff) | |
| download | linux-25317997cbcd0497a9460f79c322e0fde0b5b1a9.tar.gz linux-25317997cbcd0497a9460f79c322e0fde0b5b1a9.tar.bz2 linux-25317997cbcd0497a9460f79c322e0fde0b5b1a9.zip | |
Merge branch 'asoc-5.4' into asoc-5.5
Diffstat (limited to 'sound/soc/sof/intel/bdw.c')
| -rw-r--r-- | sound/soc/sof/intel/bdw.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c index 170c74dc13b1..f395d0638876 100644 --- a/sound/soc/sof/intel/bdw.c +++ b/sound/soc/sof/intel/bdw.c @@ -37,6 +37,7 @@ #define MBOX_SIZE 0x1000 #define MBOX_DUMP_SIZE 0x30 #define EXCEPT_OFFSET 0x800 +#define EXCEPT_MAX_HDR_SIZE 0x400 /* DSP peripherals */ #define DMAC0_OFFSET 0xFE000 @@ -228,6 +229,11 @@ static void bdw_get_registers(struct snd_sof_dev *sdev, /* note: variable AR register array is not read */ /* then get panic info */ + if (xoops->arch_hdr.totalsize > EXCEPT_MAX_HDR_SIZE) { + dev_err(sdev->dev, "invalid header size 0x%x. FW oops is bogus\n", + xoops->arch_hdr.totalsize); + return; + } offset += xoops->arch_hdr.totalsize; sof_mailbox_read(sdev, offset, panic_info, sizeof(*panic_info)); @@ -471,6 +477,7 @@ static int bdw_probe(struct snd_sof_dev *sdev) /* TODO: add offsets */ sdev->mmio_bar = BDW_DSP_BAR; sdev->mailbox_bar = BDW_DSP_BAR; + sdev->dsp_oops_offset = MBOX_OFFSET; /* PCI base */ mmio = platform_get_resource(pdev, IORESOURCE_MEM, |