Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp36872848rwd; Tue, 11 Jul 2023 06:49:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlFRGf/lyhzj+06FPxArFzWLTfBcm83r8dWjGUFVeAPcHUERDu7C2+2VmNjAxe8emOyMQYn7 X-Received: by 2002:a05:6a20:12c5:b0:126:d0e2:3fb4 with SMTP id v5-20020a056a2012c500b00126d0e23fb4mr19373014pzg.56.1689083375246; Tue, 11 Jul 2023 06:49:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689083375; cv=none; d=google.com; s=arc-20160816; b=UZ6Sty/XAuY9lGGAvlofwPmmbpfL13Rc0uJvz2Um36KNTqVDbQwe4dAVWiP3TyqOZR oyLJELYUFoFO7qnJCyzCBWcuNF2Bx2H1sFpe5t37c8cdcc0eHMZ6Xv7mZA+UVyzlx6Vi zjgA7BzicG9QomMcgvXQWQC4vShGgqu/8y3C88nyRfleP/LP82MhEiz+wMeO0LA2Oxap Xx7EWRWNCtIQqPbAYByZtXIGcdi3A9KlyFq+RIVvnP9zsQbdtqKcMjGKTws9m2RRX2eg CvyKzhfuHYPET+NGasdaAMCVgyS7hqm8vbiyMm+ZBIvPCLKMubaq++qYnCN262zqBQ3y aC/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:organization:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=I9ikz2XNVxCbdl4PwmpcMOVot9YSDK2rpUaoSws4oEI=; fh=QIxVZGhhMgXfiCn5/o7wEmC8dtB/wWZRH3ra0t2zEhg=; b=HZsBmLtzyhO09jBurNYkuhUULY+TcFtG7zJuo73pwwTIdZXfzxKRodCugNHAiITDha A8yMsbOZ6+yVFW8f86XtAWvQtjnVZjvbnjte9TVlksouEf4CNud9zua+Fcj8ITlYrOlK 6GQwyOFUe/20av60+fS5oY3MfeuI0zA+MGdNivUArYrzrBNSZyxUVNwLJtwooLqm2ssh s6jXTMT1nc9NBTF090fGqDgt7AqAXxBoJTEtUAyS01/kvpIZP8+4dZkaEbpzgOZ/xjhY 0J5jk0/AsGWnc9qcVk44Pdocxjl+IPnI046COuYvfkgXmOwvG9ZBBlF798uLkCu29hGM o2jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="Mfaw/GvE"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o3-20020a056a001bc300b0067dd87a586esi1457609pfw.377.2023.07.11.06.49.22; Tue, 11 Jul 2023 06:49:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="Mfaw/GvE"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230175AbjGKNhw (ORCPT + 99 others); Tue, 11 Jul 2023 09:37:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229479AbjGKNhv (ORCPT ); Tue, 11 Jul 2023 09:37:51 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9B97BC; Tue, 11 Jul 2023 06:37:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689082669; x=1720618669; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=sDKsooMzYAP81kDUoSO2n2MLd1qZqSlgq3mclaJSUS4=; b=Mfaw/GvEg4n67sXM3DfPJnE+wH6b67f8iIbX/YdPEKdvIh6aI1qwKKjs 7+P8GkUhdP7TMRfsY9ueiFdbIfIQUOjofteHfj4Dj/NqTB7pxBQq1jp9e f0y8HK1oHtVSQIBNWcMZZr65dodHmTpUAARYBwQxipiU3Xdr62ASCrP1t O6+ldiwkZQkdR2/LP03hK2upAE/Zvl1LjlRjVVRWAoL3/ngQ/bEoA1zuh zZBh+Y2unhW+YCWcw+z1R0zNJEbHR2YyvKCaAGxm7prb8EfMqH0ESZrZp 9tu1KEVbLo7mHSyCBfG3l7wWelORIfWAIU4qH0bbTqY4WOjL9pLmnSetp g==; X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="428315944" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="428315944" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2023 06:37:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="721091183" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="721091183" Received: from smile.fi.intel.com ([10.237.72.54]) by orsmga002.jf.intel.com with ESMTP; 11 Jul 2023 06:37:42 -0700 Received: from andy by smile.fi.intel.com with local (Exim 4.96) (envelope-from ) id 1qJDYi-001rVJ-1K; Tue, 11 Jul 2023 16:37:40 +0300 Date: Tue, 11 Jul 2023 16:37:40 +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 04/13] ALSA: hda: Use global PCI match macro Message-ID: References: <20230711125726.3509391-1-amadeuszx.slawinski@linux.intel.com> <20230711125726.3509391-5-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-5-amadeuszx.slawinski@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 11, 2023 at 02:57:17PM +0200, Amadeusz Sławiński wrote: > Instead of using local macro to match PCI device, use global one. I believe from the previous discussion that this one needs a couple of words w.r.t. BXT --> APL change. Otherwise, FWIW, Reviewed-by: Andy Shevchenko > Signed-off-by: Amadeusz Sławiński > --- > sound/pci/hda/hda_intel.c | 20 ++++---------------- > 1 file changed, 4 insertions(+), 16 deletions(-) > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index ef831770ca7d..143efa54b9bf 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -330,18 +330,6 @@ enum { > #define needs_eld_notify_link(chip) false > #endif > > -#define CONTROLLER_IN_GPU(pci) (((pci)->vendor == 0x8086) && \ > - (((pci)->device == 0x0a0c) || \ > - ((pci)->device == 0x0c0c) || \ > - ((pci)->device == 0x0d0c) || \ > - ((pci)->device == 0x160c) || \ > - ((pci)->device == 0x490d) || \ > - ((pci)->device == 0x4f90) || \ > - ((pci)->device == 0x4f91) || \ > - ((pci)->device == 0x4f92))) > - > -#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) > - > static const char * const driver_short_names[] = { > [AZX_DRIVER_ICH] = "HDA Intel", > [AZX_DRIVER_PCH] = "HDA Intel PCH", > @@ -573,7 +561,7 @@ static void hda_intel_init_chip(struct azx *chip, bool full_reset) > snd_hdac_set_codec_wakeup(bus, false); > > /* reduce dma latency to avoid noise */ > - if (IS_BXT(pci)) > + if (HDA_CONTROLLER_IS_APL(pci)) > bxt_reduce_dma_latency(chip); > > if (bus->mlcap != NULL) > @@ -2175,7 +2163,7 @@ static int azx_probe(struct pci_dev *pci, > #endif /* CONFIG_SND_HDA_PATCH_LOADER */ > > #ifndef CONFIG_SND_HDA_I915 > - if (CONTROLLER_IN_GPU(pci)) > + if (HDA_CONTROLLER_IN_GPU(pci)) > dev_err(card->dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n"); > #endif > > @@ -2283,7 +2271,7 @@ static int azx_probe_continue(struct azx *chip) > * for other chips, still continue probing as other > * codecs can be on the same link. > */ > - if (CONTROLLER_IN_GPU(pci)) { > + if (HDA_CONTROLLER_IN_GPU(pci)) { > dev_err(chip->card->dev, > "HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n"); > goto out_free; > @@ -2294,7 +2282,7 @@ static int azx_probe_continue(struct azx *chip) > } > > /* HSW/BDW controllers need this power */ > - if (CONTROLLER_IN_GPU(pci)) > + if (HDA_CONTROLLER_IN_GPU(pci)) > hda->need_i915_power = true; > } > > -- > 2.34.1 > -- With Best Regards, Andy Shevchenko