[v6,05/49,RESEND] media: atomisp: Switch to new Intel CPU model defines

Message ID 20240611173406.352874-1-tony.luck@intel.com (mailing list archive)
State New
Headers
Series None |

Commit Message

Luck, Tony June 11, 2024, 5:34 p.m. UTC
  New CPU #defines encode vendor and family as well as model.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
---

Mauro, Hans, Greg: Which one of you owns this one. Can you take
a look please. Let me know if changes are needed.

 .../atomisp/include/linux/atomisp_platform.h  | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)
  

Comments

Greg Kroah-Hartman June 12, 2024, 8:08 a.m. UTC | #1
On Tue, Jun 11, 2024 at 10:34:06AM -0700, Tony Luck wrote:
> New CPU #defines encode vendor and family as well as model.
> 
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> Reviewed-by: Andy Shevchenko <andy@kernel.org>
> Acked-by: Hans de Goede <hdegoede@redhat.com>
> ---
> 
> Mauro, Hans, Greg: Which one of you owns this one. Can you take
> a look please. Let me know if changes are needed.
> 
>  .../atomisp/include/linux/atomisp_platform.h  | 27 ++++++++-----------
>  1 file changed, 11 insertions(+), 16 deletions(-)

Not me!  :)
  
Hans de Goede June 12, 2024, 8:10 a.m. UTC | #2
Hi Tony,

On 6/11/24 7:34 PM, Tony Luck wrote:
> New CPU #defines encode vendor and family as well as model.
> 
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> Reviewed-by: Andy Shevchenko <andy@kernel.org>
> Acked-by: Hans de Goede <hdegoede@redhat.com>
> ---
> 
> Mauro, Hans, Greg: Which one of you owns this one. Can you take
> a look please. Let me know if changes are needed.

I'll pick this one up. But atomisp support is a side project,
so I only work on this every few weeks.

My intent is to get this send to Mauro (media-next) in time
for the 6.11 merge window.

Regards,

Hans



> 
>  .../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 0e3f6fb78483..fdeb247036b0 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 <asm/intel-family.h>
> +#include <asm/cpu_device_id.h>
>  #include <asm/processor.h>
>  
>  #include <linux/i2c.h>
> @@ -178,22 +178,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_ */
  
Mauro Carvalho Chehab June 12, 2024, 3:24 p.m. UTC | #3
Em Wed, 12 Jun 2024 10:10:14 +0200
Hans de Goede <hdegoede@redhat.com> escreveu:

> Hi Tony,
> 
> On 6/11/24 7:34 PM, Tony Luck wrote:
> > New CPU #defines encode vendor and family as well as model.
> > 
> > Signed-off-by: Tony Luck <tony.luck@intel.com>
> > Reviewed-by: Andy Shevchenko <andy@kernel.org>
> > Acked-by: Hans de Goede <hdegoede@redhat.com>
> > ---
> > 
> > Mauro, Hans, Greg: Which one of you owns this one. Can you take
> > a look please. Let me know if changes are needed.  
> 
> I'll pick this one up. But atomisp support is a side project,
> so I only work on this every few weeks.
> 
> My intent is to get this send to Mauro (media-next) in time
> for the 6.11 merge window.

Hans,

It seems that you already acked to this one, right?

If so, please add my acked-by, if this will end being merged
via some other tree.

Tony,

I don't object having this merged via your tree with Hans
ack.

We may also have it merged on media via Hans tree. He usually
send me one or two pull requests per Kernel cycle with lots
of atomisp patches on it.

Regards,
Mauro

Thanks,
Mauro
  
Luck, Tony June 13, 2024, 3:35 p.m. UTC | #4
> > My intent is to get this send to Mauro (media-next) in time
> > for the 6.11 merge window.
>
> Hans,
>
> It seems that you already acked to this one, right?
>
> If so, please add my acked-by, if this will end being merged
> via some other tree.
>
> Tony,
>
> I don't object having this merged via your tree with Hans
> ack.
>
> We may also have it merged on media via Hans tree. He usually
> send me one or two pull requests per Kernel cycle with lots
> of atomisp patches on it.

The only tree I currently have that feeds to linux-next is the RAS tree
I share with Boris. This doesn't belong there.

I'm asking various subsystem maintainers to take these through
the appropriate trees and having quite good success. This patch
is one of seven looking for a home.

So please take it through the media tree.

Thanks

-Tony
  
Mauro Carvalho Chehab June 13, 2024, 7:48 p.m. UTC | #5
Em Thu, 13 Jun 2024 15:35:57 +0000
"Luck, Tony" <tony.luck@intel.com> escreveu:

> > > My intent is to get this send to Mauro (media-next) in time
> > > for the 6.11 merge window.  
> >
> > Hans,
> >
> > It seems that you already acked to this one, right?
> >
> > If so, please add my acked-by, if this will end being merged
> > via some other tree.
> >
> > Tony,
> >
> > I don't object having this merged via your tree with Hans
> > ack.
> >
> > We may also have it merged on media via Hans tree. He usually
> > send me one or two pull requests per Kernel cycle with lots
> > of atomisp patches on it.  
> 
> The only tree I currently have that feeds to linux-next is the RAS tree
> I share with Boris. This doesn't belong there.
> 
> I'm asking various subsystem maintainers to take these through
> the appropriate trees and having quite good success. This patch
> is one of seven looking for a home.
> 
> So please take it through the media tree.

Ok!

I'll pick it and merge it.

Hans, no need to pick it on your tree ;-)

Regards,
Mauro
  

Patch

diff --git a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
index 0e3f6fb78483..fdeb247036b0 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 <asm/intel-family.h>
+#include <asm/cpu_device_id.h>
 #include <asm/processor.h>
 
 #include <linux/i2c.h>
@@ -178,22 +178,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_ */