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=unavailable 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 4D362C388F7 for ; Tue, 3 Nov 2020 21:20:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0D966206B5 for ; Tue, 3 Nov 2020 21:20:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604438442; bh=SsQ21psauNQMOVAYcBGWoatKQJJ8ekw1kabgZusMIC4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t6UmlN9bFZOfsRzeNRctba1t8lvQY32h9wFGJJgQllit7CfJhI/UrgQaNxsyO6TAU JBLMGDVrYLxQX/3FY0ZBPh6RWnArcReHQYM49zKJMPUzuI1MG81mkjYN595EO+AGi9 hgbwFeUyLUWnLD0yuutqtWQFEGZSArGpt60lxb1Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388333AbgKCVUl (ORCPT ); Tue, 3 Nov 2020 16:20:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:46112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387918AbgKCVG6 (ORCPT ); Tue, 3 Nov 2020 16:06:58 -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 63163207BC; Tue, 3 Nov 2020 21:06:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437617; bh=SsQ21psauNQMOVAYcBGWoatKQJJ8ekw1kabgZusMIC4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nUB8S/vpHKAbZiYC0hV4oRj6iN0yHKlNlLNg7sodbJv36gk8/IoNiP+U/FseyOelY 3Gzyn9ZeRCGAJkwCG3/Y23EKfmO6nyB57fG8VCNkD6wtNFmrC6FhcDiARcF10fg201 b3v5stHTAiA3F31ReRkzCCf5HFBIP9uLiMe9OC+s= 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 4.19 153/191] powerpc/drmem: Make lmb_size 64 bit Date: Tue, 3 Nov 2020 21:37:25 +0100 Message-Id: <20201103203246.934541690@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203232.656475008@linuxfoundation.org> References: <20201103203232.656475008@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 @@ -24,7 +24,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; @@ -83,7 +83,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; }