Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] crypto: caam - Move debugfs fops into standalone file
To:     Herbert Xu <herbert@gondor.apana.org.au>,
        Aymen Sghaier <aymen.sghaier@nxp.com>,
        Linux Crypto Mailing List <linux-crypto@vger.kernel.org>
References: <20200730135426.GA13682@gondor.apana.org.au>
From:   =?UTF-8?Q?Horia_Geant=c4=83?= <horia.geanta@nxp.com>
Message-ID: <c7fa483a-8f57-ee12-3c72-68c770ba4e00@nxp.com>
Date:   Fri, 31 Jul 2020 19:46:07 +0300
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
In-Reply-To: <20200730135426.GA13682@gondor.apana.org.au>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from [192.168.0.129] (84.117.251.185) by AM4PR0202CA0004.eurprd02.prod.outlook.com (2603:10a6:200:89::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.17 via Frontend Transport; Fri, 31 Jul 2020 16:46:09 +0000
X-Originating-IP: [84.117.251.185]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 45802f95-77ac-4439-5e0e-08d835713a5e
X-MS-TrafficTypeDiagnostic: VI1PR0402MB2878:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <VI1PR0402MB2878A11AB34BAED6CF134596984E0@VI1PR0402MB2878.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:6108;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: r/bIKK7joVNGUZIlMbGvvZja2CM6k7j10jpuJEY5Cbk1ziMh6o2NOOCz1dDCqiUC0whzvHqtDLEdrYjyjmsnRBkPJMfj0amR82EVijevowpE9AMcdtAQpbp8NfbaqqlBvy+93Jj2frilJm4d/kXsMJ6hlAdwlC/kKv3cmnfcufOIHqhuVitWgKRgIg4qPQwzInkpAk3m+3op4kHeWncZwNe9jNyuNUNuKL1BSRyVxkELmnW7ucnJsbkMUrSZF3qYPUggM2GSeToYsUVjZu9Q1wG15vAMl5OMzn9Y/F7r9XYd7vPdyp9eg4gOverRXM9EviuZnLGt5rjY2p/WTngg1cVGoE6Io3b9cMwdO6IZcGeLeILbaqGCfNl+490qyHL8
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4046.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(366004)(346002)(136003)(376002)(39860400002)(66476007)(66556008)(66946007)(86362001)(31696002)(8676002)(26005)(316002)(8936002)(31686004)(16576012)(110136005)(5660300002)(186003)(2616005)(478600001)(53546011)(6486002)(16526019)(36756003)(52116002)(956004)(83380400001)(2906002)(43740500002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: MOIREiBw9vO4AM84HsQjZ8vXVoFEiW6IwvpOH0MBY+Cm5MPJjS+F4PZwv9kiokNHH8VuGiodahvyGlgkraFqlg/Z+CvKEFDiaJKoYTiQPZnstIBZhOLouMRF/jihCPIyXiQdVL6kwUqdNVRN4lhQduIKNzthGzjHFxwTZThb7nPwxOt0Q9ismq1g+fjzYDlUFw0678L0HFMlhXedNWHmNd4GS+U2iOD0XxcqnjJT7oGL/2SSWGl65cuRNzrH3zrA2XOAVMAg2zPXbUFeZRoHzCKQKmIKbBPFAJvhGMmFfphYJccVyGw/y8E6RkzCfH9GsYhWxlxTAA3Gxcx5VVErbOklkPx/HdrHc5oRMpgmOfOfzBYSSs8NmTwA7jiXTIsszCBANr1jKjdPvBe+VGuIn7dTujYRJQMBjsAAURriQpBZt8K2u+ZfXI/6m05owl1gZ5ukWG6LRioZStnf77EMpeKbMBOiRMv7p7qfe3GjeJvGH20G0MS7e+9XNShLj3lB6M7rIf+LNtya4P1nGAJt3UqP8eYCudDiNLCqAnl1CbMVCai/0MaAP102Dgcu4NkORuPLFXIUe9jt6/lAYp5PtWq4j3Wngct7tIpANqRy0KV/hmdUEnXhP8ycDARo0pJ6dAWNnHdLORk1YIFQYlqMbA==
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 45802f95-77ac-4439-5e0e-08d835713a5e
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4046.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2020 16:46:10.2203
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: QCiKDJKvxcrILW75t+CkPd6arPHXUDDfSOZuBGaVx372GrpI6VrluW4xxwldsBzDwDqS6+QThZ2uNaKx+I1ZpQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2878
Sender: linux-crypto-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

On 7/30/2020 4:54 PM, Herbert Xu wrote:
> Currently the debugfs fops are defined in caam/intern.h.  This causes
> problems because it creates identical static functions and variables
> in multiple files.  It also creates warnings when those files don't
> use the fops.
> 
Indeed, I see the warnings when compiling with W=1 and CONFIG_DEBUG_FS=y.

> This patch moves them into a standalone file, debugfs.c.
> 
> It also removes unnecessary uses of ifdefs on CONFIG_DEBUG_FS.
> 
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> 
Below hunk is needed for fixing the compilation when CONFIG_DEBUG_FS=y:

diff --git a/drivers/crypto/caam/Makefile b/drivers/crypto/caam/Makefile
index 68d5cc0f28e2..a8d0d37408b2 100644
--- a/drivers/crypto/caam/Makefile
+++ b/drivers/crypto/caam/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC) += caamalg_desc.o
 obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC) += caamhash_desc.o

 caam-y := ctrl.o
+caam-$(CONFIG_DEBUG_FS) += debugfs.o
 caam_jr-y := jr.o key_gen.o
 caam_jr-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API) += caamalg.o
 caam_jr-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI) += caamalg_qi.o

> -	ctrlpriv->ctl = debugfs_create_dir("ctl", dfs_root);
> +	ctl = debugfs_create_dir("ctl", dfs_root);
> +#ifdef CONFIG_DEBUG_FS
> +	ctrlpriv->ctl = ctl;
>  #endif
[...]
>  	debugfs_create_blob("kek", S_IRUSR | S_IRGRP | S_IROTH, ctrlpriv->ctl,
> -			    &ctrlpriv->ctl_kek_wrap);
> +			    blob);
Compilation fails when CONFIG_DEBUG_FS=n.

s/ctrlpriv->ctl/ctl, here and below.

>  
> -	ctrlpriv->ctl_tkek_wrap.data = (__force void *)&ctrlpriv->ctrl->tkek[0];
> -	ctrlpriv->ctl_tkek_wrap.size = KEK_KEY_SIZE * sizeof(u32);
> +	blob = caam_debugfs_ptr(&ctrlpriv->ctl_tkek_wrap);
> +	blob->data = (__force void *)&ctrlpriv->ctrl->tkek[0];
> +	blob->size = KEK_KEY_SIZE * sizeof(u32);
>  	debugfs_create_blob("tkek", S_IRUSR | S_IRGRP | S_IROTH, ctrlpriv->ctl,
> -			    &ctrlpriv->ctl_tkek_wrap);
> +			    blob);
>  
> -	ctrlpriv->ctl_tdsk_wrap.data = (__force void *)&ctrlpriv->ctrl->tdsk[0];
> -	ctrlpriv->ctl_tdsk_wrap.size = KEK_KEY_SIZE * sizeof(u32);
> +	blob = caam_debugfs_ptr(&ctrlpriv->ctl_tdsk_wrap);
> +	blob->data = (__force void *)&ctrlpriv->ctrl->tdsk[0];
> +	blob->size = KEK_KEY_SIZE * sizeof(u32);
>  	debugfs_create_blob("tdsk", S_IRUSR | S_IRGRP | S_IROTH, ctrlpriv->ctl,
> -			    &ctrlpriv->ctl_tdsk_wrap);
> -#endif
> +			    blob);

Thanks,
Horia