From patchwork Tue Sep 13 04:14:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 669136 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 AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sYBSL183gz9sD5 for ; Tue, 13 Sep 2016 14:25:54 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sYBSK73yDzDsTL for ; Tue, 13 Sep 2016 14:25:53 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sYBSD73SRzDrp3 for ; Tue, 13 Sep 2016 14:25:48 +1000 (AEST) Received: by ozlabs.org (Postfix, from userid 1023) id 3sYBSD6C2Cz9sfH; Tue, 13 Sep 2016 14:25:48 +1000 (AEST) From: Jeremy Kerr To: skiboot@lists.ozlabs.org Date: Tue, 13 Sep 2016 12:14:28 +0800 Message-Id: <1473740068-8491-1-git-send-email-jk@ozlabs.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [Skiboot] [PATCH] opal-prd: fix for 64-bit pnor sizes X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Neuling Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Current builds of opal-prd are failing with: pnor.c: In function ‘pnor_init’: pnor.c:48:43: error: passing argument 3 of ‘blocklevel_get_info’ from incompatible pointer type [-Werror=incompatible-pointer-types] rc = blocklevel_get_info(pnor->bl, NULL, &(pnor->size), &(pnor->erasesize)); ^ In file included from ./libflash/libflash.h:21:0, from ./libflash/libffs.h:19, from pnor.c:17: ./libflash/blocklevel.h:64:5: note: expected ‘uint64_t * {aka long unsigned int *}’ but argument is of type ‘uint32_t * {aka unsigned int *}’ int blocklevel_get_info(struct blocklevel_device *bl, const char **name, uint64 ^ Commit c043065cf changed the type of PNOR sizes to a uint64_t, so we need to update our pnor code to match. Signed-off-by: Jeremy Kerr Cc: Michael Neuling --- external/opal-prd/pnor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/opal-prd/pnor.h b/external/opal-prd/pnor.h index 729a969..4ff449c 100644 --- a/external/opal-prd/pnor.h +++ b/external/opal-prd/pnor.h @@ -7,7 +7,7 @@ struct pnor { char *path; struct ffs_handle *ffsh; - uint32_t size; + uint64_t size; uint32_t erasesize; struct blocklevel_device *bl; };