From patchwork Mon Apr 20 12:39:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 227455 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1658DC54FD0 for ; Mon, 20 Apr 2020 12:47:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DDA40206DD for ; Mon, 20 Apr 2020 12:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386870; bh=HFt2cNSRVwRrNyRATsHeOZAVGfis+zFjOerb5zwBaPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QmdgMKMRBWpHpjV3mEA2XXGJXrqzpv+rUX+P1VsF1BGc553wlpjJkI5rD4dlY1M8s rL1atqxL4/yZ1pzrG8A2zyUWDKdjVcotU8Z5FvJoJF9PPC59BdARhMrmOPZ2C1jL6n grpkfQBywX58wHMjDjvhtM6KNGY7fRA9h6W9g+jc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729149AbgDTMrt (ORCPT ); Mon, 20 Apr 2020 08:47:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:44070 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729147AbgDTMrs (ORCPT ); Mon, 20 Apr 2020 08:47:48 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4F70E206D4; Mon, 20 Apr 2020 12:47:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386867; bh=HFt2cNSRVwRrNyRATsHeOZAVGfis+zFjOerb5zwBaPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q6mMuE+zFfFCtF+QgRcYESnaqMgoKf5y1Rze1s7z1XVTZDwNQOga9+KediHu/XXiS BY9E9qcC4fehvg4X/6fBQ1JeooKKmSmu2ZhcYSnKNy7JHDIk9wWHLL5baQP4WsFsoa K72o3uJyLau3DLlaTCpdgP9Nmppt9E3qUfR7mwpU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Allen , Borislav Petkov Subject: [PATCH 5.4 60/60] x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE Date: Mon, 20 Apr 2020 14:39:38 +0200 Message-Id: <20200420121516.353448570@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121500.490651540@linuxfoundation.org> References: <20200420121500.490651540@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Allen commit bdf89df3c54518eed879d8fac7577fcfb220c67e upstream. Future AMD CPUs will have microcode patches that exceed the default 4K patch size. Raise our limit. Signed-off-by: John Allen Signed-off-by: Borislav Petkov Cc: stable@vger.kernel.org # v4.14.. Link: https://lkml.kernel.org/r/20200409152931.GA685273@mojo.amd.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/microcode_amd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/include/asm/microcode_amd.h +++ b/arch/x86/include/asm/microcode_amd.h @@ -41,7 +41,7 @@ struct microcode_amd { unsigned int mpb[0]; }; -#define PATCH_MAX_SIZE PAGE_SIZE +#define PATCH_MAX_SIZE (3 * PAGE_SIZE) #ifdef CONFIG_MICROCODE_AMD extern void __init load_ucode_amd_bsp(unsigned int family);