Users start to use topology ABI from v4. ABI v5 updated existing manifest and PCM elements. Two previous patches can support these ABI updates in a backward compatible way. So if the topology file from user space is generated by ABI v4, kernel will no longer quit but continue parsing.
Unified · Split
| @@ -83,7 +83,8 @@ · 82 unmodified lines | ||
| 83 | 83 | #define SND_SOC_TPLG_NUM_TEXTS 16 |
| 84 | 84 | |
| 85 | 85 | /* ABI version */ |
| 86 | −#define SND_SOC_TPLG_ABI_VERSION 0x5 | |
| 86 | +#define SND_SOC_TPLG_ABI_VERSION 0x5 /* current version */ | |
| 87 | +#define SND_SOC_TPLG_ABI_VERSION_MIN 0x4 /* oldest version supported */ | |
| 87 | 88 | |
| 88 | 89 | /* Max size of TLV data */ |
| 89 | 90 | #define SND_SOC_TPLG_TLV_SIZE 32 |
| @@ -2056,7 +2056,9 @@ static int soc_valid_header(struct soc_tplg *tplg, · 2055 unmodified lines | ||
| 2056 | 2056 | return -EINVAL; |
| 2057 | 2057 | } |
| 2058 | 2058 | |
| 2059 | − if (hdr->abi != SND_SOC_TPLG_ABI_VERSION) { | |
| 2059 | + /* Support ABI from version 4 */ | |
| 2060 | + if (hdr->abi > SND_SOC_TPLG_ABI_VERSION | |
| 2061 | + || hdr->abi < SND_SOC_TPLG_ABI_VERSION_MIN) { | |
| 2060 | 2062 | dev_err(tplg->dev, |
| 2061 | 2063 | "ASoC: pass %d invalid ABI version got 0x%x need 0x%x at offset 0x%lx size 0x%zx.\n", |
| 2062 | 2064 | tplg->pass, hdr->abi, |