From nobody Fri Dec 19 19:16:11 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 0902813C801 for ; Mon, 20 May 2024 22:46:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716245221; cv=none; b=Ppr0DPywYv3jG2xyV6TZ+0IZad77wdIbQjN0sWuRZfWAh5ekfuls71QHKmt0bkBxE19gD9/4+CMUnLWeY4kTngFiU8tbQDsCv7Nu9c7NWLgOt5aJvPiUHdmw/P677B23YFtxxKuR3+G2VP+YMrSMLILo0lAlh2oZRJYqPEItZuM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716245221; c=relaxed/simple; bh=ZlPHTm39lOOUOHNKeeb7Ctia3jKnfxDT65NpqhR4lvo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sXuDKUv7dZfd8n+PAzggeGU6Clxx0CBP25Hz5053ID2GG/RuvB/ZL8sUKmNFlmfYj8Wyh3zXCOTUJ73Ld9IBSaL52O7nBhqKLGBj6L3KBBu9yK2OAv0NVU4te72aJj5YBJYLoMnXaeDnn+ww3ksuOmGfMwCFg+sWPKYgiE0Trv8= 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=AUzDB/Gk; arc=none smtp.client-ip=192.198.163.18 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="AUzDB/Gk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716245220; x=1747781220; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZlPHTm39lOOUOHNKeeb7Ctia3jKnfxDT65NpqhR4lvo=; b=AUzDB/Gkxde+PC1JMrRJdfCKvM8t7oOpDLbNIfUpGB0WkUeIgcMM0IbO 3T5p2q5BCRsC17//p0l/LfFZOTmg/bVwgvY1Bn55R8orE1998aRFtPcG0 mNrXk/rvrMZiw5Zu3ZSaiAvPikqRY1WMpCnZMCAMYHNtupoilwW59Ucv8 QBp52dgO1vuWU5jesXoGDoTCeiv1ivHLIivppUVTPJChJDXqN2k1uYEF6 t+rQoN+qic3oZvZT+xT42dx7gtlecAtiweY/iUPM5pjRZEe9aUsQtkcec AzrPW2y3Qg6ELU8q2u+f/baw0ynSQmdorgJJTYBkGb8itflNerRTyV/kM g==; X-CSE-ConnectionGUID: HUSGbnt9SGyItQT22HBOsQ== X-CSE-MsgGUID: 2ArpsIP4SdyrRJnKMRjqZQ== X-IronPort-AV: E=McAfee;i="6600,9927,11078"; a="12200044" X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="12200044" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 15:46:41 -0700 X-CSE-ConnectionGUID: JniqsW9TRHmQrveKHwMIcA== X-CSE-MsgGUID: 6xQLbY0ETrqwBxgyWud0HQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="32593531" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 15:46:41 -0700 From: Tony Luck To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "H. Peter Anvin" , "Peter Zijlstra (Intel)" , Uros Bizjak , Rick Edgecombe , Arnd Bergmann , Tony Luck , Mateusz Guzik , Thomas Renninger , Andi Kleen , linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v6 48/49] x86/cpu/vfm: Delete X86_MATCH_INTEL_FAM6_MODEL[_STEPPING]() macros Date: Mon, 20 May 2024 15:46:19 -0700 Message-ID: <20240520224620.9480-49-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240520224620.9480-1-tony.luck@intel.com> References: <20240520224620.9480-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" These macros have been replaced by X86_MATCH_VFM[_STEPPING]() Signed-off-by: Tony Luck --- arch/x86/include/asm/cpu_device_id.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cp= u_device_id.h index df07d3776db8..4be902a1d74c 100644 --- a/arch/x86/include/asm/cpu_device_id.h +++ b/arch/x86/include/asm/cpu_device_id.h @@ -189,26 +189,6 @@ #define X86_MATCH_VENDOR_FAM(vendor, family, data) \ X86_MATCH_VENDOR_FAM_MODEL(vendor, family, X86_MODEL_ANY, data) =20 -/** - * X86_MATCH_INTEL_FAM6_MODEL - Match vendor INTEL, family 6 and model - * @model: The model name without the INTEL_FAM6_ prefix or ANY - * The model name is expanded to INTEL_FAM6_@model internally - * @data: Driver specific data or NULL. The internal storage - * format is unsigned long. The supplied value, pointer - * etc. is casted to unsigned long internally. - * - * The vendor is set to INTEL, the family to 6 and all other missing - * arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are set to wildcards. - * - * See X86_MATCH_VENDOR_FAM_MODEL_FEATURE() for further information. - */ -#define X86_MATCH_INTEL_FAM6_MODEL(model, data) \ - X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, INTEL_FAM6_##model, data) - -#define X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(model, steppings, data) \ - X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(INTEL, 6, INTEL_FAM6_##model= , \ - steppings, X86_FEATURE_ANY, data) - /** * X86_MATCH_VFM - Match encoded vendor/family/model * @vfm: Encoded 8-bits each for vendor, family, model --=20 2.45.0