From patchwork Mon Apr 11 18:00:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Fiergolski X-Patchwork-Id: 1615886 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=fastree3d-com.20210112.gappssmtp.com header.i=@fastree3d-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=qA31N58a; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KccBN38yJz9s3q for ; Tue, 12 Apr 2022 04:02:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0FA7E83E0E; Mon, 11 Apr 2022 20:01:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=fastree3d.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=fastree3d-com.20210112.gappssmtp.com header.i=@fastree3d-com.20210112.gappssmtp.com header.b="qA31N58a"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0B0D783E46; Mon, 11 Apr 2022 20:01:38 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CE2DD83E0A for ; Mon, 11 Apr 2022 20:01:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=fastree3d.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=adrian.fiergolski@fastree3d.com Received: by mail-ed1-x52c.google.com with SMTP id u18so8775557eda.3 for ; Mon, 11 Apr 2022 11:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastree3d-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KbaHLWTz3LzJTLSB6yKNxN2YbBW2koZbDgfBjjoom/E=; b=qA31N58apGnSqRCNpKXyBw2XuijIo5fNc1BTfeHlwRDm7s+BntpJM+S29GX00l+3rI 8cdlmhBu1b7c2yAwPtohZW6UsRAfPSnpC4N3WHBiLXI24wkbmz/8/m7aech1+GZeB6Kp 8Xhm6gaou6rMbJKTshRUdAlT6X2Vp3jpXkOWNXlCW3bICtkzHS68yBKNebwTPuECFq+x sHwIGxOeFA9pXOORRLH9rLZN7xDj2F7fCxvihwfgChET+EFx6zXs9FyRpo1LihNLJkH9 9uEZD+2Dk75iKxr2/r2S5P7FYb9TadTVZSVpQuk7ZqNTYeRnX6eAG5upee8rjfFKRQ09 f+4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KbaHLWTz3LzJTLSB6yKNxN2YbBW2koZbDgfBjjoom/E=; b=wZUBikAniq6Yb4bXpvC18MHl1eqIfWoCNzqCZlgH/iZLVcSPwOPk8cD70xyalJ0B6W 2fSHsYcTekZc0640Zv28T07B9ZXtl8hjkJtgw/Z/zSDZaSJazyDhIEuoFgPkuiBJan4L mi7nOaeGAoJFendWgV8ifDfJAbc87i8AAnr9xFhzXZTppRMixWr3+4+I5W3mhVk+WzG8 lY7QdGPgdeleHCKzjn4R136E7oYpHhwNsQImec3VQExdLrWXOvpiEqxPG8FQnRmYDoYr DSUMu6COw3zWpfoOzYhhVKn4tTijSQ4P78mgOS3elUzLWkGgKxelUqaXFt2637pHRwZQ qgEg== X-Gm-Message-State: AOAM5334NNO1UtYil9K/fXyX01fpBZWRnRDvO7ZsTDitNb7xXydhyNTE yzdvjeizv045g/3PzBkLaEZfVeR0+YcRnOVJaA== X-Google-Smtp-Source: ABdhPJzqGsjYnVFWh2S0lLuU/Shi/2Z/rikBs4fJpm8iI9KoFwp4ExnBZ4qJgpVPzUh4licFmPQrLg== X-Received: by 2002:a05:6402:27d4:b0:419:5105:f7e7 with SMTP id c20-20020a05640227d400b004195105f7e7mr34428837ede.356.1649700088953; Mon, 11 Apr 2022 11:01:28 -0700 (PDT) Received: from localhost.localdomain (fastree1.epfl.ch. [192.26.37.52]) by smtp.gmail.com with ESMTPSA id d1-20020a170906174100b006e85e9903f2sm3880927eje.89.2022.04.11.11.01.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 11:01:28 -0700 (PDT) From: Adrian Fiergolski To: u-boot@lists.denx.de Cc: oleksandr.suvorov@foundries.io, ricardo@foundries.io, michal.simek@xilinx.com, igor.opaniuk@foundries.io, jorge@foundries.io, mr.nuke.me@gmail.com, bmeng.cn@gmail.com, hs@denx.de, jagan@amarulasolutions.com, klaus@linux.vnet.ibm.com, seanga2@gmail.com, sjg@chromium.org, jaeckel-floss@eyet-services.de, Adrian Fiergolski Subject: [PATCH v7 2/7] fpga: add fit_fpga_load function Date: Mon, 11 Apr 2022 20:00:41 +0200 Message-Id: <20220411180046.1505209-3-adrian.fiergolski@fastree3d.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220411180046.1505209-1-adrian.fiergolski@fastree3d.com> References: <20220411180046.1505209-1-adrian.fiergolski@fastree3d.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: Oleksandr Suvorov Introduce a function which passes an fpga compatible string from FIT images to FPGA drivers. This lets the different implementations decide how to handle it. Some code of Jorge Ramirez-Ortiz is reused. Signed-off-by: Oleksandr Suvorov Tested-by: Ricardo Salveti Co-developed-by: Adrian Fiergolski Signed-off-by: Adrian Fiergolski --- common/spl/spl_fit.c | 6 ++---- drivers/fpga/fpga.c | 23 ++++++++++++++++++++++- include/fpga.h | 4 ++++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 1bbf824684..0e3c2a94b6 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -588,11 +588,9 @@ static int spl_fit_upload_fpga(struct spl_fit_info *ctx, int node, compatible = fdt_getprop(ctx->fit, node, "compatible", NULL); if (!compatible) warn_deprecated("'fpga' image without 'compatible' property"); - else if (strcmp(compatible, "u-boot,fpga-legacy")) - printf("Ignoring compatible = %s property\n", compatible); - ret = fpga_load(0, (void *)fpga_image->load_addr, fpga_image->size, - BIT_FULL); + ret = fit_fpga_load(0, (void *)fpga_image->load_addr, fpga_image->size, + BIT_FULL, compatible); if (ret) { printf("%s: Cannot load the image to the FPGA\n", __func__); return ret; diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c index 3b0a44b242..a306dd81f9 100644 --- a/drivers/fpga/fpga.c +++ b/drivers/fpga/fpga.c @@ -249,8 +249,23 @@ int fpga_loads(int devnum, const void *buf, size_t size, } #endif +int fit_fpga_load(int devnum, const void *buf, size_t bsize, + bitstream_type bstype, const char *compatible) +{ + fpga_desc *desc = fpga_get_desc(devnum); + + /* + * Store the compatible string to proceed it in underlying + * functions + */ + desc->compatible = (char *)compatible; + + return fpga_load(devnum, buf, bsize, bstype); +} + /* - * Generic multiplexing code + * Generic multiplexing code: + * Each architecture must handle the mandatory FPGA DT compatible property. */ int fpga_load(int devnum, const void *buf, size_t bsize, bitstream_type bstype) { @@ -270,6 +285,9 @@ int fpga_load(int devnum, const void *buf, size_t bsize, bitstream_type bstype) break; case fpga_altera: #if defined(CONFIG_FPGA_ALTERA) + if (strncmp(desc->compatible, "u-boot,fpga-legacy", 18)) + printf("Ignoring compatible = %s property\n", + desc->compatible); ret_val = altera_load(desc->devdesc, buf, bsize); #else fpga_no_sup((char *)__func__, "Altera devices"); @@ -277,6 +295,9 @@ int fpga_load(int devnum, const void *buf, size_t bsize, bitstream_type bstype) break; case fpga_lattice: #if defined(CONFIG_FPGA_LATTICE) + if (strncmp(desc->compatible, "u-boot,fpga-legacy", 18)) + printf("Ignoring compatible = %s property\n", + desc->compatible); ret_val = lattice_load(desc->devdesc, buf, bsize); #else fpga_no_sup((char *)__func__, "Lattice devices"); diff --git a/include/fpga.h b/include/fpga.h index ec5144334d..2891f32106 100644 --- a/include/fpga.h +++ b/include/fpga.h @@ -35,6 +35,7 @@ typedef enum { /* typedef fpga_type */ typedef struct { /* typedef fpga_desc */ fpga_type devtype; /* switch value to select sub-functions */ void *devdesc; /* real device descriptor */ + char *compatible; /* device compatible string */ } fpga_desc; /* end, typedef fpga_desc */ typedef struct { /* typedef fpga_desc */ @@ -63,6 +64,9 @@ int fpga_add(fpga_type devtype, void *desc); int fpga_count(void); const fpga_desc *const fpga_get_desc(int devnum); int fpga_is_partial_data(int devnum, size_t img_len); +/* the DT compatible property must be handled by the different FPGA archs */ +int fit_fpga_load(int devnum, const void *buf, size_t bsize, + bitstream_type bstype, const char *compatible); int fpga_load(int devnum, const void *buf, size_t bsize, bitstream_type bstype); int fpga_fsload(int devnum, const void *buf, size_t size,