From patchwork Thu Apr 18 13:39:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 162498 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp763094jan; Thu, 18 Apr 2019 06:42:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqwhOsEWoCq4WbFwERMHeAnVeL+45P6gUVK509/Xd6Z3Wj8+Ajm8H9g3s4PWyyJZS14XdLkO X-Received: by 2002:a65:6295:: with SMTP id f21mr82834018pgv.129.1555594947642; Thu, 18 Apr 2019 06:42:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555594947; cv=none; d=google.com; s=arc-20160816; b=EtapS+3wey+8v73y7wPpGTZiawK7j7AA4l69f/eAjp2Vqt2UAfszF3YAQ3duKj3HXV Ia3qmh6s9axEG4DHt7lIWXs2xXUZSt6efxW3hyKSJc5AihY61nLuAbBZpbvr6un7iiLG uaMw4YhAGnrgw3X37BS5p4OwM/sOsSFSMDboQgJeohbIOPtpvcZ+lQOID6zgQR4buMzO V6U5QkiYVx7zcGLXdPfCgKsp3zjWuZQUng5E8JBsqqk4N+NfQO1WRqlmII6WXLIXG4Dh fVTr4gn0VCA6ckJiLyVDdrwOWzowG2XI/ThUwAqVrajvfZskjoLy/Yhi7kvsNX7+YLfF lWrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Mb5dj/ORixnyhLNhb/doY+CyPPR+PD+jKjedu9i1iS4=; b=bmRX8KBdrhCD3D+VjhVyKcXOJE9brpkjMJrE74AbLTrbeGcAqVAXHbPkKYtkOaxW+p KZf9tPboUVv98Rb2g9YBPlkiQYi/WN2pp0PrwxX7axeBnpyHHlZy9E33+PLjQNEAfwy+ oAXJ/ITBTQ6ZEtJW+rB7p9BLEki1WrwNOP3aBw94rq1Mgv4Z10gkaLBNAr0gQFk+tCEA L2Sx5+59y2KeB+IpRT9P+duTOQnTxeUsrpPvYGU4/Sa5uknUcZOovC34d/G6uwNPI0yr zwdERE7DG1tX+xD0h7CrIu5rsJ70+q+G4YG2NEMx/NUrHWAsdnGhOJ7tiQxb5gYbz2es wEQg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b4si1957362pgg.581.2019.04.18.06.42.27; Thu, 18 Apr 2019 06:42:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389146AbfDRNmZ (ORCPT + 3 others); Thu, 18 Apr 2019 09:42:25 -0400 Received: from foss.arm.com ([217.140.101.70]:33778 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389270AbfDRNmY (ORCPT ); Thu, 18 Apr 2019 09:42:24 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C6E5380D; Thu, 18 Apr 2019 06:42:23 -0700 (PDT) Received: from e110176-lin.kfn.arm.com (e110176-lin.kfn.arm.com [10.50.4.178]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5B2363F5AF; Thu, 18 Apr 2019 06:42:22 -0700 (PDT) From: Gilad Ben-Yossef To: Herbert Xu , "David S. Miller" Cc: Ofir Drang , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 32/35] crypto: ccree: remove cc7x3 obsoleted AXIM configs Date: Thu, 18 Apr 2019 16:39:07 +0300 Message-Id: <20190418133913.9122-33-gilad@benyossef.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418133913.9122-1-gilad@benyossef.com> References: <20190418133913.9122-1-gilad@benyossef.com> MIME-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org From: Ofir Drang AXIM configuration register modified in cc7x3 and no longer includes AXI interrupt masking fields. Signed-off-by: Ofir Drang Signed-off-by: Gilad Ben-Yossef --- drivers/crypto/ccree/cc_driver.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.21.0 diff --git a/drivers/crypto/ccree/cc_driver.c b/drivers/crypto/ccree/cc_driver.c index a28548192211..902f196d4be1 100644 --- a/drivers/crypto/ccree/cc_driver.c +++ b/drivers/crypto/ccree/cc_driver.c @@ -193,11 +193,14 @@ int init_cc_regs(struct cc_drvdata *drvdata, bool is_probe) unsigned int val, cache_params; struct device *dev = drvdata_to_dev(drvdata); - /* Unmask all AXI interrupt sources AXI_CFG1 register */ - val = cc_ioread(drvdata, CC_REG(AXIM_CFG)); - cc_iowrite(drvdata, CC_REG(AXIM_CFG), val & ~CC_AXI_IRQ_MASK); - dev_dbg(dev, "AXIM_CFG=0x%08X\n", - cc_ioread(drvdata, CC_REG(AXIM_CFG))); + /* Unmask all AXI interrupt sources AXI_CFG1 register */ + /* AXI interrupt config are obsoleted startign at cc7x3 */ + if (drvdata->hw_rev <= CC_HW_REV_712) { + val = cc_ioread(drvdata, CC_REG(AXIM_CFG)); + cc_iowrite(drvdata, CC_REG(AXIM_CFG), val & ~CC_AXI_IRQ_MASK); + dev_dbg(dev, "AXIM_CFG=0x%08X\n", + cc_ioread(drvdata, CC_REG(AXIM_CFG))); + } /* Clear all pending interrupts */ val = cc_ioread(drvdata, CC_REG(HOST_IRR));