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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 67DEEC2D0A3 for ; Tue, 3 Nov 2020 20:59:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C621223C6 for ; Tue, 3 Nov 2020 20:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437142; bh=SutxnjuQiNcWOuXeErlj94rMuCuFG4npuCUEcq4W/d4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BYXGe/vut9LWadr3x8/LI7RI/VRLKDuKaMF+o4XSPSDOoKj6qw6kBq0DbEu18fGVG OZdELRKmjGsXu/ol/xVs7TXXXnRgG9Qp0uzZgn1xJQoQVqjDyIVgbNp40nmcbQOo5G NA4zWUQYQ5HuX9QqMiGZNMUQnr51l4y2MeELt5Vk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733036AbgKCU7A (ORCPT ); Tue, 3 Nov 2020 15:59:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:33720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732615AbgKCU65 (ORCPT ); Tue, 3 Nov 2020 15:58:57 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 F16792053B; Tue, 3 Nov 2020 20:58:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437137; bh=SutxnjuQiNcWOuXeErlj94rMuCuFG4npuCUEcq4W/d4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bKOR0Bi6KrRgWT+NIhMz7gAo0cDTwQlNQZPA4+p59VZ8eo6k5WT28sCnr+7RpO3Nc H7lZgfrvkiNW5mKVlOL6PbPQ9CdznXNJ3fafaCKyWaCxrjkPY32seu+uDDBHt2qtR9 Xh6bvQYO+P3LclvL5IBsSa5/2XCSDxEs3H7PumVM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Aneesh Kumar K.V" , Nathan Lynch , Michael Ellerman Subject: [PATCH 5.4 155/214] powerpc/drmem: Make lmb_size 64 bit Date: Tue, 3 Nov 2020 21:36:43 +0100 Message-Id: <20201103203305.328304107@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203249.448706377@linuxfoundation.org> References: <20201103203249.448706377@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aneesh Kumar K.V commit ec72024e35dddb88a81e40071c87ceb18b5ee835 upstream. Similar to commit 89c140bbaeee ("pseries: Fix 64 bit logical memory block panic") make sure different variables tracking lmb_size are updated to be 64 bit. This was found by code audit. Cc: stable@vger.kernel.org Signed-off-by: Aneesh Kumar K.V Acked-by: Nathan Lynch Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20201007114836.282468-2-aneesh.kumar@linux.ibm.com Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/include/asm/drmem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/powerpc/include/asm/drmem.h +++ b/arch/powerpc/include/asm/drmem.h @@ -20,7 +20,7 @@ struct drmem_lmb { struct drmem_lmb_info { struct drmem_lmb *lmbs; int n_lmbs; - u32 lmb_size; + u64 lmb_size; }; extern struct drmem_lmb_info *drmem_info; @@ -79,7 +79,7 @@ struct of_drconf_cell_v2 { #define DRCONF_MEM_AI_INVALID 0x00000040 #define DRCONF_MEM_RESERVED 0x00000080 -static inline u32 drmem_lmb_size(void) +static inline u64 drmem_lmb_size(void) { return drmem_info->lmb_size; }