From patchwork Sun Aug 13 17:26:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 135089 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp2379894vqi; Sun, 13 Aug 2023 14:22:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE/Io+iskuFLrnXt0ZY3P6TAs5iplN5pHz2rWvfZRQ2TYjgHjkaxUpTEo3lYelAQfX1rdue X-Received: by 2002:a05:6a20:555:b0:128:ffb7:dcfe with SMTP id 21-20020a056a20055500b00128ffb7dcfemr8210761pzq.1.1691961747141; Sun, 13 Aug 2023 14:22:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691961747; cv=none; d=google.com; s=arc-20160816; b=OW6N3dHk4US1Q2vVCJboBmqWqv27sgSlL9GZ/tNO/wiWMLppbAaJFwe/ZdAZtLF9eb D+8rcRYpJySHuEPQcDJtWf2HKZiU7/4wtFMM25tyYNQV5xiE4DiezW5TgkOt02Z7ObnM GTm7uPXUM8Q6lt+m+F3K16VNcJp7Z4utl64LRUrrACgX6r0pvFH2qmIkmIhTjy9UT1vl XhF/Mlw3TCOOCCe4QE651RxRt2yuuG9Yi327NbpoEHERB8AqWhtp9gyGmzwWc9mZ72CR uWrSwZWTR2b6m2NGXmd12i0JGQ3LZM+w3OovVqBRXG11c2EzfMDz6Fw+8oAk5Rf3q2xc h9vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=3rtUuurXpz5X38s5vfCKJt9YuvD1VEhvJzZac2vIjiE=; fh=BeddWsR1yzxD6tdZBBcj38e6OObO3jHAI454XlpsalM=; b=JJ0n7Qs7/HzfExIFL+viwhasxVkVJsnOn8cR0MGwF/AO2INs9Djzq/hf0FM8toJVyf NiTCsYOikkVUh5wuc/UcARC2hxRACHpyF/u9h4abVi4M0tknCAkWXMt6MQ5OhPCngDiX xpFQilBczVsOfXZhewE+6fodxWKINo9qmEWdV4AmaaDA6LxaJ7kpCJ1jl63G4TMFn+3I LYZ/J2b9M363w7D43LT0I4oDeSMGWTfQZ3IQKOstEaveiqd23wLufclLXgkIljE9HQwk 5YE5krU91I0gz8nZPHdK07P5olMb7VhI4p1IviTStfd9dFSPz11PbTvE/6tInUkHK000 sS/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3PCCTCyS; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=r5GtLIfa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i193-20020a639dca000000b0055b43079642si6819634pgd.120.2023.08.13.14.22.10; Sun, 13 Aug 2023 14:22:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3PCCTCyS; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=r5GtLIfa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231659AbjHMR0t (ORCPT + 99 others); Sun, 13 Aug 2023 13:26:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231308AbjHMR0e (ORCPT ); Sun, 13 Aug 2023 13:26:34 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31F9F10DD; Sun, 13 Aug 2023 10:26:36 -0700 (PDT) Date: Sun, 13 Aug 2023 17:26:33 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691947593; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3rtUuurXpz5X38s5vfCKJt9YuvD1VEhvJzZac2vIjiE=; b=3PCCTCySDOGBZWg08LsSVfQgz9zJxEsoIO++HEUlU1N0wr5uurOdVNNu715zRr8+4minjz 6dBGsPniUgui1VSLOXFZh8UKvUGbflltflnKnOyyEtnWbua6xHmUU7BWn5LQavslImX6n4 luu76yaYOJJSdNE69UehcPDItdAbuDOrTT0ruDh/bR8M2tFjqY4qCY/TgKec+HNVsYYXwk od1EHAK5bg6Qd6kQa66Xku74274M3YYYF/rB9p/L7MVNHpQzA7PriV87eiPYC8LnKFwMBq mctF4H14LpjUUxKYRkgBpkJzgOsLPXSLvPvVoEwHa4ynEP3OQMBLwQraaAUVGw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691947593; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3rtUuurXpz5X38s5vfCKJt9YuvD1VEhvJzZac2vIjiE=; b=r5GtLIfa3I6NGW5AoKhNzRWmcsk32P1C6y3NVHU1UA4YT/LbYZLUAZ5yF/VFeAMQN2pxUx hI83qwPGU96IThCg== From: "tip-bot2 for Ashok Raj" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/microcode] x86/microcode: Include vendor headers into microcode.h Cc: Boris Petkov , Ashok Raj , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230812195727.776541545@linutronix.de> References: <20230812195727.776541545@linutronix.de> MIME-Version: 1.0 Message-ID: <169194759323.27769.9885078704782858476.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774055722764165550 X-GMAIL-MSGID: 1774150480980411363 The following commit has been merged into the x86/microcode branch of tip: Commit-ID: 82ad097b02b6ab7985375b925efd06ac042caf1d Gitweb: https://git.kernel.org/tip/82ad097b02b6ab7985375b925efd06ac042caf1d Author: Ashok Raj AuthorDate: Sat, 12 Aug 2023 21:58:42 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Sun, 13 Aug 2023 18:42:55 +02:00 x86/microcode: Include vendor headers into microcode.h Currently vendor specific headers are included explicitly when used in common code. Instead, include the vendor specific headers in microcode.h, and include that in all usages. No functional change. Suggested-by: Boris Petkov Signed-off-by: Ashok Raj Signed-off-by: Thomas Gleixner Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20230812195727.776541545@linutronix.de --- arch/x86/include/asm/microcode.h | 5 ++++- arch/x86/include/asm/microcode_amd.h | 2 -- arch/x86/include/asm/microcode_intel.h | 2 -- arch/x86/kernel/cpu/common.c | 1 - arch/x86/kernel/cpu/intel.c | 2 +- arch/x86/kernel/cpu/microcode/amd.c | 1 - arch/x86/kernel/cpu/microcode/core.c | 2 -- arch/x86/kernel/cpu/microcode/intel.c | 2 +- drivers/platform/x86/intel/ifs/load.c | 2 +- 9 files changed, 7 insertions(+), 12 deletions(-) diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index 0deab6c..9c713b7 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -2,10 +2,13 @@ #ifndef _ASM_X86_MICROCODE_H #define _ASM_X86_MICROCODE_H -#include #include #include +#include +#include +#include + struct ucode_patch { struct list_head plist; void *data; /* Intel uses only this one */ diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h index 58e9c83..febe9bf 100644 --- a/arch/x86/include/asm/microcode_amd.h +++ b/arch/x86/include/asm/microcode_amd.h @@ -2,8 +2,6 @@ #ifndef _ASM_X86_MICROCODE_AMD_H #define _ASM_X86_MICROCODE_AMD_H -#include - #define UCODE_MAGIC 0x00414d44 #define UCODE_EQUIV_CPU_TABLE_TYPE 0x00000000 #define UCODE_UCODE_TYPE 0x00000001 diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h index 4a32ead..9951a4b 100644 --- a/arch/x86/include/asm/microcode_intel.h +++ b/arch/x86/include/asm/microcode_intel.h @@ -2,8 +2,6 @@ #ifndef _ASM_X86_MICROCODE_INTEL_H #define _ASM_X86_MICROCODE_INTEL_H -#include - struct microcode_header_intel { unsigned int hdrver; unsigned int rev; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 06015f3..1ea5f82 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 5a8f569..be40456 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index a28b103..dc0a3be 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -29,7 +29,6 @@ #include #include -#include #include #include #include diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index c9a53e3..73a3c22 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -31,9 +31,7 @@ #include #include -#include #include -#include #include #include #include diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 952f173..171d96b 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -30,9 +30,9 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/drivers/platform/x86/intel/ifs/load.c b/drivers/platform/x86/intel/ifs/load.c index e6ae826..390862a 100644 --- a/drivers/platform/x86/intel/ifs/load.c +++ b/drivers/platform/x86/intel/ifs/load.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include "ifs.h"