From patchwork Fri Oct 30 06:01:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1390805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=pVrX/b6T; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CMsD23nrmz9sSn; Fri, 30 Oct 2020 17:02:42 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kYNUk-0007Sf-Au; Fri, 30 Oct 2020 06:02:38 +0000 Received: from mail-pf1-f194.google.com ([209.85.210.194]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kYNUh-0007Ok-SR for kernel-team@lists.ubuntu.com; Fri, 30 Oct 2020 06:02:36 +0000 Received: by mail-pf1-f194.google.com with SMTP id j18so4361501pfa.0 for ; Thu, 29 Oct 2020 23:02:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q3G7YjYNtqD+hB/VXinBzafysNpmzLArDSixKTfnuOE=; b=pVrX/b6TSIfipdaoeYP3+jUvw/9PLrRjfWJuHP1hoDAKLFE123HbLZkQOA1WGXrKR8 o3ePQdUVSCaicRLOP32TcFkxodMZvuD05E39GuhJEzkOw/6qMsU0EhWjlDUCgHKEVCL1 eEtVZW2O2EPC9Dufcs8n9LDYL7EsP3r8B8euhACj26vU8C4i3x5jLBRlyEWcURz3utLL lMOyOrDSoT5VzTpa/IluXIJZiPqQqvb5YCqI6tAh4LGZk0HccnaaQUfCDbbdcnYMthmM mWya9Rs2gK3ofr5awF6XI9AQlNj+qeD7tUHdeptp0gkpFHpHK4Pk6kp2tIZph4L2dzTE xP0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=q3G7YjYNtqD+hB/VXinBzafysNpmzLArDSixKTfnuOE=; b=Btw3s7+faTSbXmneciww4rVKIMRqFpJgkF7K0dSQ2HF6X70OO7raTkFBm79sh7ztIy F0JMfGIkN1JXMomL0Z/m5JaZaPxHPL14NcBTQ96dpeqwefEGlRQreUzm4SPy1Ftyl58D wTv4yGU06uSfCuH0+qt78RbHP2ycOncFmAtJ5gUWswdeNQcPXEUxdqG2fFHpQj4YrQDe O5H58kzzXdjg1eWaKGDMY0Llzc/e8ILYPAiZxeaLjTCuNWInzSnjMGC7LYHbmS+8/fFo /CUHJl+LB1lP996cS/edKhDT5743t5EmQqy0gvUNnNJXi1GbD+Lghrsw7bNd2cOGuFkt KbMA== X-Gm-Message-State: AOAM5328rZ/QQxvDEXPSruPIbqqQe4W6+A6dKfYLVTyoOorCu5dOA+P9 y4UAkVPFGUOiSrHO7a2R37HQcJ3JAtdPJQ== X-Google-Smtp-Source: ABdhPJxRlrvXRZO5xbVYW5iHmhLR+Hu9ACNkD5iRl14Nk8w6uW6q/kFJc3bzzJhvG1ILgtjlbrKbQw== X-Received: by 2002:a63:d456:: with SMTP id i22mr842306pgj.440.1604037752594; Thu, 29 Oct 2020 23:02:32 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id t11sm1761927pjs.8.2020.10.29.23.02.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 23:02:32 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 01/23][SRU][OEM-5.6] x86/devicetable: Move x86 specific macro out of generic code Date: Fri, 30 Oct 2020 14:01:52 +0800 Message-Id: <20201030060214.780883-7-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201030060214.780883-1-acelan.kao@canonical.com> References: <20201030060214.780883-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.210.194; envelope-from=acelan@gmail.com; helo=mail-pf1-f194.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Thomas Gleixner BugLink: https://bugs.launchpad.net/bugs/1899883 There is no reason that this gunk is in a generic header file. The wildcard defines need to stay as they are required by file2alias. Signed-off-by: Thomas Gleixner Signed-off-by: Borislav Petkov Reviewed-by: Greg Kroah-Hartman Link: https://lkml.kernel.org/r/20200320131508.736205164@linutronix.de (cherry picked from commit ba5bade4cc0d2013cdf5634dae554693c968a090) Signed-off-by: AceLan Kao --- arch/x86/include/asm/cpu_device_id.h | 13 ++++++++++++- arch/x86/kvm/svm.c | 1 + arch/x86/kvm/vmx/vmx.c | 1 + drivers/cpufreq/acpi-cpufreq.c | 1 + drivers/cpufreq/amd_freq_sensitivity.c | 1 + include/linux/mod_devicetable.h | 4 +--- 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h index 0c814cd9ea42..663cd0658214 100644 --- a/arch/x86/include/asm/cpu_device_id.h +++ b/arch/x86/include/asm/cpu_device_id.h @@ -6,7 +6,6 @@ * Declare drivers belonging to specific x86 CPUs * Similar in spirit to pci_device_id and related PCI functions */ - #include #define X86_CENTAUR_FAM6_C7_D 0xd @@ -39,6 +38,18 @@ .driver_data = (unsigned long) _data \ } +/* + * The wildcard initializers are in mod_devicetable.h because + * file2alias needs them. Sigh. + */ + +#define X86_FEATURE_MATCH(x) { \ + .vendor = X86_VENDOR_ANY, \ + .family = X86_FAMILY_ANY, \ + .model = X86_MODEL_ANY, \ + .feature = x, \ +} + /* * Match specific microcode revisions. * diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index eee7cb0e1d95..db6c8d537bb4 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #include "trace.h" diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index b29902c521f2..a86993ae5ffa 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index d6f7df33ab8c..7ff659525587 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -30,6 +30,7 @@ #include #include #include +#include MODULE_AUTHOR("Paul Diefenbaugh, Dominik Brodowski"); MODULE_DESCRIPTION("ACPI Processor P-States Driver"); diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c index e2df9d112106..5107cbe2d64d 100644 --- a/drivers/cpufreq/amd_freq_sensitivity.c +++ b/drivers/cpufreq/amd_freq_sensitivity.c @@ -18,6 +18,7 @@ #include #include +#include #include "cpufreq_ondemand.h" diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 953d7ca01eb6..472f890137de 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -672,9 +672,7 @@ struct x86_cpu_id { __u16 steppings; }; -#define X86_FEATURE_MATCH(x) \ - { X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, x } - +/* Wild cards for x86_cpu_id::vendor, family, model and feature */ #define X86_VENDOR_ANY 0xffff #define X86_FAMILY_ANY 0 #define X86_MODEL_ANY 0