From patchwork Thu Mar 15 05:58:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyril Bur X-Patchwork-Id: 886567 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 402Qq02dSCz9sVP for ; Fri, 16 Mar 2018 11:11:08 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=au1.ibm.com Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 402Qq00QBCzF1XJ for ; Fri, 16 Mar 2018 11:11:08 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=au1.ibm.com X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=au1.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=cyril.bur@au1.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=au1.ibm.com 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 402QgS3jBgzF1TD for ; Fri, 16 Mar 2018 11:04:36 +1100 (AEDT) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w2FNxLKd137124 for ; Thu, 15 Mar 2018 20:04:33 -0400 Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111]) by mx0b-001b2d01.pphosted.com with ESMTP id 2gqxw49d4a-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Thu, 15 Mar 2018 20:04:33 -0400 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 16 Mar 2018 00:04:31 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 16 Mar 2018 00:04:29 -0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w2G04ST352166752 for ; Fri, 16 Mar 2018 00:04:28 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DA5354C04E for ; Thu, 15 Mar 2018 23:57:41 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 86CE64C04A for ; Thu, 15 Mar 2018 23:57:41 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Thu, 15 Mar 2018 23:57:41 +0000 (GMT) Received: from camb691.ozlabs.ibm.com (unknown [9.192.254.114]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 8D711A03C2 for ; Thu, 15 Mar 2018 16:58:43 +1100 (AEDT) From: Cyril Bur To: skiboot@lists.ozlabs.org Date: Thu, 15 Mar 2018 16:58:19 +1100 X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180315055827.8999-1-cyril.bur@au1.ibm.com> References: <20180315055827.8999-1-cyril.bur@au1.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18031600-0020-0000-0000-00000405A8BF X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18031600-0021-0000-0000-00004299B33D Message-Id: <20180315055827.8999-8-cyril.bur@au1.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-15_12:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803150258 Subject: [Skiboot] [PATCH 07/15] libflash/libffs: Always add entries to the end of the TOC X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" It turns out that sorted order isn't the best idea. This removes flexibility from the caller. If the user wants their partitions in sorted order, they should insert them in sorted order. Signed-off-by: Cyril Bur --- libflash/libffs.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/libflash/libffs.c b/libflash/libffs.c index 4f1852ff..e115e427 100644 --- a/libflash/libffs.c +++ b/libflash/libffs.c @@ -610,25 +610,7 @@ static int __ffs_entry_add(struct ffs_hdr *hdr, struct ffs_entry *entry) return FFS_ERR_BAD_PART_BASE; } - /* - * A header can't have zero entries. Was asserted. - */ - list_for_each(&hdr->entries, ent, list) - if (entry->base < ent->base) - break; - - if (ent == list_top(&hdr->entries, struct ffs_entry, list)) { - /* - * This should never happen because the partition entry - * should ALWAYS be here - */ - fprintf(stderr, "Warning: replacing first entry in FFS header\n"); - list_add(&hdr->entries, &entry->list); - } else if (!ent) { - list_add_tail(&hdr->entries, &entry->list); - } else { - list_add_before(&hdr->entries, &entry->list, &ent->list); - } + list_add_tail(&hdr->entries, &entry->list); return 0; }