March 2020 - Alsa-devel - mailman.alsa-project.org

Applied "ASoC: soc-dapm: Merge for_each_rtd_cpu/codec_dais()" to the asoc tree
by Mark Brown 20 Mar '20

20 Mar '20

The patch ASoC: soc-dapm: Merge for_each_rtd_cpu/codec_dais() has been applied to the asoc tree at https://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 >From e3c3cf71013fd959abf455abc20386051d37c529 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Mon, 16 Mar 2020 15:37:09 +0900 Subject: [PATCH] ASoC: soc-dapm: Merge for_each_rtd_cpu/codec_dais() Now we can use for_each_rtd_dais(). Let's use it instead of for_each_rtd_cpu/codec_dais(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/87tv2ooley.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-dapm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d5eb52fe115b..04da7928c873 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -4433,14 +4433,11 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) static void soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, int event) { - struct snd_soc_dai *codec_dai; - struct snd_soc_dai *cpu_dai; + struct snd_soc_dai *dai; int i; - for_each_rtd_cpu_dais(rtd, i, cpu_dai) - soc_dapm_dai_stream_event(cpu_dai, stream, event); - for_each_rtd_codec_dais(rtd, i, codec_dai) - soc_dapm_dai_stream_event(codec_dai, stream, event); + for_each_rtd_dais(rtd, i, dai) + soc_dapm_dai_stream_event(dai, stream, event); dapm_power_widgets(rtd->card, event); } -- 2.20.1

1 0

[PATCH v3 0/6] ASoC: Merge CPU/Codec DAIs
by Kuninori Morimoto 20 Mar '20

20 Mar '20

Hi Mark Previous v2 patch-set can't be applied on top of latest for-5.7 branch. This v3 is rebased version on top of it. Current ALSA SoC has CPU/Codec categorized DAIs. But we want to have non-categorized DAIs in the future. This was indicated by Lars-Peter before at ELCE. But, we *can't* do it right now. Because many drivers are considering CPU and Codec separately. Currently, rtd has both CPU/Codec DAIs array. rtd->cpu_dais = [][][][][][][][][] rtd->codec_dais = [][][][][][][][][] This patch merges these, like below. It still can use rtd->cpu_dais, rtd->codec_dais. Of course for_each_rtd_cpu/codec_dais() macro too. So we can use/keep existing code/method same as before. rtd->dais = [][][][][][][][][][][][][][][][][][] ^cpu_dais ^codec_dais |--- num_cpus ---|--- num_codecs --| rtd->cpu_dais = &rtd->dais[0]; rtd->codec_dais = &rtd->dais[dai_link->num_cpus]; There are some code which is doing something *only* for CPU or Codec. This patch-set do nothing to such code. Maybe it can be updated in the future, maybe not (can't). I hope this patch-set can be 1st step for non-categorized DAIs. But the main purpose so far is that replace the duplicate code for borh CPU and Codec. - for_each_rtd_cpu_dais() { - ... - } - for_each_rtd_codec_dais() { - ... - } + for_each_rtd_dais() { + ... + } Kuninori Morimoto (6): ASoC: soc-core: Merge CPU/Codec DAIs ASoC: soc-core: Merge for_each_rtd_cpu/codec_dais() ASoC: soc-dapm: Merge for_each_rtd_cpu/codec_dais() ASoC: soc-pcm: Merge for_each_rtd_cpu/codec_dais() ASoC: soc-core: Merge CPU/Codec for soc_dai_pcm_new() ASoC: soc-pcm: Merge CPU/Codec MSB at soc_pcm_apply_msb() include/sound/soc.h | 7 +- sound/soc/soc-core.c | 66 ++++----- sound/soc/soc-dapm.c | 9 +- sound/soc/soc-pcm.c | 337 +++++++++++-------------------------------- 4 files changed, 116 insertions(+), 303 deletions(-) -- 2.17.1

5 13

Applied "ASoC: soc-core: Merge CPU/Codec for soc_dai_pcm_new()" to the asoc tree
by Mark Brown 20 Mar '20

20 Mar '20

The patch ASoC: soc-core: Merge CPU/Codec for soc_dai_pcm_new() has been applied to the asoc tree at https://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 >From d1eb6d116123b2bcebeefce8bcdc828c80b033b8 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Mon, 16 Mar 2020 15:37:20 +0900 Subject: [PATCH] ASoC: soc-core: Merge CPU/Codec for soc_dai_pcm_new() Now CPU/Codec DAIs are alias for dais. Thus, we can directly use for_each_rtd_dais() macro for soc_dai_pcm_new(). This patch merge CPU/Codec for it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/87r1xsolen.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-core.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 246d59966795..843b8b1c89d4 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1037,20 +1037,20 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card, } EXPORT_SYMBOL_GPL(snd_soc_add_pcm_runtime); -static int soc_dai_pcm_new(struct snd_soc_dai **dais, int num_dais, - struct snd_soc_pcm_runtime *rtd) +static int soc_dai_pcm_new(struct snd_soc_pcm_runtime *rtd) { + struct snd_soc_dai *dai; int i, ret = 0; - for (i = 0; i < num_dais; ++i) { - struct snd_soc_dai_driver *drv = dais[i]->driver; + for_each_rtd_dais(rtd, i, dai) { + struct snd_soc_dai_driver *drv = dai->driver; if (drv->pcm_new) - ret = drv->pcm_new(rtd, dais[i]); + ret = drv->pcm_new(rtd, dai); if (ret < 0) { - dev_err(dais[i]->dev, + dev_err(dai->dev, "ASoC: Failed to bind %s with pcm device\n", - dais[i]->name); + dai->name); return ret; } } @@ -1121,13 +1121,8 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card, dai_link->stream_name, ret); return ret; } - ret = soc_dai_pcm_new(rtd->cpu_dais, - rtd->num_cpus, rtd); - if (ret < 0) - return ret; - ret = soc_dai_pcm_new(rtd->codec_dais, - rtd->num_codecs, rtd); - return ret; + + return soc_dai_pcm_new(rtd); } static void soc_set_name_prefix(struct snd_soc_card *card, -- 2.20.1

1 0

Re: [patch 02/22] x86/cpu: Add conistent CPU match macros
by Andy Shevchenko 20 Mar '20

20 Mar '20

On Fri, Mar 20, 2020 at 3:18 PM Thomas Gleixner <tglx(a)linutronix.de> wrote: > > Finding all places which build x86_cpu_id match tables is tedious and the > logic is hidden in lots of differently named macro wrappers. > > Most of these initializer macros use plain C89 initializers which rely on > the ordering of the struct members. So new members could only be added at > the end of the struct, but that's ugly as hell and C99 initializers are > really the right thing to use. > > Provide a set of macros which: > > - Have a proper naming scheme, starting with X86_MATCH_ > > - Use C99 initializers > > The set of provided macros are all subsets of the base macro > > X86_MATCH_VENDOR_FAM_MODEL_FEATURE() > > which allows to supply all possible selection criteria: > > vendor, family, model, feature > > The other macros shorten this to avoid typing all arguments when they are > not needed and would require one of the _ANY constants. They have been > created due to the requirements of the existing usage sites. > > Also a add a few model constants for Centaur CPUs and QUARK. I would perhaps made this as a separate change(s). ... > +#define X86_MATCH_VENDOR_FAM_MODEL_FEATURE(_vendor, _family, _model, \ > + _feature, _data) { \ I would leave it on one line despite the length, but it's up to you. > + .vendor = X86_VENDOR_##_vendor, \ > + .family = _family, \ > + .model = _model, \ > + .feature = _feature, \ > + .driver_data = (unsigned long) _data \ For sake of consistency shouldn't be this kernel_ulong_t ? Or we are going to get rid of that type? > } ... > +#define X86_MATCH_VENDOR_FAM_FEATURE(vendor, family, feature, data) \ > + X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, \ > + X86_MODEL_ANY, feature, data) I would leave it on one line despite the length, but it's up to you. ... > +#define X86_MATCH_VENDOR_FAM_MODEL(vendor, family, model, data) \ > + X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, model, \ > + X86_FEATURE_ANY, data) Ditto. ... > + * X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_BROADWELL, > + * X86_FEATURE_ANY, NULL); Perhaps one line? -- With Best Regards, Andy Shevchenko

2 1

Re: [patch 01/22] x86/devicetable: Move x86 specific macro out of generic code
by Andy Shevchenko 20 Mar '20

20 Mar '20

On Fri, Mar 20, 2020 at 3:17 PM Thomas Gleixner <tglx(a)linutronix.de> wrote: > > There is no reason that this gunk is in a generic header file. The wildcard > defines need to stay as they are required by file2alias. > > Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> > --- > arch/x86/include/asm/cpu_device_id.h | 13 ++++++++++++- > arch/x86/kvm/svm.c | 1 + > arch/x86/kvm/vmx/vmx.c | 1 + > drivers/cpufreq/acpi-cpufreq.c | 1 + > drivers/cpufreq/amd_freq_sensitivity.c | 1 + > include/linux/mod_devicetable.h | 4 +--- > 6 files changed, 17 insertions(+), 4 deletions(-) > > --- a/arch/x86/include/asm/cpu_device_id.h > +++ b/arch/x86/include/asm/cpu_device_id.h > @@ -6,10 +6,21 @@ > * Declare drivers belonging to specific x86 CPUs > * Similar in spirit to pci_device_id and related PCI functions > */ > - Seems you are going to remove below anyway in the next patches, so, why not to do this also there? > #include <linux/mod_devicetable.h> -- With Best Regards, Andy Shevchenko

2 1

sof-broadwell-rt286: use symlinks to reuse existing UCM
by GitHub pull_request - opened 20 Mar '20

20 Mar '20

alsa-project/alsa-ucm-conf pull request #18 was opened from plbossart: There are no firmware-specific settings to it's fine to reuse the legacy file as is. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/18 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/18.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 00/12] ASoC: SOF DSP virtualisation
by Guennadi Liakhovetski 20 Mar '20

20 Mar '20

This patch series extends the SOF driver to add support for DSP virtualisation to ASoC. It is built on top of VirtIO, contains a guest driver and a vhost in-kernel guest driver. This version supports a single playback and a single capture interface on the guest. The specific guest audio topology is supplied by the host from a file, specified on the QEMU command line. This solution is designed to use advanced DSP functionality, available on the host. In case no DSP is available on the host, a fall-back should be provided in the future to the pure audio virtualisation standard, currently developed by OASIS. Extensive documentation is available at [1]. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski at linux.intel.com> v2: one patch merged, one patch resubmitted separately, otherwise no changes. [1] https://thesofproject.github.io/latest/developer_guides/virtualization/virt… Guennadi Liakhovetski (12): ASoC: add function parameters to enable forced path pruning ASoC: SOF: extract firmware-related operation into a function ASoC: SOF: VirtIO: make a function global vhost: convert VHOST_VSOCK_SET_RUNNING to a generic ioctl ASoC: SOF: support IPC with immediate response ASoC: SOF: add a power status IPC ASoC: SOF: add two helper lookup functions ASoC: SOF: add a VirtIO DSP driver ASoC: SOF: add a vhost driver: sound part vhost: add an SOF DSP driver ASoC: SOF: VirtIO: free guest pipelines upon termination ASoC: SOF: VirtIO: enable simultaneous playback and capture drivers/vhost/Kconfig | 7 + drivers/vhost/Makefile | 5 + drivers/vhost/dsp.c | 731 ++++++++++++++++++++++ include/sound/soc-dpcm.h | 28 +- include/sound/soc-topology.h | 3 + include/sound/sof.h | 4 + include/sound/sof/header.h | 3 + include/sound/sof/topology.h | 1 + include/sound/sof/virtio.h | 206 +++++++ include/uapi/linux/vhost.h | 9 +- include/uapi/linux/vhost_types.h | 7 + include/uapi/linux/virtio_ids.h | 1 + sound/soc/soc-compress.c | 2 +- sound/soc/soc-dapm.c | 8 +- sound/soc/soc-pcm.c | 98 ++- sound/soc/sof/Kconfig | 8 + sound/soc/sof/Makefile | 8 + sound/soc/sof/core.c | 114 ++-- sound/soc/sof/ipc.c | 39 +- sound/soc/sof/loader.c | 4 + sound/soc/sof/ops.h | 10 +- sound/soc/sof/pcm.c | 15 +- sound/soc/sof/pm.c | 4 + sound/soc/sof/sof-audio.c | 33 + sound/soc/sof/sof-audio.h | 21 + sound/soc/sof/sof-priv.h | 54 ++ sound/soc/sof/topology.c | 71 ++- sound/soc/sof/vhost-be.c | 1248 ++++++++++++++++++++++++++++++++++++++ sound/soc/sof/virtio-fe.c | 922 ++++++++++++++++++++++++++++ 29 files changed, 3555 insertions(+), 109 deletions(-) create mode 100644 drivers/vhost/dsp.c create mode 100644 include/sound/sof/virtio.h create mode 100644 sound/soc/sof/vhost-be.c create mode 100644 sound/soc/sof/virtio-fe.c -- 1.9.3

1 12

Re: [patch 00/22] x86/treewide: Consolidate CPU match macro maze and get rid of C89 (sic!) initializers
by Greg Kroah-Hartman 20 Mar '20

20 Mar '20

On Fri, Mar 20, 2020 at 02:13:45PM +0100, Thomas Gleixner wrote: > The x86 CPU matching based on struct x86_cpu_id: > > - is using an inconsistent macro mess with pointlessly duplicated and > slightly different local macros. Finding the places is an art as there > is no consistent name space at all. > > - is still mostly based on C89 struct initializers which rely on the > ordering of the struct members. That's proliferated forever as every > new driver just copies the mess from some exising one. > > A recent offlist conversation about adding more match criteria to the CPU > matching logic instead of creating yet another set of horrors, reminded me > of a pile of scripts and patches which I hacked on a few years ago when I > tried to add something to struct x86_cpu_id. > > That stuff was finally not needed and ended up in my ever growing todo list > and collected dust and cobwebs, but (un)surprisingly enough most of it > still worked out of the box. The copy & paste machinery still works as it > did years ago. > > There are a few places which needed extra care due to new creative macros, > new check combinations etc. and surprisingly ONE open coded proper C99 > initializer. > > It was reasonably simple to make it at least compile and pass a quick > binary equivalence check. > > The result is a X86_MATCH prefix based set of macros which are reflecting > the needs of the usage sites and shorten the base macro which takes all > possible parameters (vendor, family, model, feature, data) and uses proper > C99 initializers. > > So extensions of the match logic are trivial after that. > > The patch set is against Linus tree and has trivial conflicts against > linux-next. > > The diffstat is: > 71 files changed, 525 insertions(+), 472 deletions(-) > > but the extra lines are pretty much kernel-doc documentation which I added > to each of the new macros. The usage sites diffstat is: > > 70 files changed, 393 insertions(+), 471 deletions(-) > > Thoughts? Much nicer looking, thanks for cleaning up this mess: Reviewed-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>

1 0

Re: [patch 19/22] ASoC: Intel: Convert to new X86 CPU match macros
by Andy Shevchenko 20 Mar '20

20 Mar '20

On Fri, Mar 20, 2020 at 3:18 PM Thomas Gleixner <tglx(a)linutronix.de> wrote: > > The new macro set has a consistent namespace and uses C99 initializers > instead of the grufty C89 ones. > > Get rid the of the local macro wrappers for consistency. > -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } > - > #define SOC_INTEL_IS_CPU(soc, type) \ > static inline bool soc_intel_is_##soc(void) \ > { \ > static const struct x86_cpu_id soc##_cpu_ids[] = { \ > - ICPU(type), \ > + X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \ > {} \ > }; \ > const struct x86_cpu_id *id; \ > @@ -32,11 +30,11 @@ static inline bool soc_intel_is_##soc(vo > return false; \ > } > > +SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT); > +SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT); > +SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT); > +SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS); > +SOC_INTEL_IS_CPU(cml, KABYLAKE_L); I'm wondering if driver data can be used in one macro to distinguish which CPU we are run on. Takashi, what do you think? -- With Best Regards, Andy Shevchenko

1 0

Re: [patch 11/22] platform/x86: Convert to new CPU match macros
by Andy Shevchenko 20 Mar '20

20 Mar '20

On Fri, Mar 20, 2020 at 3:18 PM Thomas Gleixner <tglx(a)linutronix.de> wrote: > > The new macro set has a consistent namespace and uses C99 initializers > instead of the grufty C89 ones. > > Get rid the of the local macro wrappers for consistency. > Reviewed-by: Andy Shevchenko <andy.shevchenko(a)gmail.com> > Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> > Cc: Darren Hart <dvhart(a)infradead.org> > Cc: Andy Shevchenko <andy(a)infradead.org> > Cc: platform-driver-x86(a)vger.kernel.org > --- > drivers/platform/x86/intel-uncore-frequency.c | 14 ++--- > drivers/platform/x86/intel_int0002_vgpio.c | 4 - > drivers/platform/x86/intel_mid_powerbtn.c | 4 - > drivers/platform/x86/intel_pmc_core.c | 24 +++++----- > drivers/platform/x86/intel_pmc_core_pltdrv.c | 16 +++--- > drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c | 4 - > drivers/platform/x86/intel_telemetry_debugfs.c | 5 -- > drivers/platform/x86/intel_telemetry_pltdrv.c | 7 -- > drivers/platform/x86/intel_turbo_max_3.c | 6 -- > 9 files changed, 37 insertions(+), 47 deletions(-) > > --- a/drivers/platform/x86/intel-uncore-frequency.c > +++ b/drivers/platform/x86/intel-uncore-frequency.c > @@ -358,15 +358,13 @@ static struct notifier_block uncore_pm_n > .notifier_call = uncore_pm_notify, > }; > > -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } > - > static const struct x86_cpu_id intel_uncore_cpu_ids[] = { > - ICPU(INTEL_FAM6_BROADWELL_G), > - ICPU(INTEL_FAM6_BROADWELL_X), > - ICPU(INTEL_FAM6_BROADWELL_D), > - ICPU(INTEL_FAM6_SKYLAKE_X), > - ICPU(INTEL_FAM6_ICELAKE_X), > - ICPU(INTEL_FAM6_ICELAKE_D), > + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, NULL), > {} > }; > > --- a/drivers/platform/x86/intel_int0002_vgpio.c > +++ b/drivers/platform/x86/intel_int0002_vgpio.c > @@ -148,8 +148,8 @@ static struct irq_chip int0002_cht_irqch > }; > > static const struct x86_cpu_id int0002_cpu_ids[] = { > - INTEL_CPU_FAM6(ATOM_SILVERMONT, int0002_byt_irqchip), /* Valleyview, Bay Trail */ > - INTEL_CPU_FAM6(ATOM_AIRMONT, int0002_cht_irqchip), /* Braswell, Cherry Trail */ > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &int0002_byt_irqchip), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, &int0002_cht_irqchip), > {} > }; > > --- a/drivers/platform/x86/intel_mid_powerbtn.c > +++ b/drivers/platform/x86/intel_mid_powerbtn.c > @@ -113,8 +113,8 @@ static const struct mid_pb_ddata mrfld_d > }; > > static const struct x86_cpu_id mid_pb_cpu_ids[] = { > - INTEL_CPU_FAM6(ATOM_SALTWELL_MID, mfld_ddata), > - INTEL_CPU_FAM6(ATOM_SILVERMONT_MID, mrfld_ddata), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID, &mfld_ddata), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &mrfld_ddata), > {} > }; > > --- a/drivers/platform/x86/intel_pmc_core.c > +++ b/drivers/platform/x86/intel_pmc_core.c > @@ -871,18 +871,18 @@ static inline void pmc_core_dbgfs_unregi > #endif /* CONFIG_DEBUG_FS */ > > static const struct x86_cpu_id intel_pmc_core_ids[] = { > - INTEL_CPU_FAM6(SKYLAKE_L, spt_reg_map), > - INTEL_CPU_FAM6(SKYLAKE, spt_reg_map), > - INTEL_CPU_FAM6(KABYLAKE_L, spt_reg_map), > - INTEL_CPU_FAM6(KABYLAKE, spt_reg_map), > - INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map), > - INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map), > - INTEL_CPU_FAM6(ICELAKE_NNPI, icl_reg_map), > - INTEL_CPU_FAM6(COMETLAKE, cnp_reg_map), > - INTEL_CPU_FAM6(COMETLAKE_L, cnp_reg_map), > - INTEL_CPU_FAM6(TIGERLAKE_L, tgl_reg_map), > - INTEL_CPU_FAM6(TIGERLAKE, tgl_reg_map), > - INTEL_CPU_FAM6(ATOM_TREMONT, tgl_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &spt_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &spt_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &spt_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &spt_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, &cnp_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &icl_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI, &icl_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &cnp_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &cnp_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &tgl_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &tgl_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT, &tgl_reg_map), > {} > }; > > --- a/drivers/platform/x86/intel_pmc_core_pltdrv.c > +++ b/drivers/platform/x86/intel_pmc_core_pltdrv.c > @@ -38,14 +38,14 @@ static struct platform_device pmc_core_d > * other list may grow, but this list should not. > */ > static const struct x86_cpu_id intel_pmc_core_platform_ids[] = { > - INTEL_CPU_FAM6(SKYLAKE_L, pmc_core_device), > - INTEL_CPU_FAM6(SKYLAKE, pmc_core_device), > - INTEL_CPU_FAM6(KABYLAKE_L, pmc_core_device), > - INTEL_CPU_FAM6(KABYLAKE, pmc_core_device), > - INTEL_CPU_FAM6(CANNONLAKE_L, pmc_core_device), > - INTEL_CPU_FAM6(ICELAKE_L, pmc_core_device), > - INTEL_CPU_FAM6(COMETLAKE, pmc_core_device), > - INTEL_CPU_FAM6(COMETLAKE_L, pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &pmc_core_device), > {} > }; > MODULE_DEVICE_TABLE(x86cpu, intel_pmc_core_platform_ids); > --- a/drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c > +++ b/drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c > @@ -160,10 +160,8 @@ static struct notifier_block isst_pm_nb > .notifier_call = isst_pm_notify, > }; > > -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } > - > static const struct x86_cpu_id isst_if_cpu_ids[] = { > - ICPU(INTEL_FAM6_SKYLAKE_X), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL), > {} > }; > MODULE_DEVICE_TABLE(x86cpu, isst_if_cpu_ids); > --- a/drivers/platform/x86/intel_telemetry_debugfs.c > +++ b/drivers/platform/x86/intel_telemetry_debugfs.c > @@ -308,11 +308,10 @@ static struct telemetry_debugfs_conf tel > }; > > static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = { > - INTEL_CPU_FAM6(ATOM_GOLDMONT, telem_apl_debugfs_conf), > - INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS, telem_apl_debugfs_conf), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &telem_apl_debugfs_conf), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &telem_apl_debugfs_conf), > {} > }; > - > MODULE_DEVICE_TABLE(x86cpu, telemetry_debugfs_cpu_ids); > > static int telemetry_debugfs_check_evts(void) > --- a/drivers/platform/x86/intel_telemetry_pltdrv.c > +++ b/drivers/platform/x86/intel_telemetry_pltdrv.c > @@ -67,9 +67,6 @@ > #define TELEM_CLEAR_VERBOSITY_BITS(x) ((x) &= ~(BIT(27) | BIT(28))) > #define TELEM_SET_VERBOSITY_BITS(x, y) ((x) |= ((y) << 27)) > > -#define TELEM_CPU(model, data) \ > - { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&data } > - > enum telemetry_action { > TELEM_UPDATE = 0, > TELEM_ADD, > @@ -183,8 +180,8 @@ static struct telemetry_plt_config telem > }; > > static const struct x86_cpu_id telemetry_cpu_ids[] = { > - TELEM_CPU(INTEL_FAM6_ATOM_GOLDMONT, telem_apl_config), > - TELEM_CPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS, telem_glk_config), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &telem_apl_config), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &telem_glk_config), > {} > }; > > --- a/drivers/platform/x86/intel_turbo_max_3.c > +++ b/drivers/platform/x86/intel_turbo_max_3.c > @@ -113,11 +113,9 @@ static int itmt_legacy_cpu_online(unsign > return 0; > } > > -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } > - > static const struct x86_cpu_id itmt_legacy_cpu_ids[] = { > - ICPU(INTEL_FAM6_BROADWELL_X), > - ICPU(INTEL_FAM6_SKYLAKE_X), > + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL), > {} > }; > > -- With Best Regards, Andy Shevchenko

1 0