Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp878391pxb; Tue, 3 Nov 2020 15:17:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJyAHSSJsQKiw5knGfeKZUzk2VItAPZVyQXGUx38csuNHzRFtbK1buzzhvT2VsL0U2teJKF2 X-Received: by 2002:a17:906:6702:: with SMTP id a2mr21740754ejp.309.1604445451309; Tue, 03 Nov 2020 15:17:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604445451; cv=none; d=google.com; s=arc-20160816; b=WIS7o4eQbdStdNuVvafgiKRQIbJyiGpdF1jC2WQLC7RSzSDziNHuZFVihLbIr8Othw pumYBLYQyFGwh6wJixGi+dN/kpSSn5hZp0xPzAXt0EshY6kwNYiJ0xUFz9NOF1hGHJ6V MqUluBf5hUgBRLJZQGG6vMCc8tGxYBZTygmecGc1RGLacJUDoKmhOV59lxL4lSCzkwk9 iJ+htouhQkDaY0MDTq26TyxRShKtXbDjXmRXKQEtL3DlIfm0RTexf+pDPJVJT4SaTWw7 z/kG/Hch5GYt+ETK29E2VWduyPT6yiyGEKfdXt6dAyR1la7ZrWXDwEjW6Iv59OwHv4sS hEGg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=s8IoIj2cQvNnUDMIhuQo2/Eo2SFGzQkKGS/T3gvwi3Y=; b=bKFbSaP26eVFpf2rrk+A1KpwFcinCy5lywcqdkkwyX2CupXOehE++pD3UPJ9AOo4jN x89STydcqTvFmeS4lArvW24270cPltr0lc5OFkO5hceBIYaH/VW54xiqywiQ6hNR/eNJ WWQCbb6A3b+2MGWu49gTL/ROpZk+jXMQEIPJHVJpLS+G5MALgkFsMLTva4i9/qBp5KuR Jvii7ltxj72CmZqa/ubvvJNvnlKb7hBc2TWCDCiGDVjRHe2F/7YTtfBEVSTBEnPd4z3R doTRLGGWx2My/+L4qxkQCqMJFUuGhHUJloE1uaxW9Yw8hG0GEq+bBG9r1N9DyQt5jnHL KU9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JZHEc2h3; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id by20si273584ejc.528.2020.11.03.15.17.08; Tue, 03 Nov 2020 15:17:31 -0800 (PST) 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=default header.b=JZHEc2h3; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731480AbgKCUs1 (ORCPT + 99 others); Tue, 3 Nov 2020 15:48:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:39842 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730199AbgKCUsX (ORCPT ); Tue, 3 Nov 2020 15:48:23 -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 C3C122242E; Tue, 3 Nov 2020 20:48:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436503; bh=imz8njZ/jznJ57aojACtJGu6wjeFxaHMPzyl3LOuhNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JZHEc2h3q2cq8LZRFXyUZhTTSRbgAK/AbecxMQvBSp3NK+Kvawrup2wuxPCtTob70 tgDuJmAGHKYBZpJef7C+DQIWhPdURBvvR8kwV6dPplfa7e5qKxwurxhyw1B/ozgtbQ lV2kc4FIo8PZRJShytcEPzZ4rd37nbZmH3ta3Wi8= 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.9 279/391] powerpc/drmem: Make lmb_size 64 bit Date: Tue, 3 Nov 2020 21:35:30 +0100 Message-Id: <20201103203405.860662341@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@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; @@ -80,7 +80,7 @@ struct of_drconf_cell_v2 { #define DRCONF_MEM_RESERVED 0x00000080 #define DRCONF_MEM_HOTREMOVABLE 0x00000100 -static inline u32 drmem_lmb_size(void) +static inline u64 drmem_lmb_size(void) { return drmem_info->lmb_size; }