From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 077B9CDB474 for ; Tue, 17 Oct 2023 21:25:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231868AbjJQVZN (ORCPT ); Tue, 17 Oct 2023 17:25:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344345AbjJQVYi (ORCPT ); Tue, 17 Oct 2023 17:24:38 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F021C126 for ; Tue, 17 Oct 2023 14:23:54 -0700 (PDT) Message-ID: <20231017211723.131454229@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697577832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=QfJgwvaKg9KDiVtt/bFmM4IrpyyKSnPnwhur+L5KJQY=; b=e00lgK0DRqOEfU52Ne3s53o+MgjBCGgovEyu0/2ynCn5FA6HM5NPf1folkm3p9kxW8zO2R 9I+OQ6j/RocuZEoiDDWNGESQuNabCqBJe0m8c0Qi6SUyWqyq/kkkrd2D18CTeHZCOQ0dam aePXbAWa8ulRgjFmW+grfgM+j+5Sc8aj3LCP2HAimjN09KJIvADLu5rzwHDK3b6PZ+dNUC daveamMXE+FYKz890J548mS9CMslw4Rr/ch5KcMJM5JAomHkJxBuKpTg/W6g7cm7xGnukC IRPZ1QdK5HRXb2bF+NkP+RhcIt8W7841+988Ls5n5rHtkUcu9VBVz1w7s3nrWQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697577832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=QfJgwvaKg9KDiVtt/bFmM4IrpyyKSnPnwhur+L5KJQY=; b=UYjLIWBgfoxZ/nskVAHhlvCmiHI7TQxwmKsvRfNm2+hzLWTkJzZtgNKBpOLBN2P8ojCEDd ib+bXEUdDjkuCwBw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov Subject: [patch V5 21/39] x86/microcode/amd: Cache builtin microcode too References: <20231017200758.877560658@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Tue, 17 Oct 2023 23:23:52 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Gleixner save_microcode_in_initrd_amd() fails to cache builtin microcode and only scans initrd. Use find_blobs_in_containers() instead which covers both. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index f6ed2c5be932..046b3a6c8594 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -533,7 +533,7 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax) enum ucode_state ret; struct cpio_data cp; - cp = find_microcode_in_initrd(ucode_path); + find_blobs_in_containers(cpuid_1_eax, &cp); if (!(cp.data && cp.size)) return -EINVAL;