From patchwork Fri Jun 3 05:49:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bharata B Rao X-Patchwork-Id: 9151853 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 13A566072B for ; Fri, 3 Jun 2016 05:56:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 049F72804C for ; Fri, 3 Jun 2016 05:56:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB37C282EE; Fri, 3 Jun 2016 05:56:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 15BD92804C for ; Fri, 3 Jun 2016 05:56:14 +0000 (UTC) Received: from localhost ([::1]:52088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8i5d-0006YR-SM for patchwork-qemu-devel@patchwork.kernel.org; Fri, 03 Jun 2016 01:56:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8hzw-0002QU-Qh for qemu-devel@nongnu.org; Fri, 03 Jun 2016 01:50:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8hzo-0007w1-Sz for qemu-devel@nongnu.org; Fri, 03 Jun 2016 01:50:20 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:9072 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8hzo-0007vx-NU for qemu-devel@nongnu.org; Fri, 03 Jun 2016 01:50:12 -0400 Received: from pps.filterd (m0048817.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u535kJW5040416 for ; Fri, 3 Jun 2016 01:50:12 -0400 Message-Id: <201606030550.u535kJW5040416@mx0a-001b2d01.pphosted.com> Received: from e28smtp01.in.ibm.com (e28smtp01.in.ibm.com [125.16.236.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 23b3aqhqk7-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 03 Jun 2016 01:50:11 -0400 Received: from localhost by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 3 Jun 2016 11:20:07 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp01.in.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 3 Jun 2016 11:20:05 +0530 X-IBM-Helo: d28dlp02.in.ibm.com X-IBM-MailFrom: bharata@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org;qemu-ppc@nongnu.org Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 62143394005E; Fri, 3 Jun 2016 11:20:05 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay05.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u535ng9A30998560; Fri, 3 Jun 2016 11:19:42 +0530 Received: from d28av04.in.ibm.com (localhost [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u535o3ft030681; Fri, 3 Jun 2016 11:20:04 +0530 Received: from bharata.in.ibm.com ([9.84.224.197]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u535nrK5030215; Fri, 3 Jun 2016 11:20:00 +0530 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Fri, 3 Jun 2016 11:19:43 +0530 X-Mailer: git-send-email 2.1.0 In-Reply-To: <1464932984-26623-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1464932984-26623-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16060305-4789-0000-0000-000002BC87DC X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16060305-4790-0000-0000-000010260A69 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-06-03_02:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=15 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606030063 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [RFC PATCH v1 2/3] spapr: Remove alignment gap b/n RAM and hotplug regions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aik@au1.ibm.com, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, Bharata B Rao , nfont@linux.vnet.ibm.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Let the alignment b/n RAM and memory hotplug region be equal to LMB size (256MB) so that there is no gap b/n RAM and hotplug region. This new alignment is true for only pseries-2.7 onwards and the older machine types continue to have the earlier 1GB alignment. Suggested-by: David Gibson Signed-off-by: Bharata B Rao --- hw/ppc/spapr.c | 11 ++++++++++- include/hw/ppc/spapr.h | 5 ++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 30b9731..623c35f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1825,7 +1825,7 @@ static void ppc_spapr_init(MachineState *machine) } spapr->hotplug_memory.base = ROUND_UP(machine->ram_size, - SPAPR_HOTPLUG_MEM_ALIGN); + smc->hotplug_alignment); memory_region_init(&spapr->hotplug_memory.mr, OBJECT(spapr), "hotplug-memory", hotplug_mem_size); memory_region_add_subregion(sysmem, spapr->hotplug_memory.base, @@ -2294,6 +2294,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) mc->cpu_index_to_socket_id = spapr_cpu_index_to_socket_id; smc->dr_lmb_enabled = true; + smc->hotplug_alignment = SPAPR_MEMORY_BLOCK_SIZE; fwc->get_dev_path = spapr_get_fw_dev_path; nc->nmi_monitor_handler = spapr_nmi; } @@ -2369,8 +2370,16 @@ static void spapr_machine_2_6_instance_options(MachineState *machine) static void spapr_machine_2_6_class_options(MachineClass *mc) { + sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); + spapr_machine_2_7_class_options(mc); SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_6); + + /* + * 2.6 and older types supported 1GB alignment gap b/n RAM + * and hotplug memory region. + */ + smc->hotplug_alignment = G_BYTE; } DEFINE_SPAPR_MACHINE(2_6, "2.6", false); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 971df3d..b2aeb15 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -37,6 +37,8 @@ struct sPAPRMachineClass { /*< public >*/ bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMBs */ bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */ + hwaddr hotplug_alignment; /* controls the alignment b/n RAM and hotplug + regions */ }; /** @@ -610,9 +612,6 @@ int spapr_rng_populate_dt(void *fdt); */ #define SPAPR_MAX_RAM_SLOTS 32 -/* 1GB alignment for hotplug memory region */ -#define SPAPR_HOTPLUG_MEM_ALIGN (1ULL << 30) - /* * Number of 32 bit words in each LMB list entry in ibm,dynamic-memory * property under ibm,dynamic-reconfiguration-memory node.