From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 7ECED17A93B for ; Tue, 30 Apr 2024 16:51:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714495895; cv=none; b=N4zW8Y846MdS8BBG3B6KjgCnkim9pYd9BQV3AJuM4Z02iie9StWVoRhaQYE/fYVQVan0hlszc/X9mnfffpJwuc6lnNrGV0w3mAvUbGvhGHDgP3UU3LjU2zdSZ3Jw+cBSsPANXKYFmficHavQ3A6AqaT4eK9v+8HD23PXcYI5L6U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714495895; c=relaxed/simple; bh=87KOavhDhX411TrRX1K9/1DFXE3gMTK1YvOMoRFJCZ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RggVZ78lZtyzESnjBmPDBlsOXVpYUaUkyt8irpNDolE+wtZLI3VxKlyXBITGkUexh9EQ+YOArxwliFtcN101EGlv63pNlsdg2gjCnhbb7l8T0Rr0r+QRLZLLdRNz6rGCgEiRRD8fsIZA5V2rQX/ze4b/Byb8zaPCH84apsmozLg= 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=R2Jumq2u; arc=none smtp.client-ip=198.175.65.19 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="R2Jumq2u" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714495894; x=1746031894; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=87KOavhDhX411TrRX1K9/1DFXE3gMTK1YvOMoRFJCZ4=; b=R2Jumq2uYb5KgqRdqBT1wvCJF9Z2jrhUu6dlsdURNGGr9O9eVRQsKqki IXav36WXSz3sGnOiDmZ4xw5N3RMfNkfhcQjBVBhuSxCkhVotFAO9DfrSm XajNhmj6s2PW/VKlC0NgisG9EroMJlinjnW9gBP8DTmpmWOlpjp3Nt+qC pSZbIaJbilUgq0+A6Kcoexlyje3UPzwZusb9ox9lSZrlIHRnaFkaxV+Wp VnVRkfZ/j+IfMFnoZXF4ROYIqJj5aZqzAG5l4kOeb7ZN+avP20oyJfBol +cO1HQJkPho1JiiNaW+1ARJrSLmnrGXztNMIbWugfu/eA6z1LNtxdWRJh g==; X-CSE-ConnectionGUID: y0SYexUyQR+Vkk5U+SqFPg== X-CSE-MsgGUID: DLdHEeV6Qwi+ivWiwQLBMQ== X-IronPort-AV: E=McAfee;i="6600,9927,11060"; a="10075592" X-IronPort-AV: E=Sophos;i="6.07,242,1708416000"; d="scan'208";a="10075592" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2024 09:51:20 -0700 X-CSE-ConnectionGUID: 8zRbP+gSQNa1oAhpk7SJSw== X-CSE-MsgGUID: OToypoliSbeVGWSk7C+7NA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,242,1708416000"; d="scan'208";a="26515411" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2024 09:51:11 -0700 From: Tony Luck To: Borislav Petkov Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck , Andy Shevchenko , Hans de Goede Subject: [PATCH v5 03/47] media: atomisp: Switch to new Intel CPU model defines Date: Tue, 30 Apr 2024 09:50:16 -0700 Message-ID: <20240430165100.73491-3-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430165100.73491-1-tony.luck@intel.com> References: <20240430164913.73473-1-tony.luck@intel.com> <20240430165100.73491-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Reviewed-by: Andy Shevchenko Acked-by: Hans de Goede --- .../atomisp/include/linux/atomisp_platform.h | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h index 487ef5846c24..70bab3d1bc2f 100644 --- a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h +++ b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h @@ -18,7 +18,7 @@ #ifndef ATOMISP_PLATFORM_H_ #define ATOMISP_PLATFORM_H_ -#include +#include #include #include @@ -217,22 +217,17 @@ void atomisp_unregister_subdev(struct v4l2_subdev *subdev); int v4l2_get_acpi_sensor_info(struct device *dev, char **module_id_str); /* API from old platform_camera.h, new CPUID implementation */ -#define __IS_SOC(x) (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && \ - boot_cpu_data.x86 == 6 && \ - boot_cpu_data.x86_model == (x)) -#define __IS_SOCS(x,y) (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && \ - boot_cpu_data.x86 == 6 && \ - (boot_cpu_data.x86_model == (x) || \ - boot_cpu_data.x86_model == (y))) - -#define IS_MFLD __IS_SOC(INTEL_FAM6_ATOM_SALTWELL_MID) -#define IS_BYT __IS_SOC(INTEL_FAM6_ATOM_SILVERMONT) -#define IS_CHT __IS_SOC(INTEL_FAM6_ATOM_AIRMONT) -#define IS_MRFD __IS_SOC(INTEL_FAM6_ATOM_SILVERMONT_MID) -#define IS_MOFD __IS_SOC(INTEL_FAM6_ATOM_AIRMONT_MID) +#define __IS_SOC(x) (boot_cpu_data.x86_vfm == x) +#define __IS_SOCS(x, y) (boot_cpu_data.x86_vfm == x || boot_cpu_data.x86_vfm == y) + +#define IS_MFLD __IS_SOC(INTEL_ATOM_SALTWELL_MID) +#define IS_BYT __IS_SOC(INTEL_ATOM_SILVERMONT) +#define IS_CHT __IS_SOC(INTEL_ATOM_AIRMONT) +#define IS_MRFD __IS_SOC(INTEL_ATOM_SILVERMONT_MID) +#define IS_MOFD __IS_SOC(INTEL_ATOM_AIRMONT_MID) /* Both CHT and MOFD come with ISP2401 */ -#define IS_ISP2401 __IS_SOCS(INTEL_FAM6_ATOM_AIRMONT, \ - INTEL_FAM6_ATOM_AIRMONT_MID) +#define IS_ISP2401 __IS_SOCS(INTEL_ATOM_AIRMONT, \ + INTEL_ATOM_AIRMONT_MID) #endif /* ATOMISP_PLATFORM_H_ */ -- 2.44.0