From nobody Wed Oct 8 07:08:33 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD76326F445 for ; Tue, 1 Jul 2025 11:20:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751368855; cv=none; b=GjgmEzLi/J6TFrSovqN3HHN/8dOkGnC2CcedC+gQK6cRHfijLFEh1ApCU0HftZzTWlIw77SOefQ7SDbLD0NjzbtB0ffueLYA1rKwJxDhvUJcerxUafXEbh2J9wM1c2Ypd8Z+ARNhMuKSDsYJ1px9PkIxWvjsYQwkGjDqFQzRz5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751368855; c=relaxed/simple; bh=ij1nHwP9563dCp6D39igVpjbrxzU+rLg/g8KA/ryBQ8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=n11vRHdWEG/KjBOo9F1l+/PBIGLvR1E2w8LX7bq9HUgQMka1k8haZU/NLGU08bSmnT6LkzTdy2HklAGLa+HFREaBcCA6aw/A4T3/JGiBW7EordD41V1RfWa9g3PuS8ylRmf4akSSimRARjViOLT6uEzu0YPDfZcj8smu1ZuQ89U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=JWhccFxh; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JWhccFxh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751368852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Ov6U1n1MDWz2D5fqtp1DKTq1qAHyWwUBf7Nu4VT/uv8=; b=JWhccFxhzi6xyNlsgawy8hY+9z7f/L0JARn0ysiwQvnmtIouIdxO6rFc/gRJ5rWG4xAw54 Ch0wDNd/14ADbnnyr+nSsq41R6/MkwmAkFtqwBIA0SUOQi5oD5RihsAfn/t3/jtlhIq0YZ SqB1PY+yWSbsAPYPIIv1ugiHDzC5g4o= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-lwODRd86NHWRHnwiqmQA9A-1; Tue, 01 Jul 2025 07:20:51 -0400 X-MC-Unique: lwODRd86NHWRHnwiqmQA9A-1 X-Mimecast-MFC-AGG-ID: lwODRd86NHWRHnwiqmQA9A_1751368850 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a5780e8137so3183395f8f.1 for ; Tue, 01 Jul 2025 04:20:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751368850; x=1751973650; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ov6U1n1MDWz2D5fqtp1DKTq1qAHyWwUBf7Nu4VT/uv8=; b=AyHhmPi+n7w7Z6Do6JQrcMllruvRQnNrImXFu/y9pnHMxkC1lGWdsWQh7f2lBpdfoO EZDwRTBLAEYtHpzlEjcehtV1NUoCFlmByC3EA1Iul/zLOis9IrrmBe53CWjscpHeYFAR exu6yZjBYdjGAOKIQwZ6ur/1pv4E2Tj1AorANJJ1QsRy5tGcMQMMdytoc27MKDDqpyi0 kvW0s6QOaE6kyDvxennMoa032f6nwLizZcw+vr8CxB9dnl2IoFXrd1AVG522Zdu57wXO 10I9sKhhUoH+1/KeYBuB88lzIvu4PINCHqZEWHjOVT6yQjD1atUiMbN+AR9eCdN90t// EUQQ== X-Forwarded-Encrypted: i=1; AJvYcCXb8aOIFc+GjBeFKRf4Yv26Upjdsq5TjAd0FHZPrsF1djQEeskHGBY8IWIMDwEv/5U8iiKw4Y1qnaYxGqk=@vger.kernel.org X-Gm-Message-State: AOJu0YxVVG5LHNJm1uZLFPprVNV0hbFVVF4FYNc+IjrvoGCtWuK7eVim xQTfBmtkaFq1qIPl8g6cfNN535CDzeVcGtMcqHJiqkcxRXLWnNWMH1guX5vUpv9W9c/eV23bA1K riIrTEmvRfWyyatZJUmIymSn+XT/11U+qbP69HJRobAOsTwDyC1ccKtbPB9ro+xR21w== X-Gm-Gg: ASbGncs01xpIBGmW6uGDgdgRO5nlVu4/Bx0JQSptmUecfRnnqlvm94PlbevDfEIX/O1 e9kGL08hLMZg5ADcmBqzU4NQAlTyYFa9Wt/M1XQ5TZVQweTlzYI90fAvkEKKVT37SJzQ+gWG3kw u+raB4Hi2Yt9svzOSnLbTjS5L2mssEs2ExfHHh77Ta42Flp7VmhWfxX2x2smhOAcEUOccUPcqX3 S3z+2dgo+HlD4ibUd0RasnH2+C1lvFnmc1m1lIaI8NgD78FIePhLiSM2d87rj7vtcVQShZGvFDx E+Zo661Dk3FZDs9sdGoKlCgg19TKWJlr0pEerH8JjJYph5/A3qr66f0xxA3lhU3v44qw X-Received: by 2002:a5d:6b50:0:b0:3a4:f607:a5ad with SMTP id ffacd0b85a97d-3af1066e035mr2243957f8f.19.1751368850043; Tue, 01 Jul 2025 04:20:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6AnEMsB4u172EihzT1thVpD1PO0S/tKfcNFTL+IkHYmZz4eI4zi6zCqHfM3FwezUxcVn94A== X-Received: by 2002:a5d:6b50:0:b0:3a4:f607:a5ad with SMTP id ffacd0b85a97d-3af1066e035mr2243918f8f.19.1751368849575; Tue, 01 Jul 2025 04:20:49 -0700 (PDT) Received: from lbulwahn-thinkpadx1carbongen9.rmtde.csb ([2a02:810d:7e01:ef00:b52:2ad9:f357:f709]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-453823ad0fesm197728785e9.25.2025.07.01.04.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jul 2025 04:20:48 -0700 (PDT) From: Lukas Bulwahn X-Google-Original-From: Lukas Bulwahn To: =?UTF-8?q?Horia=20Geant=C4=83?= , Pankaj Gupta , Gaurav Jain , Herbert Xu , "David S . Miller" , linux-crypto@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [PATCH] crypto: caam - avoid option aliasing with the CONFIG_CAAM_QI build option Date: Tue, 1 Jul 2025 13:20:45 +0200 Message-ID: <20250701112045.18386-1-lukas.bulwahn@redhat.com> X-Mailer: git-send-email 2.50.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lukas Bulwahn In the Makefile, the new build option CONFIG_CAAM_QI is defined conditioned on the existence of the CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI, which is properly defined in the Kconfig file. So, CONFIG_CAAM_QI is just a local alias for CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI. There is little benefit in the source code of having this slightly shorter alias for this configuration, but it complicates further maintenance, as searching for the impact of CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI requires to grep once, and then identify the option introduced and continue searching for that. Further, tools, such as cross referencers, and scripts to check Kconfig definitions and their use simply do not handle this situation. Given that this is the only incidence of such a config alias in the whole kernel tree, just prefer to avoid this pattern of aliasing here. Use CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI throughout the Freescale CAAM-Multicore platform driver backend source code. No functional change. Signed-off-by: Lukas Bulwahn Reviewed-by: Horia Geant=C4=83 --- drivers/crypto/caam/Makefile | 4 ---- drivers/crypto/caam/ctrl.c | 6 +++--- drivers/crypto/caam/debugfs.c | 2 +- drivers/crypto/caam/debugfs.h | 2 +- drivers/crypto/caam/intern.h | 4 ++-- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/crypto/caam/Makefile b/drivers/crypto/caam/Makefile index acf1b197eb84..d2eaf5205b1c 100644 --- a/drivers/crypto/caam/Makefile +++ b/drivers/crypto/caam/Makefile @@ -25,10 +25,6 @@ caam_jr-$(CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API) +=3D caamp= kc.o pkc_desc.o caam_jr-$(CONFIG_CRYPTO_DEV_FSL_CAAM_BLOB_GEN) +=3D blob_gen.o =20 caam-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI) +=3D qi.o -ifneq ($(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI),) - ccflags-y +=3D -DCONFIG_CAAM_QI -endif - caam-$(CONFIG_DEBUG_FS) +=3D debugfs.o =20 obj-$(CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM) +=3D dpaa2_caam.o diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index ce7b99019537..a93be395c878 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -24,7 +24,7 @@ bool caam_dpaa2; EXPORT_SYMBOL(caam_dpaa2); =20 -#ifdef CONFIG_CAAM_QI +#ifdef CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI #include "qi.h" #endif =20 @@ -968,7 +968,7 @@ static int caam_probe(struct platform_device *pdev) caam_dpaa2 =3D !!(comp_params & CTPR_MS_DPAA2); ctrlpriv->qi_present =3D !!(comp_params & CTPR_MS_QI_MASK); =20 -#ifdef CONFIG_CAAM_QI +#ifdef CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI /* If (DPAA 1.x) QI present, check whether dependencies are available */ if (ctrlpriv->qi_present && !caam_dpaa2) { ret =3D qman_is_probed(); @@ -1099,7 +1099,7 @@ static int caam_probe(struct platform_device *pdev) wr_reg32(&ctrlpriv->qi->qi_control_lo, QICTL_DQEN); =20 /* If QMAN driver is present, init CAAM-QI backend */ -#ifdef CONFIG_CAAM_QI +#ifdef CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI ret =3D caam_qi_init(pdev); if (ret) dev_err(dev, "caam qi i/f init failed: %d\n", ret); diff --git a/drivers/crypto/caam/debugfs.c b/drivers/crypto/caam/debugfs.c index 6358d3cabf57..718352b7afb5 100644 --- a/drivers/crypto/caam/debugfs.c +++ b/drivers/crypto/caam/debugfs.c @@ -22,7 +22,7 @@ static int caam_debugfs_u32_get(void *data, u64 *val) DEFINE_DEBUGFS_ATTRIBUTE(caam_fops_u32_ro, caam_debugfs_u32_get, NULL, "%l= lu\n"); DEFINE_DEBUGFS_ATTRIBUTE(caam_fops_u64_ro, caam_debugfs_u64_get, NULL, "%l= lu\n"); =20 -#ifdef CONFIG_CAAM_QI +#ifdef CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI /* * This is a counter for the number of times the congestion group (where a= ll * the request and response queueus are) reached congestion. Incremented diff --git a/drivers/crypto/caam/debugfs.h b/drivers/crypto/caam/debugfs.h index 8b5d1acd21a7..ef238c71f92a 100644 --- a/drivers/crypto/caam/debugfs.h +++ b/drivers/crypto/caam/debugfs.h @@ -18,7 +18,7 @@ static inline void caam_debugfs_init(struct caam_drv_priv= ate *ctrlpriv, {} #endif =20 -#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_CAAM_QI) +#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_= API_QI) void caam_debugfs_qi_congested(void); void caam_debugfs_qi_init(struct caam_drv_private *ctrlpriv); #else diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h index 51c90d17a40d..a88da0d31b23 100644 --- a/drivers/crypto/caam/intern.h +++ b/drivers/crypto/caam/intern.h @@ -227,7 +227,7 @@ static inline int caam_prng_register(struct device *dev) static inline void caam_prng_unregister(void *data) {} #endif /* CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API */ =20 -#ifdef CONFIG_CAAM_QI +#ifdef CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI =20 int caam_qi_algapi_init(struct device *dev); void caam_qi_algapi_exit(void); @@ -243,7 +243,7 @@ static inline void caam_qi_algapi_exit(void) { } =20 -#endif /* CONFIG_CAAM_QI */ +#endif /* CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI */ =20 static inline u64 caam_get_dma_mask(struct device *dev) { --=20 2.50.0