From patchwork Sat Nov 30 22:51:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 11268171 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3DAB913B6 for ; Sat, 30 Nov 2019 22:52:12 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 19FB92082E for ; Sat, 30 Nov 2019 22:52:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="RsMrE4Wj"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dT2+IP+O" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 19FB92082E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=EKK/5ZlOguK0mtEolBYk0XEwiJX9bkJYIfGsuvWkav8=; b=RsMrE4WjWuwNRp A7cICtWUlVlQqqo2WL/LhFgMiwK1+xR4fLt5RpxhDnoEvOh47xO4f+m1Z5HXGnFfwbZuExEj1+cjV BYhMKHAJnEC0KgHvjDBnySmB57PUpa0AF+kOSM/Va+oNzA5Kd3kJ7LmG0vXp+DKXn3ekMufTq43Py 3qBM43ZbGPY5eelw8+UObhXrgFA7CiV1ZGWi2ckEJ7b+c2F39NSMAGoFG8N+a3sbl9D857Ud/FFaA GTYzKyV90lC/4KG0yjAzSzgGvU3lggHW/W+1y8zBOJ2ng60S/G5oPfsuhVsvGLDn80Sdxkxn0oUUX fJqwjKgrW1vbKjsjZ7jw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ibBaz-00058V-3D; Sat, 30 Nov 2019 22:52:09 +0000 Received: from mail-yw1-xc41.google.com ([2607:f8b0:4864:20::c41]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ibBax-00057s-0r for linux-arm-kernel@lists.infradead.org; Sat, 30 Nov 2019 22:52:08 +0000 Received: by mail-yw1-xc41.google.com with SMTP id 192so4274407ywy.0 for ; Sat, 30 Nov 2019 14:52:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0vwkyglGpGorvOt8VZHrq8ULnpvVj1p5SSJOevBnU2o=; b=dT2+IP+O2lloskItMtC50uGcnA6bCqf8SFoGPWc8Hvug8ZofdNiXjH19sNBzTKFGUo xipC/EG29KSb20komeiZIiWko/RUn6KTMPcvu+71JUYs0397XeDbsyXTcol0KgangbFy cquh4yfKJdd7mMxjuykxkVWIQ7/Lg3fwG0XlfYiV+WX/KTKD+sxVTEyUrE7jHo5uOJvo rJHFPB0oLbc9wFqK0fF9kn55bVbNfRUlg7sGJofONDtJLGqJJrsBPePNpmPtfHd+MyB1 OonhnH2E1Ed+eOQqzK13QcrhP+ZoB2UQFYLajvKXdO6wbA5FIIgRB6Bj4gmVOeguOHUZ LbEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0vwkyglGpGorvOt8VZHrq8ULnpvVj1p5SSJOevBnU2o=; b=TIa4tRuLz9mxZ1kxZvS4yI98NeatDXzcVu+34aUSYoVjUnBkQP629YLL1/DUrIu3YS 3ijlhIlKaZAIW2ubqzLosLmX31plUYvNZeko2agUw9rVPpvvikqonhZhVIZ9LlAq00h3 5j/Qdpwq1uVCSXPMaOftsTvfZuu6g07ydQ3LO7lT61U25JpUAR+Vk5ibLZG606tXNlIP ND51QryiaroLC6bSvv6F8Gcqs2KF4PLtuXloT3LfDLV8iRYAx7ffF1wBqgw21fluTx8b 7XX2PUOkaRfG1oQw4ub8izIUMHzaLZBo+ycMRsxk/xK0wKmgH5f2fffWOnJAnWYxV2vE 0IpQ== X-Gm-Message-State: APjAAAU5xJ/tGOFLSj7ia+11lu0boG6Vc07W8cazeJEJWk61YqajlGB3 s15qLeoh3zHuzYHZdIjvz5k= X-Google-Smtp-Source: APXvYqzG0+1UOh78swj9TMiUg4a0b4QtGl5kLXlVeA+BzgYMDVGWmEOA28YNrHvlTRkAbmm/Y373vQ== X-Received: by 2002:a81:7b08:: with SMTP id w8mr16074667ywc.133.1575154325471; Sat, 30 Nov 2019 14:52:05 -0800 (PST) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id y9sm2028163ywc.19.2019.11.30.14.52.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Nov 2019 14:52:04 -0800 (PST) From: Adam Ford To: linux-crypto@vger.kernel.org Subject: [PATCH 1/2] crypto: caam: Change the i.MX8MQ check support all i.MX8M variants Date: Sat, 30 Nov 2019 16:51:51 -0600 Message-Id: <20191130225153.30111-1-aford173@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191130_145207_059562_9104ABDD X-CRM114-Status: GOOD ( 10.70 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:c41 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (aford173[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (aford173[at]gmail.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Aymen Sghaier , Fabio Estevam , Herbert Xu , =?utf-8?q?Horia_Geant=C4=83?= , devicetree@vger.kernel.org, Adam Ford , Sascha Hauer , linux-kernel@vger.kernel.org, Rob Herring , NXP Linux Team , Pengutronix Kernel Team , Shawn Guo , "David S. Miller" , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The i.MX8M Mini uses the same crypto engine as the i.MX8MQ, but the driver is restricting the check to just the i.MX8MQ. This patch lets the driver support all i.MX8M Variants if enabled. Signed-off-by: Adam Ford diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index db22777d59b4..1ce03f8961b6 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -527,7 +527,7 @@ static const struct soc_device_attribute caam_imx_soc_table[] = { { .soc_id = "i.MX6UL", .data = &caam_imx6ul_data }, { .soc_id = "i.MX6*", .data = &caam_imx6_data }, { .soc_id = "i.MX7*", .data = &caam_imx7_data }, - { .soc_id = "i.MX8MQ", .data = &caam_imx7_data }, + { .soc_id = "i.MX8M*", .data = &caam_imx7_data }, { .family = "Freescale i.MX" }, { /* sentinel */ } }; From patchwork Sat Nov 30 22:51:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 11268175 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DE239139A for ; Sat, 30 Nov 2019 22:52:21 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id AB16C2075C for ; Sat, 30 Nov 2019 22:52:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AjqBkctH"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YiL4AirM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB16C2075C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3k/EcBFc+cJQuju7nvIB+5IjBzHAvDSDHoTR98Zcw14=; b=AjqBkctHjfAWYr aLGij75w5NMVwnAerXqonfviXB6n50wcKWyUTOoIg2G6mEARVMYbRgA2pZNwsg+uypN1QEtj3/2w1 P16+qaLZl6aIxGAyx6fa/nDzZJDErVPdnw41V3DwuWU8kIYDHG27G3LzWqPF/B3BXaErHYOnjJ2EN j5gpp9c+vWs4w3QmxP6PqIPB/vpxrwW1VBDMbE+DQRnMjbwhxKTXKkP7iLQX0TkyYPsc2qj6bmLcc Mau9ZxYnqdiFW9E21zxBL9BbfvgzSmvr1iOg0ahr4OOrJGSzcAXTZWQFTmOiknDdCuKqXiHvystZj ZCfSSx5p6nYnMhFsiAPQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ibBb6-0005IA-T8; Sat, 30 Nov 2019 22:52:16 +0000 Received: from mail-yw1-xc41.google.com ([2607:f8b0:4864:20::c41]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ibBay-00058C-HH for linux-arm-kernel@lists.infradead.org; Sat, 30 Nov 2019 22:52:09 +0000 Received: by mail-yw1-xc41.google.com with SMTP id r131so12386445ywh.2 for ; Sat, 30 Nov 2019 14:52:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w0VTjeAbtSqemOM43UsO8Hem8cE/aNSTS/UBVqjVywc=; b=YiL4AirMTqr6aGYwyZ/Lh+rb4JR2HtOA76xqsjBh8p9VTZB4W1DziDewVMuiAdJkjJ OkKzSzIx8F3HkzmEmJYvl2eIeguK0Z28QHhdjUlB4/ko7cASISyWnqSPn2PRjM4wUiVU bZhKc33ydp+uW+wz4pNucl/F8ZuhVVGEhjUkpugcy0hOiFL4mahvEYfpU9ORvevutFpF nOVNslyAnLBqF4YrSu5k5/Ye0bz/LSDnG0tDZhNc3+ldghQGwgs0vPnOONowz8uAGkfh 71xCP/NHJ/aB6UP27pGXaCSZZpgOUlGIcmvSJefbCI6hVG8JpAJ9Cukhkbds5TeVFzQG QNDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w0VTjeAbtSqemOM43UsO8Hem8cE/aNSTS/UBVqjVywc=; b=GsQuWeU3Cf1nvLl7cUPh7LWW/nVqNFmnGdAqU8OGSDxttehCRedNPzxT/iP416nUDB cStmwDtGnybs6u+2H6Z3BCb/LVU1zDT6kpCYEmQV2crBJZnwqYAijToy2pF+yc7ZFtDu zqi2I3ikL5Wcfqn1NYMO+c3Gnbza/n5BesNVfRfKTbV1MoPvZXGMBmpvWSkri/PwcDHN xDU6HTe/bKQemkwysrVUB2DCOJfhEpeTyz4294muWidnN6xUmO4eqzdIEGE7GoRIpmco yIwFtpoxN2VTH6Ja52GuJDvnhY3YLIjYGtSKoL9k9XRvZs24QcX6enidl0Z6lnOGgeo0 2ErA== X-Gm-Message-State: APjAAAX+syQyzeAzdvqShXAaYJ7sodLc17d1tirDGrI2CqBvmJsc6g2P rCirdcJHT5epBd3YtQmxCoKdfhw6Xdo= X-Google-Smtp-Source: APXvYqwOR+XG0CXmcrTJVDU+HgRLkfmiEtFTdynP+cuDkyMBswz+hQZfRPCieMZsYMBTfVB3g06P8Q== X-Received: by 2002:a81:53c2:: with SMTP id h185mr16235156ywb.113.1575154327481; Sat, 30 Nov 2019 14:52:07 -0800 (PST) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id y9sm2028163ywc.19.2019.11.30.14.52.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Nov 2019 14:52:06 -0800 (PST) From: Adam Ford To: linux-crypto@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: imx8mm: Add Crypto CAAM support Date: Sat, 30 Nov 2019 16:51:52 -0600 Message-Id: <20191130225153.30111-2-aford173@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191130225153.30111-1-aford173@gmail.com> References: <20191130225153.30111-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191130_145208_568697_AC8C5A99 X-CRM114-Status: GOOD ( 12.99 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:c41 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (aford173[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (aford173[at]gmail.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Aymen Sghaier , Fabio Estevam , Herbert Xu , =?utf-8?q?Horia_Geant=C4=83?= , devicetree@vger.kernel.org, Adam Ford , Sascha Hauer , linux-kernel@vger.kernel.org, Rob Herring , NXP Linux Team , Pengutronix Kernel Team , Shawn Guo , "David S. Miller" , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The i.MX8M Mini supports the same crypto engine as what is in the i.MX8MQ, but it is not currently present in the device tree, because it may be resricted by security features. This patch places in into the device tree and marks it as disabled, but anyone not restricting the CAAM with secure mode functions can mark it as enabled. Signed-off-by: Adam Ford diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi index 2ed1a3537f05..68c7c1adeb60 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi @@ -723,6 +723,37 @@ status = "disabled"; }; + crypto: crypto@30900000 { + compatible = "fsl,sec-v4.0"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x30900000 0x40000>; + ranges = <0 0x30900000 0x40000>; + interrupts = ; + clocks = <&clk IMX8MM_CLK_AHB>, + <&clk IMX8MM_CLK_IPG_ROOT>; + clock-names = "aclk", "ipg"; + status = "disabled"; + + sec_jr0: jr@1000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = ; + }; + + sec_jr1: jr@2000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = ; + }; + + sec_jr2: jr@3000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x3000 0x1000>; + interrupts = ; + }; + }; + i2c1: i2c@30a20000 { compatible = "fsl,imx8mm-i2c", "fsl,imx21-i2c"; #address-cells = <1>;