Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2168200iof; Tue, 7 Jun 2022 22:01:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+u9I1banhgxAtXl0XXKm/KOdw8KkH1NqBIB8BJp1sdxspLkhAwY/II3wXd79FYZrUPjGQ X-Received: by 2002:a17:902:d48c:b0:167:770b:661 with SMTP id c12-20020a170902d48c00b00167770b0661mr15593520plg.155.1654664475308; Tue, 07 Jun 2022 22:01:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654664475; cv=none; d=google.com; s=arc-20160816; b=t9x3p5dR5sGhGuZqSgSkUHNFLJqmkAGpuU59pOucokzszFnkN4vM76i6jozV/CbZpf EMPMTQO33sqqyJDizauWvO5kvEtwJHWg+1TXy7R0gqoUqX+f8TmAeAu5O/8ZwtCxWosk mgXCLuNII/gILErZPf+ppbCYYWAss29STLJs7x1fWB7djFHBvt8T8QqxQuCcSvlYjF+x uVYmPEoJWsvdlRL6/Ogp3JAU2cCgbvbfqorRlfgAknZ5dqQT2NFOSCoZ5e9U/eVPHbsn jQmtMe/G67zZxaefCbU+lOmF+DLps8mgEYn2K0aQIY8fTEEtN6MolYoUXSnp5SAcpYhO WJvQ== 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=j8B9NiThM3IifaWr1wWNggTq6xVV0bda0VqqLYsxArM=; b=R+4wMmtptwOa2fmh3FAcNRc6POljDH3MKSVz1lnS4Dyv48obAeuT8PmOPE+vzphHys 1DmM9oH18xRTcMOfG5rbgQx8eOF6PRe1k/yYIgwoB7J2ptK0E7yF8hBq5c3XbuDeZ6cU iwEwuELlpRtpaGE4E8yHu5I1aUL38YawP/w61tFctX1RpYhzAvO7G2iot4bJa/PId+ZF J8YgffGxNU4rR0L+WjfTuaMhF7SQ72kepO0wCIFU8f1qmxrcmvoMd2etbmXD0NBJ6dWC 90AoysfCwqUzhZH33UVDnwP53C+5kNRuzFkCQeJXbisCu+IglrYVEWBPE+t1SnI4sX5L MJDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="XGexz/Dl"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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. [23.128.96.19]) by mx.google.com with ESMTPS id e7-20020a170903240700b0015eb08a719csi25281146plo.512.2022.06.07.22.01.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 22:01:15 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="XGexz/Dl"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 22DCD382E55; Tue, 7 Jun 2022 21:29:22 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382439AbiFGWWj (ORCPT + 99 others); Tue, 7 Jun 2022 18:22:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380733AbiFGVQz (ORCPT ); Tue, 7 Jun 2022 17:16:55 -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 E1A4021F9D1; Tue, 7 Jun 2022 11:56:48 -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 8A08361794; Tue, 7 Jun 2022 18:56:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 977AFC34115; Tue, 7 Jun 2022 18:56:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654628208; bh=zyZ5vI2l/3gg/uoWaooDfVMf9ohSXQs2r2KPinSGMqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XGexz/Dls+vwtvO4td/b5pV7xysWxXOk9dcLeDxNdam0RMxo/D98OLFpDCI7Q7ll3 OEKlldn0k50M3VbrLDquWJSeRtKu9C+p0Wfbma5uw4HdbKolZHsiXUmB+RSuQwc76t ZScs/nEqDVFNYmtGbiPpqITBpcbSC/Y4TaIHaGBg= 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.18 194/879] x86/microcode: Add explicit CPU vendor dependency Date: Tue, 7 Jun 2022 18:55:12 +0200 Message-Id: <20220607165008.474137652@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@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 4bed3abf444d..b2c65f573353 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1313,7 +1313,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 @@ -1325,7 +1325,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