Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2829147pxb; Mon, 19 Apr 2021 15:21:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEgagDzY4A4XhF57XqH2jC65rZIvvPdcof7JwSA3fOPsfCkF3UrI1EVUTG68rI/UxEAWLD X-Received: by 2002:a17:90a:7e98:: with SMTP id j24mr1430035pjl.75.1618870860070; Mon, 19 Apr 2021 15:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618870860; cv=none; d=google.com; s=arc-20160816; b=ZS2tEGxw5GwEpjYtQH96wn4AuBCNvj87wV7/jzhjpuPfM2vbHMFliC260AtPohT51m E2O/kSUG7jgF8g4r6qTcWq09fv0h6sS+G1HHwVkxt7j8fRtO12SjJGfScIQBEn0fwunK DoucoP/NdVUqRJka/42Mvda3tFDJQ/miwTaH55HqX2Yw/MTDyb5pQDtmkm5MsL2W9B7u vmcoq5q7LpWwEyud10XnG89NM+PJOewk13K53MqyIJ4wf8hYtGgIZBZib7IWIbF2G4CB 6FCvFOHSlY2ir0mCBV3j/qYQZmzhMHdfRRYRBCZEdunCZWT2Low0hQKLgq3mYShQEG2f EP7Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oe/73mCWJe+3kHjmwuuaIQRfg3/354q43klcXnPYTJ8=; b=izoYf66IL6YF2IvbWKZiAtj1DDGvru4889/3tVR9tswVox/NffaLLpmJEYRO5p6uHf AgMiJFgTe+tRD/F2j5YCI7YxFMKqQSdQr4+uY1PBQuV1PGJ60U94hRYHwsW1iTTRXp4w gWq+zKCBSjApNVhDN6/a+pexAEps8R+7ImtdzDVQqgDYJJuHNWzPH3Wfwjip3rBH8sCR V1fMlh6gcl3SwFFDh3c+A5I5Zz5kJrnWFr4BASDtNME8Xaa8Oc/L0EoNeUiQaeIjV8zr kuoAhIxMijcq7YxGjgWYmUKednP+SxdwVlK8ESWUCdTgRvFhMXc/NdSOHpkNbWzRzkTC mEng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=byUsYtqX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q3si17434595pld.438.2021.04.19.15.20.48; Mon, 19 Apr 2021 15:21:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=byUsYtqX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242581AbhDSUou (ORCPT + 99 others); Mon, 19 Apr 2021 16:44:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:53942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242324AbhDSUo2 (ORCPT ); Mon, 19 Apr 2021 16:44:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A9CA0613C2; Mon, 19 Apr 2021 20:43:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618865038; bh=u70HHnX1guswWqpHM6QDKDJVZ8xKtECfDyb/9SIhUJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=byUsYtqXlH5l+BX369F6c66vmV5tDdv+ovRWkw3L0D0VwgjmnR3sisOXB9kJ+CjN0 U4U4BaBza33KwIc4c3dGQkjStdWbofQSz6LN/9H8A9G7tz9WIwogeiuDBjwVOyilzd aeiDX+jxbyE27iY284Wb8wrbsAEYTBhnjx+zu8yrgATTdFyIHLZje/unIXrBEPtXgX G28DPW82Zjuojw/YepNMSP9qKAWciOW+kdg5tutuFxpRQWfrIBzLPGVwVVmVDUYwAL O/Qhf4REiAk74BnnbQDgfs+YVO31FYaFm4K3gWdUaw+BbnvjNyE8OOOI1UsSmh5UDz 79cCuwYwgRpJQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Angelo Dureghello , Mike Rapoport , Greg Ungerer , Sasha Levin , linux-m68k@lists.linux-m68k.org Subject: [PATCH AUTOSEL 5.11 10/23] m68k: fix flatmem memory model setup Date: Mon, 19 Apr 2021 16:43:29 -0400 Message-Id: <20210419204343.6134-10-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210419204343.6134-1-sashal@kernel.org> References: <20210419204343.6134-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Angelo Dureghello [ Upstream commit d2bd44c4c05d043fb65cfdf26c54e6d8b94a4b41 ] Detected a broken boot on mcf54415, likely introduced from commit 4bfc848e0981 ("m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM") Fix ARCH_PFN_OFFSET to be a pfn. Signed-off-by: Angelo Dureghello Acked-by: Mike Rapoport Signed-off-by: Greg Ungerer Signed-off-by: Sasha Levin --- arch/m68k/include/asm/page_mm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h index 7f5912af2a52..21b1071e0a34 100644 --- a/arch/m68k/include/asm/page_mm.h +++ b/arch/m68k/include/asm/page_mm.h @@ -167,7 +167,7 @@ static inline __attribute_const__ int __virt_to_node_shift(void) ((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn; \ }) #else -#define ARCH_PFN_OFFSET (m68k_memory[0].addr) +#define ARCH_PFN_OFFSET (m68k_memory[0].addr >> PAGE_SHIFT) #include #endif -- 2.30.2