From patchwork Fri Sep 15 09:37:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 140369 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp965459vqi; Fri, 15 Sep 2023 04:17:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEs8jQyCsIwCikZDzK6vP/RDB6ncYehdLTKzm7cosb270JlJZPMItOiHHTkWQbOT+YACdJo X-Received: by 2002:a05:6a00:2281:b0:68f:bb16:d16a with SMTP id f1-20020a056a00228100b0068fbb16d16amr2122299pfe.5.1694776649843; Fri, 15 Sep 2023 04:17:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694776649; cv=none; d=google.com; s=arc-20160816; b=CBDcvjqOE06paHFFLObhYS+G98CAkoOW8w9z4ctQE+jQwiKOn0Dl8AiMxFI1m2Feea 2uBV7lbY1rtO+FZAGItrYqE/cYeIPXiD0XlUhc+HIWV+Hmn7xT805jiah/3q+pdFonXu e4NQvgUAtYf5YMSPIMRQtSb8erICwjeeC19Ve0LMQTbATDRsIgVD/on8oFqy1jzcEm+K LoCBjUhjD7WRqW01XWI5JJVJQt3VBEWPtknztEVRvTJqMv4cEWwp74r+18QSS3+cahz+ JvAGecoRpPyvp6CMRbHYHJHIXQ66WwOVnUOMA8bmPvAr4YrVx6DSYwsDIu+TbNt2sx51 vDQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=ng40UM2vdD16bTaMn53yF5UAYBsocjHsAUWTDVgI75k=; fh=mh/EFXDyWz6SYA4qEbcbMgOZ07AT4DlRJonTEXgTb50=; b=tH6MMJC5Bvu0ejV8qFI947hwVvH2uMENOv7DK/RMgUAUxf5enUGBbCppP0YUkI1LvM L5YycmExDZwxBo3jyEg5tOLiLvZHB3gWzL9+DRqqYSD180WYfbonJiirVsEt6ypjnaPj qyccdjKtvP1yaDOKs2I75MDtia4/Lbg9CMJf4Z96CyvLF3tiMQmhR8XJR09+HwkfAEe1 xO8qMTAyIE+6Qs0zFJ9NRa7gfcSoVkBvap9+m6tjoKgIyyYEPTqpn5vXid/e0u5KcSRe O0Gp/a3Fno8FXcnwu7owAX1T060xZ6wiN9p1oV6wwYRDKRSZ62CH23rJPc6hSbUbYCg7 0nWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=u3r0kSN8; dkim=neutral (no key) header.i=@linutronix.de header.b=ENfEpNOQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id x24-20020a631718000000b0057751b7788esi3086484pgl.488.2023.09.15.04.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 04:17:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=u3r0kSN8; dkim=neutral (no key) header.i=@linutronix.de header.b=ENfEpNOQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id E9273817C3E1; Fri, 15 Sep 2023 02:38:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233805AbjIOJiT (ORCPT + 32 others); Fri, 15 Sep 2023 05:38:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233741AbjIOJiP (ORCPT ); Fri, 15 Sep 2023 05:38:15 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37F962105; Fri, 15 Sep 2023 02:37:49 -0700 (PDT) Date: Fri, 15 Sep 2023 09:37:47 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694770667; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ng40UM2vdD16bTaMn53yF5UAYBsocjHsAUWTDVgI75k=; b=u3r0kSN8w0EUNtU19ht87yGmQopz7l9FoAnVgWSBJsr1fUE63t8H1JUTTIddNYeF+6kwSH 42MwGIZpEsVrzhq8RZMhkzuJmaJBbC9NjiVBySnck5JfzXdJbyjwxd8NIuMWs1DtyMpSCa wuFqcA6qK0wMNi0Ph6wxPB9KUTHRyNUNeqmDWOqd1ChYYExQ/YIFbIqzTI/uQ8A5XQcLeD eyykLqGf5GxZkCST0/1jDRAi9axI7Zn4Td/1luQRNUTS/UjuFN9RY9oFsg1Qm9JmtoWO/U 4vmZRyH7BnKTrgOqmXwFu2FGt1fNDBnPLtunuYz2aJ3fSBteplbl+1yCL+dOTg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694770667; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ng40UM2vdD16bTaMn53yF5UAYBsocjHsAUWTDVgI75k=; b=ENfEpNOQR941WT/d843OCmMmdXUsdNDYR8I0Smjtr6KltvPvGLKnxcTO9ADFhCiLTQ5hTf fHPpGUr79/JAXTCA== From: "tip-bot2 for Ard Biesheuvel" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/boot] x86/boot: Drop redundant code setting the root device Cc: Ard Biesheuvel , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230912090051.4014114-23-ardb@google.com> References: <20230912090051.4014114-23-ardb@google.com> MIME-Version: 1.0 Message-ID: <169477066723.27769.11128381648496536950.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 15 Sep 2023 02:38:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776874122175403209 X-GMAIL-MSGID: 1777102120510075954 The following commit has been merged into the x86/boot branch of tip: Commit-ID: 7448e8e5d15a3c4df649bf6d6d460f78396f7e1e Gitweb: https://git.kernel.org/tip/7448e8e5d15a3c4df649bf6d6d460f78396f7e1e Author: Ard Biesheuvel AuthorDate: Tue, 12 Sep 2023 09:00:57 Committer: Ingo Molnar CommitterDate: Fri, 15 Sep 2023 11:18:42 +02:00 x86/boot: Drop redundant code setting the root device The root device defaults to 0,0 and is no longer configurable at build time [0], so there is no need for the build tool to ever write to this field. [0] 079f85e624189292 ("x86, build: Do not set the root_dev field in bzImage") This change has no impact on the resulting bzImage binary. Signed-off-by: Ard Biesheuvel Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20230912090051.4014114-23-ardb@google.com --- arch/x86/boot/header.S | 2 +- arch/x86/boot/tools/build.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index a87d913..6059f87 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S @@ -236,7 +236,7 @@ root_flags: .word ROOT_RDONLY syssize: .long 0 /* Filled in by build.c */ ram_size: .word 0 /* Obsolete */ vid_mode: .word SVGA_MODE -root_dev: .word 0 /* Filled in by build.c */ +root_dev: .word 0 /* Default to major/minor 0/0 */ boot_flag: .word 0xAA55 # offset 512, entry point diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c index 0354c22..efa4e9c 100644 --- a/arch/x86/boot/tools/build.c +++ b/arch/x86/boot/tools/build.c @@ -40,10 +40,6 @@ typedef unsigned char u8; typedef unsigned short u16; typedef unsigned int u32; -#define DEFAULT_MAJOR_ROOT 0 -#define DEFAULT_MINOR_ROOT 0 -#define DEFAULT_ROOT_DEV (DEFAULT_MAJOR_ROOT << 8 | DEFAULT_MINOR_ROOT) - /* Minimal number of setup sectors */ #define SETUP_SECT_MIN 5 #define SETUP_SECT_MAX 64 @@ -399,9 +395,6 @@ int main(int argc, char ** argv) update_pecoff_setup_and_reloc(i); - /* Set the default root device */ - put_unaligned_le16(DEFAULT_ROOT_DEV, &buf[508]); - /* Open and stat the kernel file */ fd = open(argv[2], O_RDONLY); if (fd < 0)