From patchwork Mon Jun 6 16:10:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12870651 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9BD35C43334 for ; Mon, 6 Jun 2022 16:11:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=RxNBMKjVX5qHdaBoPMpWXe1sB9VlRr4rKtygTZjUeA8=; b=QzLSI8qdLvxyUx Bgze3FBy6y+5yEX9a8JsGmfLwgDZnifUrpdHMJWn0J0NWY9ci5ou5WWvs5l9SGhvYJNB5CxIuRLJ8 DQTfZIQ1Wbh7hbSfDGvJDOnslbQakGXCyKjPcwPiogNwLTjRha2/wGJBCwWDVX9eewhdQyYXAEvH3 Elu3r66EZhCvlViB5amksLiTlUBJ3CQmX/exXMONQhtr02fCjgOrFjBnCTZgNb2e++pCkTjNJrNAK oTFxdl4b+9AD7LccjlLtJcqRIlP0nvGy/n3hOKlnmja3Kk7g8mdn3TgGTWdd18z9t6fQkrK6eCkKc 3R6wz5zLMewTHmRST6/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyFJW-001yay-7T; Mon, 06 Jun 2022 16:10:46 +0000 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyFJT-001yZd-E7 for linux-arm-kernel@lists.infradead.org; Mon, 06 Jun 2022 16:10:44 +0000 Received: by mail-ej1-x633.google.com with SMTP id q1so29900403ejz.9 for ; Mon, 06 Jun 2022 09:10:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tSDJ73uf033Lt8Qb9E4/AaLuGXv/Rn17XR3DIaxY8rs=; b=mMc/wzdZUU4j81nV07i0onYl+1y4eXfdo6T2Ia2ulYbdq3rc0TaK5qTPFKoHm6eb1I YfKjpnOAZ/RYYKvhSBq207eWn5CJbbRpPKMu3zzjt0sassLcTxTl43c3ZDGhskjkfvql g1nPqRSPj9/gaPsanXlwuOkKg8+7+BGRXj9a3HbSRKAtuLz5N5IcXrujbW2BFXfxWaqC /uo39wXFkE1MrtBWmtjkiwAg9ITRDyTf215wB6//akZrHlicGbuzSfw8iVPVTPQdCQPB /M5Kz70GFA3kGdCxfo8k+pfxOxa2+/HCqlmz9Huj1mzn8TqM3qlSdtfQEZw0Lukf+OV5 x89g== 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:mime-version :content-transfer-encoding; bh=tSDJ73uf033Lt8Qb9E4/AaLuGXv/Rn17XR3DIaxY8rs=; b=K3Sg3awbUmoYD5JxEzvknp9iPIgxEIzIiGQXn2yzAMzDLRDQV4u86um/lKfF6BDHuS EVqIN4tLIOq56JR0emDpYy7Y1HCC+nq8jNBtx6Z/d2hAfl3wLdmEpLjbgeoOQb5sJxN8 h8azvfI3/41r6Vfl0Nxd+VzRc1+HWq1LxvUv/r4IP2OG83SGMQgTFwAnv4EJ7qs79ghn hcIEkg8vG3sj0HfImWGLbZPGzuXJxP3t4d7Y3qo58O0glQUkVwkF6e/lD3FjOQYz+xwQ BP9hqDUKnryUoGo6zI+GNELP4TW2dVrukHEqehDrr7/rIJZ3N+i+PPXxsFVGIx8jzbMk 8zWQ== X-Gm-Message-State: AOAM532EEk6J68qGQMfFjwfp+cWBjpyNQEilu4mRBKsjExu2Cw+1FE2e hp06N9yXF3s09ThtQ7OW4nc= X-Google-Smtp-Source: ABdhPJx/yM5uc/IPOixT8zGExudH74lnyMZRR5UZYe4JrnLTsE8gTu44WVnkKvIFXchylVqtUEq+UA== X-Received: by 2002:a17:907:7811:b0:6ef:a896:b407 with SMTP id la17-20020a170907781100b006efa896b407mr21506298ejc.645.1654531839448; Mon, 06 Jun 2022 09:10:39 -0700 (PDT) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g22-20020aa7c596000000b0042deea0e961sm8698640edq.67.2022.06.06.09.10.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 09:10:38 -0700 (PDT) From: Peter Robinson To: Vinod Koul , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Anson Huang , Daniel Baluta , Robin Gong , "Angus Ainslie (Purism)" , dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Peter Robinson , stable@vger.kernel.org Subject: [PATCH] dmaengine: imx-sdma: Allow imx8m for imx7 FW revs Date: Mon, 6 Jun 2022 17:10:34 +0100 Message-Id: <20220606161034.3544803-1-pbrobinson@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220606_091043_510146_D7F227ED X-CRM114-Status: GOOD ( 13.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The revision of the imx-sdma IP that is in the i.MX8M series is the same is that as that in the i.MX7 series but the imx7d MODULE_FIRMWARE directive is wrapped in a condiditional which means it's not defined when built for aarch64 SOC_IMX8M platforms and hence you get the following errors when the driver loads on imx8m devices: imx-sdma 302c0000.dma-controller: Direct firmware load for imx/sdma/sdma-imx7d.bin failed with error -2 imx-sdma 302c0000.dma-controller: external firmware not found, using ROM firmware Add the SOC_IMX8M into the check so the firmware can load on i.MX8. Fixes: 1474d48bd639 ("arm64: dts: imx8mq: Add SDMA nodes") Fixes: 941acd566b18 ("dmaengine: imx-sdma: Only check ratio on parts that support 1:1") Signed-off-by: Peter Robinson Cc: stable@vger.kernel.org # v5.2+ Reviewed-by: Fabio Estevam --- drivers/dma/imx-sdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 8535018ee7a2..900cafdaf359 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -2346,7 +2346,7 @@ MODULE_DESCRIPTION("i.MX SDMA driver"); #if IS_ENABLED(CONFIG_SOC_IMX6Q) MODULE_FIRMWARE("imx/sdma/sdma-imx6q.bin"); #endif -#if IS_ENABLED(CONFIG_SOC_IMX7D) +#if IS_ENABLED(CONFIG_SOC_IMX7D) || IS_ENABLED(CONFIG_SOC_IMX8M) MODULE_FIRMWARE("imx/sdma/sdma-imx7d.bin"); #endif MODULE_LICENSE("GPL");