From patchwork Tue Apr 16 21:22:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Luck X-Patchwork-Id: 1924455 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=A9Azzt1O; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45d1:ec00::1; helo=ny.mirrors.kernel.org; envelope-from=linux-pci+bounces-6332-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org [IPv6:2604:1380:45d1:ec00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VJy0t2pzlz1yYB for ; Wed, 17 Apr 2024 07:31:58 +1000 (AEST) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 530C21C22C8A for ; Tue, 16 Apr 2024 21:31:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8955A152521; Tue, 16 Apr 2024 21:22:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="A9Azzt1O" X-Original-To: linux-pci@vger.kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 38E6415217A; Tue, 16 Apr 2024 21:22:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302542; cv=none; b=mJklT9t2Heqw1B2PD/+X3xqyfig1EtpJgBDIwGCPBZO22+d8LKVFTZUh6HpKECgTOfQJPgofcUqzd16+3ZPj+fd5viFssZkZCAAMObpaja6lWrrwKf6UlkEbAER9inUifoXK4ko74zuy16KrrKr9QlGfi3dYEsMWoHAN6Ca8zt0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302542; c=relaxed/simple; bh=/298Une+Q9Sn9FwIP6fJUsWhONOKrs7AQEbwqwMcHfA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IRvoyvS66NxE1HneKu0B9fn6IBKqebywfLk4vqRz4fFcEU2hsOFNFxjmSOt3a6FtFtzTUmCT8NT8DN0/mGeGfzTGR+pGvp7B9CFipayobwPEYsyjBRA8CJaeBWXhgBI2DJp8b9az5HWvZGhjrI6przODM1vwcj+sQSjnu0cwOAw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=A9Azzt1O; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302542; x=1744838542; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/298Une+Q9Sn9FwIP6fJUsWhONOKrs7AQEbwqwMcHfA=; b=A9Azzt1O1bL922yQrVMtH/WKMKZY2yci28bELn4PUAFED5j4V2qQ9aMz Av/0fmYbCDMy7+UgJUWMGETKErkoxngysVhMcsun3yLDfbCgPG9h5pXqn H7ILBIfo8aBJRgNHDOWKF3jO0rcJkha+5Kc02X1AM9KzmLHtFIZMSGtqP jsFlPcrQ/H7+Qiw0PJNs5siUaXyURZJRHHQ7x/ANasbVjlH37MlJOMifV Zchm0wIMgJvyBBRKAPF7DGKo3jhNu9MS5j6z7j20Jgo4FzCNzLyRKM8hA jGNyK9YH6v6AwFvi1FtjdcXNWWy1FN8wMEywW7tfEfzd8zU176z/rd7jA w==; X-CSE-ConnectionGUID: qRzKmqxcSUiKTt/WM3NkhA== X-CSE-MsgGUID: sQmN4IhZRhmAvl6ObJsoUQ== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234919" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234919" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:22 -0700 X-CSE-ConnectionGUID: KffXtiapTRG3ueqR0c23dA== X-CSE-MsgGUID: UTuuVrIbQ9elOnRDRiUixQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267091" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:21 -0700 From: Tony Luck To: linux-kernel@vger.kernel.org Cc: Bjorn Helgaas , linux-pci@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v3 52/74] x86/cpu/vfm: Update drivers/pci/pci-mid.c Date: Tue, 16 Apr 2024 14:22:19 -0700 Message-ID: <20240416212219.9643-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240416211941.9369-1-tony.luck@intel.com> References: <20240416211941.9369-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Acked-by: Bjorn Helgaas --- drivers/pci/pci-mid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci-mid.c b/drivers/pci/pci-mid.c index fbfd78127123..bed9f0755271 100644 --- a/drivers/pci/pci-mid.c +++ b/drivers/pci/pci-mid.c @@ -38,8 +38,8 @@ pci_power_t mid_pci_get_power_state(struct pci_dev *pdev) * arch/x86/platform/intel-mid/pwr.c. */ static const struct x86_cpu_id lpss_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, NULL), + X86_MATCH_VFM(INTEL_ATOM_SALTWELL_MID, NULL), + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, NULL), {} };