From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79DA6C433EF for ; Thu, 14 Oct 2021 15:12:21 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F0454603E5 for ; Thu, 14 Oct 2021 15:12:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org F0454603E5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BA7E0837A4; Thu, 14 Oct 2021 17:12:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="dnK7RwtY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0EB228356F; Thu, 14 Oct 2021 17:10:19 +0200 (CEST) Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) (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 676648356F for ; Thu, 14 Oct 2021 17:10:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@google.com Received: by mail-ot1-x335.google.com with SMTP id x33-20020a9d37a4000000b0054733a85462so8618825otb.10 for ; Thu, 14 Oct 2021 08:10:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=/ylAr3UFlBbiPvcT1lcVRI+MUcBRTY8auVhKT1k4jHg=; b=dnK7RwtYVO26ZP5t8s5yPboR+PEERJKs1QbBUTy6aZI9yOBMBDQyEdCCc0or8N6wcY ziZ0z6wxqQodJHzAnZcAbkgksmLERVFq+v7uqnB+dc3+xeoO08cxu08EhwqvaVbis5RR znxVhvbfOzzL3Z66wxtQlVp1+H8OOWBqOkRJQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/ylAr3UFlBbiPvcT1lcVRI+MUcBRTY8auVhKT1k4jHg=; b=0GMJPo2m/GstH5sfJg5m+pcTuV3gwvi23osjlvPKNW8BpVPEXSCEp50xpC34s1QFt0 i8GspZp4YOSa6E3n0O+quKN9l6ISkUuK/Vub2I5pql8HLtxUndK7bbqPa/p5u0cEXiMf BLsOR8cmOmviLRvzj5IOWtpIuRYqhBsL7R4uPROr6bSx3LzvO2UC1YWIiOB0qejmCaXW ROOrisvemA1yTaYJyM6UGkT7aMXqGfcP+kvmJG6meCJW/l5uvpj5ocyAuPNEjN3b3A65 B+782b48QjT/8rP2oju95dbe/xXffbXZuuhtHxHgPHBsjVGDVuQTJZkCKjWHvNXBH98r YPng== X-Gm-Message-State: AOAM531FSqnYjDGmQWJg4s7kgP188sd92hAmtY0ZiXjba1Q5pSIMlzIy e9u67+kVSMdRWnm47ssbUIEohkQDk2r+dQSCrajIDUWZapo= X-Google-Smtp-Source: ABdhPJxhA+gK6/irhWS8uJaUMgxExiGTkaGfF5HhsGyHuEmNCoFoCDZ9VfY6hoQ38xOxhLf+DZyw9ZjM0wV85EyVmLg= X-Received: by 2002:a9d:7b49:: with SMTP id f9mr3075622oto.11.1634224202770; Thu, 14 Oct 2021 08:10:02 -0700 (PDT) MIME-Version: 1.0 References: <20211005111324.19749-1-jorge@foundries.io> <20211005111324.19749-2-jorge@foundries.io> In-Reply-To: <20211005111324.19749-2-jorge@foundries.io> From: Simon Glass Date: Thu, 14 Oct 2021 09:09:47 -0600 Message-ID: Subject: Re: [RFC PATCH 1/2] fpga_load: pass compatible string To: Jorge Ramirez-Ortiz Cc: Michal Simek , Tom Rini , Alexandru Gagniuc , U-Boot Mailing List , Ricardo Salveti , Michael Scott , Igor Opaniuk Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean Hi Jorge, On Tue, 5 Oct 2021 at 05:13, Jorge Ramirez-Ortiz wrote: > > Instead of ignoring the mandatory fpga compatible string, let the > different implementations decide how to handle it > > Signed-off-by: Jorge Ramirez-Ortiz > --- > cmd/fpga.c | 8 ++++---- > common/image.c | 4 ++-- > common/spl/spl_fit.c | 4 +--- > drivers/fpga/fpga.c | 11 +++++++++-- > include/fpga.h | 2 +- > 5 files changed, 17 insertions(+), 12 deletions(-) > Reviewed-by: Simon Glass > diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c [..] > index f41abca0cc..4db22efd8c 100644 > --- a/common/spl/spl_fit.c > +++ b/common/spl/spl_fit.c > @@ -566,11 +566,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); > + 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 fe3dfa1233..00aa4190b4 100644 > --- a/drivers/fpga/fpga.c > +++ b/drivers/fpga/fpga.c > @@ -252,7 +252,8 @@ int fpga_loads(int devnum, const void *buf, size_t size, > /* > * Generic multiplexing code > */ > -int fpga_load(int devnum, const void *buf, size_t bsize, bitstream_type bstype) > +int fpga_load(int devnum, const void *buf, size_t bsize, bitstream_type bstype, > + const char *compatible) > { > int ret_val = FPGA_FAIL; /* assume failure */ > const fpga_desc *desc = fpga_validate(devnum, buf, bsize, > @@ -263,13 +264,16 @@ int fpga_load(int devnum, const void *buf, size_t bsize, bitstream_type bstype) > case fpga_xilinx: > #if defined(CONFIG_FPGA_XILINX) > ret_val = xilinx_load(desc->devdesc, buf, bsize, > - bstype); > + bstype, compatible); > #else > fpga_no_sup((char *)__func__, "Xilinx devices"); > #endif > break; > case fpga_altera: > #if defined(CONFIG_FPGA_ALTERA) > + if (strcmp(compatible, "u-boot,fpga-legacy")) > + printf("Ignoring compatible = %s property\n", > + compatible); > ret_val = altera_load(desc->devdesc, buf, bsize); > #else > fpga_no_sup((char *)__func__, "Altera devices"); > @@ -277,6 +281,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 (strcmp(compatible, "u-boot,fpga-legacy")) > + printf("Ignoring compatible = %s property\n", > + 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..d85ef2cf18 100644 > --- a/include/fpga.h > +++ b/include/fpga.h > @@ -64,7 +64,7 @@ int fpga_count(void); > const fpga_desc *const fpga_get_desc(int devnum); > int fpga_is_partial_data(int devnum, size_t img_len); > int fpga_load(int devnum, const void *buf, size_t bsize, > - bitstream_type bstype); > + bitstream_type bstype, const char *compatible); Please can you add a function comment? > int fpga_fsload(int devnum, const void *buf, size_t size, > fpga_fs_info *fpga_fsinfo); > int fpga_loads(int devnum, const void *buf, size_t size, > -- > 2.31.1 > Also the FPGA uclass is missing a sandbox driver/emulator and a test, if you have time to do that. At present FPGA tests in CI are skipped (e.g. with make qcheck). Regards, Simon