Commit 675ef02f authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files

staging: ccree: add clock management support 



Some SoC which implement CryptoCell have a dedicated clock
tied to it, some do not. Implement clock support if exists
based on device tree data and tie power management to it.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b091fadb

drivers/staging/ccree/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_CRYPTO_DEV_CCREE) := ccree.o

ccree-y := ssi_driver.o ssi_sysfs.o ssi_buffer_mgr.o ssi_request_mgr.o ssi_cipher.o ssi_hash.o ssi_aead.o ssi_ivgen.o ssi_sram_mgr.o ssi_pm.o ssi_pm_ext.o

ccree-y := ssi_driver.o ssi_sysfs.o ssi_buffer_mgr.o ssi_request_mgr.o ssi_cipher.o ssi_hash.o ssi_aead.o ssi_ivgen.o ssi_sram_mgr.o ssi_pm.o

ccree-$(CCREE_FIPS_SUPPORT) += ssi_fips.o ssi_fips_ll.o ssi_fips_ext.o ssi_fips_local.o

drivers/staging/ccree/ssi_driver.c

+38 −5
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include <linux/sched.h>

#include <linux/random.h>

#include <linux/of.h>

#include <linux/clk.h>



#include "ssi_config.h"

#include "ssi_driver.h"
@@ -219,6 +220,8 @@ static int init_cc_resources(struct platform_device *plat_dev) 
	void __iomem *cc_base = NULL;

	bool irq_registered = false;

	struct ssi_drvdata *new_drvdata = kzalloc(sizeof(struct ssi_drvdata), GFP_KERNEL);

	struct device *dev = &plat_dev->dev;

	struct device_node *np = dev->of_node;

	u32 signature_val;

	int rc = 0;
@@ -228,6 +231,8 @@ static int init_cc_resources(struct platform_device *plat_dev) 
		goto init_cc_res_err;

	}



	new_drvdata->clk = of_clk_get(np, 0);



	/*Initialize inflight counter used in dx_ablkcipher_secure_complete used for count of BYSPASS blocks operations*/

	new_drvdata->inflight_counter = 0;
@@ -286,6 +291,10 @@ static int init_cc_resources(struct platform_device *plat_dev) 


	new_drvdata->plat_dev = plat_dev;



	rc = cc_clk_on(new_drvdata);

	if (rc)

		goto init_cc_res_err;



	if(new_drvdata->plat_dev->dev.dma_mask == NULL)

	{

		new_drvdata->plat_dev->dev.dma_mask = & new_drvdata->plat_dev->dev.coherent_dma_mask;
@@ -450,14 +459,11 @@ static void cleanup_cc_resources(struct platform_device *plat_dev) 
	ssi_sysfs_fini();

#endif



	/* Mask all interrupts */

	WRITE_REGISTER(drvdata->cc_base + CC_REG_OFFSET(HOST_RGF, HOST_IMR),

		0xFFFFFFFF);

	fini_cc_regs(drvdata);

	cc_clk_off(drvdata);

	free_irq(drvdata->res_irq->start, drvdata);

	drvdata->res_irq = NULL;



	fini_cc_regs(drvdata);



	if (drvdata->cc_base != NULL) {

		iounmap(drvdata->cc_base);

		release_mem_region(drvdata->res_mem->start,
@@ -470,6 +476,33 @@ static void cleanup_cc_resources(struct platform_device *plat_dev) 
	dev_set_drvdata(&plat_dev->dev, NULL);

}



int cc_clk_on(struct ssi_drvdata *drvdata)

{

	struct clk *clk = drvdata->clk;

	int rc;



	if (IS_ERR(clk))

		/* Not all devices have a clock associated with CCREE  */

		return 0;



	rc = clk_prepare_enable(clk);

	if (rc)

		return rc;



	return 0;

}



void cc_clk_off(struct ssi_drvdata *drvdata)

{

	struct clk *clk = drvdata->clk;



	if (IS_ERR(clk))

		/* Not all devices have a clock associated with CCREE */

		return;



	clk_disable_unprepare(clk);

}



static int cc7x_probe(struct platform_device *plat_dev)

{

	int rc;

drivers/staging/ccree/ssi_driver.h

+4 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <crypto/authenc.h>

#include <crypto/hash.h>

#include <linux/version.h>

#include <linux/clk.h>



/* Registers definitions from shared/hw/ree_include */

#include "dx_reg_base_host.h"
@@ -148,7 +149,7 @@ struct ssi_drvdata { 
	void *ivgen_handle;

	void *sram_mgr_handle;

	u32 inflight_counter;



	struct clk *clk;

};



struct ssi_crypto_alg {
@@ -193,6 +194,8 @@ void dump_byte_array(const char *name, const u8 *the_array, unsigned long size); 


int init_cc_regs(struct ssi_drvdata *drvdata, bool is_probe);

void fini_cc_regs(struct ssi_drvdata *drvdata);

int cc_clk_on(struct ssi_drvdata *drvdata);

void cc_clk_off(struct ssi_drvdata *drvdata);



#endif /*__SSI_DRIVER_H__*/

drivers/staging/ccree/ssi_pm.c

+7 −6
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "ssi_ivgen.h"

#include "ssi_hash.h"

#include "ssi_pm.h"

#include "ssi_pm_ext.h"





#if defined (CONFIG_PM_RUNTIME) || defined (CONFIG_PM_SLEEP)
@@ -52,9 +51,7 @@ int ssi_power_mgr_runtime_suspend(struct device *dev) 
		return rc;

	}

	fini_cc_regs(drvdata);



	/* Specific HW suspend code */

	ssi_pm_ext_hw_suspend(dev);

	cc_clk_off(drvdata);

	return 0;

}
@@ -66,8 +63,12 @@ int ssi_power_mgr_runtime_resume(struct device *dev) 


	SSI_LOG_DEBUG("ssi_power_mgr_runtime_resume , unset HOST_POWER_DOWN_EN\n");

	WRITE_REGISTER(drvdata->cc_base + CC_REG_OFFSET(HOST_RGF, HOST_POWER_DOWN_EN), POWER_DOWN_DISABLE);

	/* Specific HW resume code */

	ssi_pm_ext_hw_resume(dev);



	rc = cc_clk_on(drvdata);

	if (rc) {

		SSI_LOG_ERR("failed getting clock back on. We're toast.\n");

		return rc;

	}



	rc = init_cc_regs(drvdata, false);

	if (rc !=0) {

drivers/staging/ccree/ssi_pm_ext.c

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012-2017 ARM Limited or its affiliates.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, see <http://www.gnu.org/licenses/>.

 */





#include "ssi_config.h"

#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/interrupt.h>

#include <crypto/ctr.h>

#include <linux/pm_runtime.h>

#include "ssi_driver.h"

#include "ssi_sram_mgr.h"

#include "ssi_pm_ext.h"



/*

 * This function should suspend the HW (if possiable), It should be implemented by

 * the driver user.

 * The reference code clears the internal SRAM to imitate lose of state.

 */

void ssi_pm_ext_hw_suspend(struct device *dev)

{

	struct ssi_drvdata *drvdata =

		(struct ssi_drvdata *)dev_get_drvdata(dev);

	unsigned int val;

	void __iomem *cc_base = drvdata->cc_base;

	unsigned int  sram_addr = 0;



	CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, SRAM_ADDR), sram_addr);



	for (;sram_addr < SSI_CC_SRAM_SIZE ; sram_addr+=4) {

		CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, SRAM_DATA), 0x0);



		do {

			val = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, SRAM_DATA_READY));

		} while (!(val &0x1));

	}

}



/*

 * This function should resume the HW (if possiable).It should be implemented by

 * the driver user.

 */

void ssi_pm_ext_hw_resume(struct device *dev)

{

	return;

}