From patchwork Wed Mar 4 06:42:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 446113 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.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 568CB14016B for ; Wed, 4 Mar 2015 17:42:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=neutral reason="verification failed; unprotected key/testing" header.d=jms.id.au header.i=@jms.id.au header.b=dhou7zZD; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 1002D1A047B for ; Wed, 4 Mar 2015 17:42:35 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=neutral reason="verification failed; unprotected key/testing" header.d=jms.id.au header.i=@jms.id.au header.b=dhou7zZD; dkim-adsp=none (unprotected policy); dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mail-pd0-x233.google.com (mail-pd0-x233.google.com [IPv6:2607:f8b0:400e:c02::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id EDE351A0330 for ; Wed, 4 Mar 2015 17:42:29 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass reason="1024-bit key; unprotected key/testing" header.d=jms.id.au header.i=@jms.id.au header.b=dhou7zZD; dkim-adsp=pass; dkim-atps=neutral Received: by pdbfl12 with SMTP id fl12so23777637pdb.5 for ; Tue, 03 Mar 2015 22:42:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jms.id.au; s=google; h=from:to:subject:date:message-id; bh=JHb8IXZx/YXfTqazDO1R97gnMpOsKLjV4CJAgmnlczs=; b=dhou7zZD6L84g3TZOQmTxDIWdjJYvJl3ziqsNDOB2LltlyjcfZq+8xCWm5w/mu7B6U tkRoDbngRWGHm9IRWzqBDR10vfedSpoE08js3olrjKEp6VgAGMD9KE15fXsbH39l0DSy 2PTyjh5KwKuH2LeAdNG4pdFUui7+2v/Q+BDAw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=JHb8IXZx/YXfTqazDO1R97gnMpOsKLjV4CJAgmnlczs=; b=V0E6Xkz060kxkssUfIN3ysYjHU7zow/ccyunDuxEBqPu7nqNAtSYMNoLhUpBdJOSBW RGdLxrYWMAoNRkesrOg7Rx4tNe2c+VxmbliuWKyml0VpTEhbTfCct8OL0uYzgM6Y9u4g biRRS4qKXnw8ZmlBif0qJJ5wLW5O5CewoeYP0GkTXF0GNih4voNOOsQZ/DOMrJoh/hT9 Ii8akKCU8KB0BiQJrh4XUE9iVuATGDM+32g5HcmLuXcmUWmwPCTfo+kKN9G6GcYHw1uK IvayDhvomFwARVPPQcVZUdA9/5iRnO8oyPK+QjypCrlt3NjRyGaUpz+tkKb3CyYH1c8y foGA== X-Gm-Message-State: ALoCoQnGsFw7UFMt+HPD2bptmO0pkDco2wAtZKwGvP7CGUmnpYTAE3pYQPAehced9XVAYxHR4l+c X-Received: by 10.68.68.133 with SMTP id w5mr4268315pbt.136.1425451347795; Tue, 03 Mar 2015 22:42:27 -0800 (PST) Received: from icarus.au.ibm.com (220-244-113-206.static.tpgi.com.au. [220.244.113.206]) by mx.google.com with ESMTPSA id py5sm1489604pbc.81.2015.03.03.22.42.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Mar 2015 22:42:27 -0800 (PST) From: Joel Stanley To: skiboot@lists.ozlabs.org Date: Wed, 4 Mar 2015 17:12:17 +1030 Message-Id: <1425451339-10221-1-git-send-email-joel@jms.id.au> X-Mailer: git-send-email 2.1.4 Subject: [Skiboot] [PATCH 1/3] external/opal-prd: Enhance PNOR error messages X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.18 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" Provide detailed feedback when encountering errors in the PNOR code. Signed-off-by: Joel Stanley --- external/opal-prd/pnor.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/external/opal-prd/pnor.c b/external/opal-prd/pnor.c index 0eca693..e5609fe 100644 --- a/external/opal-prd/pnor.c +++ b/external/opal-prd/pnor.c @@ -105,8 +105,8 @@ void dump_parts(struct ffs_handle *ffs) { } } -int mtd_write(struct pnor *pnor, int fd, void *data, uint64_t offset, - size_t len) +static int mtd_write(struct pnor *pnor, int fd, void *data, uint64_t offset, + size_t len) { int write_start, write_len, start_waste, rc; bool end_waste = false; @@ -115,7 +115,7 @@ int mtd_write(struct pnor *pnor, int fd, void *data, uint64_t offset, if (len > pnor->size || offset > pnor->size || len + offset > pnor->size) - return -1; + return -ERANGE; start_waste = offset % pnor->erasesize; write_start = offset - start_waste; @@ -191,8 +191,8 @@ out: return rc; } -int mtd_read(struct pnor *pnor, int fd, void *data, uint64_t offset, - size_t len) +static int mtd_read(struct pnor *pnor, int fd, void *data, uint64_t offset, + size_t len) { int read_start, read_len, start_waste, rc; int mask = pnor->erasesize - 1; @@ -200,7 +200,7 @@ int mtd_read(struct pnor *pnor, int fd, void *data, uint64_t offset, if (len > pnor->size || offset > pnor->size || len + offset > pnor->size) - return -1; + return -ERANGE; /* Align start to erase block size */ start_waste = offset % pnor->erasesize; @@ -214,7 +214,7 @@ int mtd_read(struct pnor *pnor, int fd, void *data, uint64_t offset, /* Ensure read is not out of bounds */ if (read_start + read_len > pnor->size) { fprintf(stderr, "PNOR: read out of bounds\n"); - return -1; + return -ERANGE; } buf = malloc(read_len); @@ -231,7 +231,7 @@ int mtd_read(struct pnor *pnor, int fd, void *data, uint64_t offset, goto out; } - /* Copy data into destination, cafefully avoiding the extra data we + /* Copy data into destination, carefully avoiding the extra data we * added to align to block size */ memcpy(data, buf + start_waste, len); rc = len; @@ -246,19 +246,28 @@ int pnor_operation(struct pnor *pnor, const char *name, uint64_t offset, int rc, fd; uint32_t pstart, psize, idx; - if (!pnor->ffsh) - return -1; + if (!pnor->ffsh) { + warnx("PNOR: ffs not initialised"); + return -EBUSY; + } rc = ffs_lookup_part(pnor->ffsh, name, &idx); - if (rc) - return -1; + if (rc) { + warnx("PNOR: failed to find partition '%s'", name); + return -ENOENT; + } ffs_part_info(pnor->ffsh, idx, NULL, &pstart, &psize, NULL, NULL); - if (rc) - return -1; + if (rc) { + warnx("PNOR: unable to fetch partition info"); + return -ENOENT; + } - if (size > psize || offset > psize || size + offset > psize) - return -1; + if (size > psize || offset > psize || size + offset > psize) { + warnx("PNOR: offset (%ld) or size (%ld) out of bounds (%d)", + offset, size, psize); + return -ERANGE; + } fd = open(pnor->path, O_RDWR); if (fd < 0) { @@ -280,7 +289,7 @@ int pnor_operation(struct pnor *pnor, const char *name, uint64_t offset, rc = mtd_write(pnor, fd, data, offset, size); break; default: - rc = -1; + rc = -EIO; fprintf(stderr, "PNOR: Invalid operation\n"); goto out; }