From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44858EB64DC for ; Tue, 11 Jul 2023 14:00:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230296AbjGKOAR (ORCPT ); Tue, 11 Jul 2023 10:00:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229714AbjGKOAQ (ORCPT ); Tue, 11 Jul 2023 10:00:16 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32E06B0; Tue, 11 Jul 2023 07:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689084015; x=1720620015; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=Q64irnKAz6fiSs2TqIhiYmK+yWyDNfKOvxIYYho1PUE=; b=DHXe6Rn6CwRHT1XKhYfnsI++Eq7C35/UmPpGSrrmRB90ILXab0O9vZDT Uvb2+K4Z1J/3U2po7PryDcwAzF3NvLtK9dEdFNfKgB7l7c91fRJ+U2oM7 g1CdTw2RwNs6vFykyleHXUaRbosgb9QBYs0Ntj3IspHD73Dj0QisyCPKt wjNgC//Jkfj2DNDJ+QX36WS2IgBOqFKNhnZ56EPsWSpN4nj//XLCFW467 XNE6nw1uTOJouVBuk0gkCuWxx5pY4ackvu1G0aOPNObp7QiT5AOv8R7KN CPeDJ7PdqwiSCCHFdhu/w/on19zFvafOdK+e0UNQW3cnXUqvPFDvvzvNa w==; X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="395410223" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="395410223" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2023 07:00:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="834706770" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="834706770" Received: from smile.fi.intel.com ([10.237.72.54]) by fmsmga002.fm.intel.com with ESMTP; 11 Jul 2023 07:00:10 -0700 Received: from andy by smile.fi.intel.com with local (Exim 4.96) (envelope-from ) id 1qJDuS-001rq7-1j; Tue, 11 Jul 2023 17:00:08 +0300 Date: Tue, 11 Jul 2023 17:00:08 +0300 From: Andy Shevchenko To: Amadeusz =?utf-8?B?U8WCYXdpxYRza2k=?= Cc: Bjorn Helgaas , Mark Brown , Takashi Iwai , alsa-devel@alsa-project.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Cezary Rojewski , Pierre-Louis Bossart , Kai Vehmanen , Hans de Goede Subject: Re: [PATCH 07/13] ALSA: intel-dsp-config: Convert to PCI device IDs defines Message-ID: References: <20230711125726.3509391-1-amadeuszx.slawinski@linux.intel.com> <20230711125726.3509391-8-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230711125726.3509391-8-amadeuszx.slawinski@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Tue, Jul 11, 2023 at 02:57:20PM +0200, Amadeusz Sławiński wrote: > Use PCI device IDs from pci_ids.h header. Also simplify comments for > Alder Lake and Raptor Lake platforms, as new IDs make it clear what > revision is in use. Reviewed-by: Andy Shevchenko # for Intel Tangier ID One remark below. > Acked-by: Mark Brown > Signed-off-by: Amadeusz Sławiński > --- > sound/hda/intel-dsp-config.c | 119 ++++++++++++++++------------------- > 1 file changed, 55 insertions(+), 64 deletions(-) > > diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c > index 317bdf6dcbef..2a71fa5ffec1 100644 > --- a/sound/hda/intel-dsp-config.c > +++ b/sound/hda/intel-dsp-config.c > @@ -50,14 +50,14 @@ static const struct config_entry config_table[] = { > #if IS_ENABLED(CONFIG_SND_SOC_SOF_MERRIFIELD) > { > .flags = FLAG_SOF, > - .device = 0x119a, > + .device = PCI_DEVICE_ID_INTEL_ADSP_TNG, Yeah, somebody familiar with Intel history of SST/HDA/wtf should really tell why HDA code is using this ID. Does it mean that SST implies HDA always? Only for this (or this family of) platform? It might affect the ID naming, but otherwise it's orthogonal to the series. > }, > #endif > /* Broxton-T */ > #if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE) > { > .flags = FLAG_SOF, > - .device = 0x1a98, > + .device = PCI_DEVICE_ID_INTEL_HDA_APL_T, > }, > #endif > /* > @@ -68,7 +68,7 @@ static const struct config_entry config_table[] = { > #if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE) > { > .flags = FLAG_SOF, > - .device = 0x5a98, > + .device = PCI_DEVICE_ID_INTEL_HDA_APL, > .dmi_table = (const struct dmi_system_id []) { > { > .ident = "Up Squared", > @@ -82,14 +82,14 @@ static const struct config_entry config_table[] = { > }, > { > .flags = FLAG_SOF, > - .device = 0x5a98, > + .device = PCI_DEVICE_ID_INTEL_HDA_APL, > .codec_hid = &essx_83x6, > }, > #endif > #if IS_ENABLED(CONFIG_SND_SOC_INTEL_APL) > { > .flags = FLAG_SST, > - .device = 0x5a98, > + .device = PCI_DEVICE_ID_INTEL_HDA_APL, > .dmi_table = (const struct dmi_system_id []) { > { > .ident = "Google Chromebooks", > @@ -110,7 +110,7 @@ static const struct config_entry config_table[] = { > #if IS_ENABLED(CONFIG_SND_SOC_INTEL_SKL) > { > .flags = FLAG_SST, > - .device = 0x9d70, > + .device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP, > .dmi_table = (const struct dmi_system_id []) { > { > .ident = "Google Chromebooks", > @@ -123,14 +123,14 @@ static const struct config_entry config_table[] = { > }, > { > .flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC, > - .device = 0x9d70, > + .device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP, > }, > #endif > /* Kabylake-LP */ > #if IS_ENABLED(CONFIG_SND_SOC_INTEL_KBL) > { > .flags = FLAG_SST, > - .device = 0x9d71, > + .device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP, > .dmi_table = (const struct dmi_system_id []) { > { > .ident = "Google Chromebooks", > @@ -143,7 +143,7 @@ static const struct config_entry config_table[] = { > }, > { > .flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC, > - .device = 0x9d71, > + .device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP, > }, > #endif > > @@ -155,7 +155,7 @@ static const struct config_entry config_table[] = { > #if IS_ENABLED(CONFIG_SND_SOC_SOF_GEMINILAKE) > { > .flags = FLAG_SOF, > - .device = 0x3198, > + .device = PCI_DEVICE_ID_INTEL_HDA_GML, > .dmi_table = (const struct dmi_system_id []) { > { > .ident = "Google Chromebooks", > @@ -168,7 +168,7 @@ static const struct config_entry config_table[] = { > }, > { > .flags = FLAG_SOF, > - .device = 0x3198, > + .device = PCI_DEVICE_ID_INTEL_HDA_GML, > .codec_hid = &essx_83x6, > }, > #endif > @@ -188,7 +188,7 @@ static const struct config_entry config_table[] = { > #if IS_ENABLED(CONFIG_SND_SOC_SOF_CANNONLAKE) > { > .flags = FLAG_SOF, > - .device = 0x9dc8, > + .device = PCI_DEVICE_ID_INTEL_HDA_CNL_LP, > .dmi_table = (const struct dmi_system_id []) { > { > .ident = "Google Chromebooks", > @@ -207,12 +207,12 @@ static const struct config_entry config_table[] = { > }, > { > .flags = FLAG_SOF, > - .device = 0x09dc8, > + .device = PCI_DEVICE_ID_INTEL_HDA_CNL_LP, > .codec_hid = &essx_83x6, > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x9dc8, > + .device = PCI_DEVICE_ID_INTEL_HDA_CNL_LP, > }, > #endif > > @@ -220,7 +220,7 @@ static const struct config_entry config_table[] = { > #if IS_ENABLED(CONFIG_SND_SOC_SOF_COFFEELAKE) > { > .flags = FLAG_SOF, > - .device = 0xa348, > + .device = PCI_DEVICE_ID_INTEL_HDA_CNL_H, > .dmi_table = (const struct dmi_system_id []) { > { > .ident = "Google Chromebooks", > @@ -233,7 +233,7 @@ static const struct config_entry config_table[] = { > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0xa348, > + .device = PCI_DEVICE_ID_INTEL_HDA_CNL_H, > }, > #endif > > @@ -241,7 +241,7 @@ static const struct config_entry config_table[] = { > /* Cometlake-LP */ > { > .flags = FLAG_SOF, > - .device = 0x02c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_CML_LP, > .dmi_table = (const struct dmi_system_id []) { > { > .ident = "Google Chromebooks", > @@ -267,17 +267,17 @@ static const struct config_entry config_table[] = { > }, > { > .flags = FLAG_SOF, > - .device = 0x02c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_CML_LP, > .codec_hid = &essx_83x6, > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x02c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_CML_LP, > }, > /* Cometlake-H */ > { > .flags = FLAG_SOF, > - .device = 0x06c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_CML_H, > .dmi_table = (const struct dmi_system_id []) { > { > .matches = { > @@ -296,12 +296,12 @@ static const struct config_entry config_table[] = { > }, > { > .flags = FLAG_SOF, > - .device = 0x06c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_CML_H, > .codec_hid = &essx_83x6, > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x06c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_CML_H, > }, > #endif > > @@ -309,7 +309,7 @@ static const struct config_entry config_table[] = { > #if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE) > { > .flags = FLAG_SOF, > - .device = 0x34c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_ICL_LP, > .dmi_table = (const struct dmi_system_id []) { > { > .ident = "Google Chromebooks", > @@ -322,12 +322,12 @@ static const struct config_entry config_table[] = { > }, > { > .flags = FLAG_SOF, > - .device = 0x34c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_ICL_LP, > .codec_hid = &essx_83x6, > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x34c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_ICL_LP, > }, > #endif > > @@ -335,7 +335,7 @@ static const struct config_entry config_table[] = { > #if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE) > { > .flags = FLAG_SOF, > - .device = 0x4dc8, > + .device = PCI_DEVICE_ID_INTEL_HDA_JSL_N, > .dmi_table = (const struct dmi_system_id []) { > { > .ident = "Google Chromebooks", > @@ -348,12 +348,12 @@ static const struct config_entry config_table[] = { > }, > { > .flags = FLAG_SOF, > - .device = 0x4dc8, > + .device = PCI_DEVICE_ID_INTEL_HDA_JSL_N, > .codec_hid = &essx_83x6, > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC, > - .device = 0x4dc8, > + .device = PCI_DEVICE_ID_INTEL_HDA_JSL_N, > }, > #endif > > @@ -361,7 +361,7 @@ static const struct config_entry config_table[] = { > #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE) > { > .flags = FLAG_SOF, > - .device = 0xa0c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_TGL_LP, > .dmi_table = (const struct dmi_system_id []) { > { > .ident = "Google Chromebooks", > @@ -380,16 +380,16 @@ static const struct config_entry config_table[] = { > }, > { > .flags = FLAG_SOF, > - .device = 0xa0c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_TGL_LP, > .codec_hid = &essx_83x6, > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0xa0c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_TGL_LP, > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x43c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_TGL_H, > }, > #endif > > @@ -397,78 +397,69 @@ static const struct config_entry config_table[] = { > #if IS_ENABLED(CONFIG_SND_SOC_SOF_ELKHARTLAKE) > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC, > - .device = 0x4b55, > + .device = PCI_DEVICE_ID_INTEL_HDA_EHL_0, > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC, > - .device = 0x4b58, > + .device = PCI_DEVICE_ID_INTEL_HDA_EHL_3, > }, > #endif > > -/* Alder Lake */ > +/* Alder Lake / Raptor Lake */ > #if IS_ENABLED(CONFIG_SND_SOC_SOF_ALDERLAKE) > - /* Alderlake-S */ > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x7ad0, > + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_S, > }, > - /* RaptorLake-S */ > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x7a50, > + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_S, > }, > - /* Alderlake-P */ > { > .flags = FLAG_SOF, > - .device = 0x51c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_P, > .codec_hid = &essx_83x6, > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x51c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_P, > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x51cd, > + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_PX, > }, > - /* Alderlake-PS */ > { > .flags = FLAG_SOF, > - .device = 0x51c9, > + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_PS, > .codec_hid = &essx_83x6, > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x51c9, > + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_PS, > }, > - /* Alderlake-M */ > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x51cc, > + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_M, > }, > - /* Alderlake-N */ > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x54c8, > + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_N, > }, > - /* RaptorLake-P */ > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x51ca, > + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_0, > }, > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x51cb, > + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_1, > }, > - /* RaptorLake-M */ > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x51ce, > + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_M, > }, > - /* RaptorLake-PX */ > { > .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, > - .device = 0x51cf, > + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_PX, > }, > #endif > > @@ -549,7 +540,7 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci) > const struct config_entry *cfg; > > /* Intel vendor only */ > - if (pci->vendor != 0x8086) > + if (pci->vendor != PCI_VENDOR_ID_INTEL) > return SND_INTEL_DSP_DRIVER_ANY; > > /* > @@ -557,12 +548,12 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci) > * for HDMI/DP support, ignore kernel parameter > */ > switch (pci->device) { > - case 0x160c: /* Broadwell */ > - case 0x0a0c: /* Haswell */ > - case 0x0c0c: > - case 0x0d0c: > - case 0x0f04: /* Baytrail */ > - case 0x2284: /* Braswell */ > + case PCI_DEVICE_ID_INTEL_HDA_BDW: > + case PCI_DEVICE_ID_INTEL_HDA_HSW_0: > + case PCI_DEVICE_ID_INTEL_HDA_HSW_2: > + case PCI_DEVICE_ID_INTEL_HDA_HSW_3: > + case PCI_DEVICE_ID_INTEL_HDA_BYT: > + case PCI_DEVICE_ID_INTEL_HDA_BSW: > return SND_INTEL_DSP_DRIVER_ANY; > } > > -- > 2.34.1 > -- With Best Regards, Andy Shevchenko