Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2162535iof; Tue, 7 Jun 2022 21:50:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVAdsPuv3IWMY+ovelA17/u1LaB6QUoofCgBK7VNzLHcGyiEKckJYX4riXC6+P82XkPmwi X-Received: by 2002:a63:6a4a:0:b0:3fd:4f3a:3f0f with SMTP id f71-20020a636a4a000000b003fd4f3a3f0fmr19229336pgc.625.1654663820781; Tue, 07 Jun 2022 21:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654663820; cv=none; d=google.com; s=arc-20160816; b=Lcuka7YIMwgCb4viN04Dc8/cQJgzo9eG6Bn0v8MayxOGKLjzJfsKEnendB1lpftdmU teop0nHG215gL5RF2eVm6rFYBhf6rLGwneu18jqylHPvv6W01i6iSNmFGA+8Vpxi8GA+ r+siH/bHiQAWnBVYMmI00JVdXBaTQ3XG1eCE4LHOP5PgcR0mOzBf5n3WlsqXsqB28vUg mzy4q5qAvYRJ1Dc4SQLhOuN/q8FHldUtcLsEh5aQuCij7JZC5fjW4+Q/b6WojdKgCegM y3sLsjvA4cvOz/X0ZdO8Yym1n4CT6+XnWUQq+iAt97u1qR/P7UVTfAZiIKx+SPDX//6T N0VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=a6HceeTjQMfGzbYYrEy3IfOeBskHZsVFDGsCbSJ4mdM=; b=0Q6kX+/gtJQo7mWLRDp5QyYFHF7BAUrj08LkcGp1/txwGhYGDAjflQ/WP3PH09oyiF L/dzCYmYHZkdLJR2scHAtTtdz64Y8VMYSPRTRwn/eRZB/s4+geuVWrCo2y5xtCnK7rfV wgo/Ab3H+LPeG/7CypJf8fX/zIvvyzuWYz9JGerfVX72OWbYkF1keDEBfoKgE3NPaWVL 65vg1cBJpynVO1Lwhs5p7XsgTmYaKzBMH4JxflxGBYiRoOHWIxM2REMSDSO76BYqvOgh J884oZaD2jZJfL9RY1L/x7XawNxnyd5UUgfizYgiDVrfwNL3kZ8ExrcR5f+bEt48sP56 A2lA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WradzlYe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id r23-20020a63ec57000000b003fc52ba77desi23184938pgj.408.2022.06.07.21.50.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 21:50:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WradzlYe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E318114A916; Tue, 7 Jun 2022 21:20:22 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349020AbiFGUts (ORCPT + 99 others); Tue, 7 Jun 2022 16:49:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357382AbiFGTuK (ORCPT ); Tue, 7 Jun 2022 15:50:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67C537CB74; Tue, 7 Jun 2022 11:19:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1E4A560C7E; Tue, 7 Jun 2022 18:19:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F8EAC385A2; Tue, 7 Jun 2022 18:19:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654625969; bh=yshcQHCPfHZtHbEvkMQsCzGrimfL7sMR4F4SAhXpLKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WradzlYeITYOdMWeq2PP/NtYBQgKMb6BHg9S13Y1llvO+NeLllOdgT/saHN4PAni+ JIccjLUc/m1FWuwrlHFHt/HQkH+DOSuoPrhhyP4XO4Cmt04ExEOgtNrDWLk18DwiT7 4xcX7mjyVEufwvA9ChQnihDQ9iRDlB6JHd9vw73A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Borislav Petkov , Sasha Levin Subject: [PATCH 5.17 169/772] x86/microcode: Add explicit CPU vendor dependency Date: Tue, 7 Jun 2022 18:56:01 +0200 Message-Id: <20220607164954.021277169@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607164948.980838585@linuxfoundation.org> References: <20220607164948.980838585@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 From: Borislav Petkov [ Upstream commit 9c55d99e099bd7aa6b91fce8718505c35d5dfc65 ] Add an explicit dependency to the respective CPU vendor so that the respective microcode support for it gets built only when that support is enabled. Reported-by: Randy Dunlap Signed-off-by: Borislav Petkov Link: https://lore.kernel.org/r/8ead0da9-9545-b10d-e3db-7df1a1f219e4@infradead.org Signed-off-by: Sasha Levin --- arch/x86/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d0ecc4005df3..380c16ff5078 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1332,7 +1332,7 @@ config MICROCODE config MICROCODE_INTEL bool "Intel microcode loading support" - depends on MICROCODE + depends on CPU_SUP_INTEL && MICROCODE default MICROCODE help This options enables microcode patch loading support for Intel @@ -1344,7 +1344,7 @@ config MICROCODE_INTEL config MICROCODE_AMD bool "AMD microcode loading support" - depends on MICROCODE + depends on CPU_SUP_AMD && MICROCODE help If you select this option, microcode patch loading support for AMD processors will be enabled. -- 2.35.1