Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1082385yba; Tue, 2 Apr 2019 01:46:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqytMki1oh+oge5TCOqcGVHfhqZCE7bMDR3FDVsciHfB20r/IuSPLrZ364aP8kIJB8KLQghi X-Received: by 2002:a17:902:44a4:: with SMTP id l33mr4177143pld.292.1554194765433; Tue, 02 Apr 2019 01:46:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554194765; cv=none; d=google.com; s=arc-20160816; b=r+ocBX9TRr+eVOpJ2Cfkn6TkfXUiicVoc5zGKMaYW/A5OZdJ7UDawebVCl0O5JlP11 qnhWxEI8Vlp2fMMvmsgYp4twxz/+AZVZ/UwE3HOdO7VzlLcxJyjEh+1u4AsEhW51ZCdF kEfT4/Bc8ztBdJrwALAxqOpm8DFPIVOvV5WVIVrpR+/QZM/oMdQp/v2WWXs6jeLbQ7Uh 4MQUO1C3QXCTwYTl9piAKrLnhUAVockj1fa6S85DnuRmT34WoIXSGrPlGyY0tbBAQZmg N+azNb+tGbM+OeQ0xo+f7LQY9EeWcH3Rz9wJ/OpiZ9833OWG7j3jm5NHhRf6RyiLmqyp n9HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=ji/XM5dm1WLBN99//7ktuoMOtCFoI8SPH+ls6j0gCTc=; b=yxx+xkj5Oe4RUQjc4OE+kXcU3G6Cv8KsMDRtIPyL2QX2ThTbpVzkZzTrWXPCjJzY6s sL7jqOEb8Np2C2ZcwF7+7UiD9jDRyTTYogk5bE1RqQUYfXpGJpZrwSzNGNum1kP0iLU+ VZqaJGAs7l8IzYhnHQEg7it69qLo2+fK3UcFjOQfAIFIZvrfhemhkdr3obyAT82Z5wnj x09kbTH1C1dU/Vx7ix6l9eGWKu+HvgEEiy+uBHYcen7cQ+6mQaQPeYsnMX4jiBjtiFD5 U/iZQAuiONKl9YLXLoL8fgzATdpynCLwtCqutp3jm9OZNwt6ojSFca9gX1f8+OYZJwMA ojIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=ZxcC7JJh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t26si10611982pgu.504.2019.04.02.01.45.50; Tue, 02 Apr 2019 01:46:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=ZxcC7JJh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729625AbfDBIo7 (ORCPT + 99 others); Tue, 2 Apr 2019 04:44:59 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:43706 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729526AbfDBIo7 (ORCPT ); Tue, 2 Apr 2019 04:44:59 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x328i2rv070105; Tue, 2 Apr 2019 08:44:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id; s=corp-2018-07-02; bh=ji/XM5dm1WLBN99//7ktuoMOtCFoI8SPH+ls6j0gCTc=; b=ZxcC7JJhxKhBal1uNN+hu06kvQDSeCXrjtTSjfvkCGT18mBaZLkUp/qckxI7WxDlJf+x s0tDCEiLM2EEyFku8WMgPj915ymQP97Ts8dSjW2UzKsx5jjGLYkwBm+t+X7as3mB094P 4aSUbxgyblhDK/F5e/oBmVEVE+CrpyiQJbzOsiA+2GbgTB0zFHg5EuJ/lIe0NykZICFm 38lX/p9qvgS5ar/RWY8YospVLcvlb5ODivWtI8JcMej/tIm5VYSwP0aHJOtuXtgCX1fK BoVAt8vNbaJW71Hn8CfknOdSyrQSMaWZcakSUSFIzYz32dDPWdpG2Q3SvVFr6GEYpgl6 gw== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2rj13q3nf8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 02 Apr 2019 08:44:32 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x328iVpZ020046 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 2 Apr 2019 08:44:31 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x328iVQY014492; Tue, 2 Apr 2019 08:44:31 GMT Received: from z2.cn.oracle.com (/10.182.69.87) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 02 Apr 2019 01:44:31 -0700 From: Zhenzhong Duan To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, Zhenzhong Duan , Borislav Petkov , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Srinivas Eeda Subject: [PATCH] x86/microcode: Remove useless code after early microcode support added Date: Mon, 1 Apr 2019 16:46:52 +0800 Message-Id: <1554108412-22229-1-git-send-email-zhenzhong.duan@oracle.com> X-Mailer: git-send-email 1.8.3.1 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9214 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904020064 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After early microcode update was added, microcode couldn't be configured as a module, microcode update happens at early bootup and cpu hotplug stage. This made the microcode update code in module loading stage useless. This patch remove the useless code. Signed-off-by: Zhenzhong Duan Cc: Borislav Petkov Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Srinivas Eeda --- arch/x86/kernel/cpu/microcode/core.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 5260185..7f05bcb 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -710,10 +710,6 @@ static enum ucode_state microcode_init_cpu(int cpu, bool refresh_fw) if (collect_cpu_info(cpu)) return UCODE_ERROR; - /* --dimm. Trigger a delayed update? */ - if (system_state != SYSTEM_RUNNING) - return UCODE_NFOUND; - ustate = microcode_ops->request_microcode_fw(cpu, µcode_pdev->dev, refresh_fw); if (ustate == UCODE_NEW) { pr_debug("CPU%d updated upon init\n", cpu); @@ -738,21 +734,14 @@ static enum ucode_state microcode_update_cpu(int cpu) static int mc_device_add(struct device *dev, struct subsys_interface *sif) { - int err, cpu = dev->id; + int cpu = dev->id; if (!cpu_online(cpu)) return 0; pr_debug("CPU%d added\n", cpu); - err = sysfs_create_group(&dev->kobj, &mc_attr_group); - if (err) - return err; - - if (microcode_init_cpu(cpu, true) == UCODE_ERROR) - return -EINVAL; - - return err; + return sysfs_create_group(&dev->kobj, &mc_attr_group); } static void mc_device_remove(struct device *dev, struct subsys_interface *sif) -- 1.8.3.1