From patchwork Wed Sep 21 22:02:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Bringmann X-Patchwork-Id: 673063 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sfYZ45Cdkz9sCp for ; Thu, 22 Sep 2016 08:04:28 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sfYZ44QlVzDslG for ; Thu, 22 Sep 2016 08:04:28 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sfYXF3XxPzDskn for ; Thu, 22 Sep 2016 08:02:53 +1000 (AEST) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8LLwU6g026487 for ; Wed, 21 Sep 2016 18:02:50 -0400 Received: from e33.co.us.ibm.com (e33.co.us.ibm.com [32.97.110.151]) by mx0b-001b2d01.pphosted.com with ESMTP id 25khte5rm0-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 21 Sep 2016 18:02:50 -0400 Received: from localhost by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 21 Sep 2016 16:02:49 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e33.co.us.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 21 Sep 2016 16:02:47 -0600 Received: from b01cxnp22036.gho.pok.ibm.com (b01cxnp22036.gho.pok.ibm.com [9.57.198.26]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 8773819D8026 for ; Wed, 21 Sep 2016 16:02:15 -0600 (MDT) Received: from b01ledav001.gho.pok.ibm.com (b01ledav001.gho.pok.ibm.com [9.57.199.106]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u8LM2kNo6226204 for ; Wed, 21 Sep 2016 22:02:46 GMT Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2824C2803F for ; Wed, 21 Sep 2016 18:02:46 -0400 (EDT) Received: from oc1376853207.ibm.com (unknown [9.53.92.233]) by b01ledav001.gho.pok.ibm.com (Postfix) with ESMTP id E70B62803D for ; Wed, 21 Sep 2016 18:02:45 -0400 (EDT) To: linuxppc-dev@lists.ozlabs.org In-Reply-To: c77dcd04-b878-476c-ad49-bf4a6def1116@linux.vnet.ibm.com From: Michael Bringmann Subject: Resend: [PATCH V7 2/8] powerpc/memory: Parse new memory property to register blocks. Organization: IBM Linux Technology Center Date: Wed, 21 Sep 2016 17:02:45 -0500 User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16092122-0008-0000-0000-000005A213BC X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005799; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000185; SDB=6.00759994; UDB=6.00361421; IPR=6.00534435; BA=6.00004744; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012742; XFM=3.00000011; UTC=2016-09-21 22:02:48 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16092122-0009-0000-0000-00003B7E7DD3 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-09-21_12:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609020000 definitions=main-1609210402 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" powerpc/memory: Add parallel routines to parse the new property "ibm,dynamic-memory-v2" property when it is present, and then to register the relevant memory blocks with the operating system. This property format is intended to provide a more compact representation of memory when communicating with the front end processor, especially when describing vast amounts of RAM. [V2: Revise contant names.] [V3: Fix error parsing the new memory block sets.] [V4: Move a couple of function prototypes from header file a later patch where first used. Amend some comments. Change a firmware architure vec check for scan actual device tree. Compress some common code.] [V5: Resynchronize/resubmit] [V6: No change] [V7: Correct mail threading] Signed-off-by: Michael Bringmann diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h index 7f436ba..b9a1534 100644 --- a/arch/powerpc/include/asm/prom.h +++ b/arch/powerpc/include/asm/prom.h @@ -69,6 +69,8 @@ struct boot_param_header { * OF address retreival & translation */ +extern int n_mem_addr_cells; + /* Parse the ibm,dma-window property of an OF node into the busno, phys and * size parameters. */ @@ -81,8 +83,9 @@ extern void of_instantiate_rtc(void); extern int of_get_ibm_chip_id(struct device_node *np); /* The of_drconf_cell struct defines the layout of the LMB array - * specified in the device tree property - * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory + * specified in the device tree properties, + * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory + * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory-v2 */ struct of_drconf_cell { u64 base_addr; @@ -92,9 +95,20 @@ struct of_drconf_cell { u32 flags; }; -#define DRCONF_MEM_ASSIGNED 0x00000008 -#define DRCONF_MEM_AI_INVALID 0x00000040 -#define DRCONF_MEM_RESERVED 0x00000080 +#define DRCONF_MEM_ASSIGNED 0x00000008 +#define DRCONF_MEM_AI_INVALID 0x00000040 +#define DRCONF_MEM_RESERVED 0x00000080 + +struct of_drconf_cell_v2 { + u32 num_seq_lmbs; + u64 base_addr; + u32 drc_index; + u32 aa_index; + u32 flags; +} __attribute__((packed)); + +extern void read_drconf_cell_v2(struct of_drconf_cell_v2 *drmem, + const __be32 **cellp); /* * There are two methods for telling firmware what our capabilities are. diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 669a15e..ad294ce 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -57,8 +57,10 @@ EXPORT_SYMBOL(node_data); static int min_common_depth; -static int n_mem_addr_cells, n_mem_size_cells; +int n_mem_addr_cells; +static int n_mem_size_cells; static int form1_affinity; +EXPORT_SYMBOL(n_mem_addr_cells); #define MAX_DISTANCE_REF_POINTS 4 static int distance_ref_points_depth; @@ -405,6 +405,24 @@ static void read_drconf_cell(struct of_drconf_cell *drmem, const __be32 **cellp) *cellp = cp + 4; } + + /* + * Retrieve and validate the ibm,dynamic-memory property of the device tree. + * Read the next memory block set entry from the ibm,dynamic-memory-v2 property + * and return the information in the provided of_drconf_cell_v2 structure. + */ +void read_drconf_cell_v2(struct of_drconf_cell_v2 *drmem, const __be32 **cellp) +{ + const __be32 *cp = (const __be32 *)*cellp; + drmem->num_seq_lmbs = be32_to_cpu(*cp++); + drmem->base_addr = read_n_cells(n_mem_addr_cells, &cp); + drmem->drc_index = be32_to_cpu(*cp++); + drmem->aa_index = be32_to_cpu(*cp++); + drmem->flags = be32_to_cpu(*cp++); + + *cellp = cp; +} +EXPORT_SYMBOL(read_drconf_cell_v2); /* * Retrieve and validate the ibm,dynamic-memory property of the device tree. diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index b0245be..51330bc 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -443,23 +443,34 @@ static int __init early_init_dt_scan_chosen_ppc(unsigned long node, #ifdef CONFIG_PPC_PSERIES /* - * Interpret the ibm,dynamic-memory property in the - * /ibm,dynamic-reconfiguration-memory node. + * Retrieve and validate the ibm,lmb-size property for drconf memory + * from the flattened device tree. + */ +static u64 __init get_lmb_size(unsigned long node) +{ + const __be32 *ls; + int len; + ls = of_get_flat_dt_prop(node, "ibm,lmb-size", &len); + if (!ls || len < dt_root_size_cells * sizeof(__be32)) + return 0; + return dt_mem_next_cell(dt_root_size_cells, &ls); +} + +/* + * Interpret the ibm,dynamic-memory property/ibm,dynamic-memory-v2 + * in the /ibm,dynamic-reconfiguration-memory node. * This contains a list of memory blocks along with NUMA affinity * information. */ -static int __init early_init_dt_scan_drconf_memory(unsigned long node) +static int __init early_init_dt_scan_drconf_memory_v1(unsigned long node) { - const __be32 *dm, *ls, *usm; + const __be32 *dm, *usm; int l; unsigned long n, flags; u64 base, size, memblock_size; unsigned int is_kexec_kdump = 0, rngs; - ls = of_get_flat_dt_prop(node, "ibm,lmb-size", &l); - if (ls == NULL || l < dt_root_size_cells * sizeof(__be32)) - return 0; - memblock_size = dt_mem_next_cell(dt_root_size_cells, &ls); + memblock_size = get_lmb_size(node); dm = of_get_flat_dt_prop(node, "ibm,dynamic-memory", &l); if (dm == NULL || l < sizeof(__be32)) @@ -518,6 +529,76 @@ static int __init early_init_dt_scan_drconf_memory(unsigned long node) memblock_dump_all(); return 0; } + +static int __init early_init_dt_scan_drconf_memory_v2(unsigned long node) +{ + const __be32 *dm; + int l; + unsigned long num_sets; + u64 size, base, memblock_size; + + memblock_size = get_lmb_size(node); + + dm = of_get_flat_dt_prop(node, "ibm,dynamic-memory-v2", &l); + if (dm == NULL || l < sizeof(__be32)) + return 0; + + /* Verify expected length of the array of ibm,dynamic-memory-v2 + * structs fits in the actual size of the property data. + */ + num_sets = of_read_number(dm++, 1); + if (l < (num_sets * (dt_root_addr_cells + 4) + 1) * sizeof(__be32)) + return 0; + + if (n_mem_addr_cells == 0) + n_mem_addr_cells = dt_root_addr_cells; + + for (; num_sets != 0; --num_sets) { + struct of_drconf_cell_v2 drmem; + unsigned long nsl; + + read_drconf_cell_v2(&drmem, &dm); + base = drmem.base_addr; + nsl = drmem.num_seq_lmbs; + size = memblock_size; + + /* SKip this block if the reserved bit is set in flags + * or if the block is not assigned to this partition + */ + if ((drmem.flags & DRCONF_MEM_RESERVED) || + !(drmem.flags & DRCONF_MEM_ASSIGNED)) + continue; + + for (; nsl != 0; nsl--) { + size = memblock_size; + + if (iommu_is_off) { + if (base >= 0x80000000ul) + continue; + if ((base + size) > 0x80000000ul) + size = 0x80000000ul - base; + } + memblock_add(base, size); + + base += size; + } + } + + memblock_dump_all(); + return 0; +} + +static int __init early_init_dt_scan_drconf_memory(unsigned long node) +{ + const __be32 *dm; + int l; + dm = of_get_flat_dt_prop(node, "ibm,dynamic-memory-v2", &l); + if (dm == NULL || l < sizeof(__be32)) + return early_init_dt_scan_drconf_memory_v1(node); + else + return early_init_dt_scan_drconf_memory_v2(node); +} + #else #define early_init_dt_scan_drconf_memory(node) 0 #endif /* CONFIG_PPC_PSERIES */