mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-05-07 20:09:17 +00:00
linux-am335x: Update to latest 3.2 kernel release
* Update to the latest PSP release (version 04.06.00.10) of the 3.2 kernel. * Rename recipe to match meta-ti kernel recipe naming convention. * Use in tree defconfig instead of providing a separate defconfig. These defconfigs were the same anyway. * Add additional crypto patches that were needed to fix suspend and resume issues. Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
This commit is contained in:
Franklin S. Cooper Jr
committed by
Denys Dmytriyenko
Denys Dmytriyenko
parent
bb6646fd96
commit
8a6d2d49dd
File diff suppressed because it is too large
Load Diff
+23
-8
@@ -15,12 +15,12 @@ DEPENDS += "am33x-cm3"
|
||||
KERNEL_IMAGETYPE = "uImage"
|
||||
|
||||
# The main PR is now using MACHINE_KERNEL_PR, for ti33x see conf/machine/include/ti33x.inc
|
||||
MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}"
|
||||
MACHINE_KERNEL_PR_append = "c+gitr${SRCPV}"
|
||||
|
||||
BRANCH = "v3.2-staging"
|
||||
|
||||
# This SRCREV corresponds to tag v3.2_AM335xPSP_04.06.00.08
|
||||
SRCREV = "d7e124e8074cccf9958290e773c88a4b2b36412b"
|
||||
# SRCREV corresponds to the commit id of tag v3.2_AM335xPSP_04.06.00.10-rc3
|
||||
SRCREV = "18ce4a630452348b8308b922491130e8ce1e9134"
|
||||
|
||||
SRC_URI = "git://arago-project.org/git/projects/linux-am33x.git;protocol=git;branch=${BRANCH} \
|
||||
file://defconfig \
|
||||
@@ -29,8 +29,8 @@ SRC_URI = "git://arago-project.org/git/projects/linux-am33x.git;protocol=git;bra
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
# Allow a layer to easily add to the list of patches or completely override them.
|
||||
KERNEL_PATCHES ?= "${PATCHES}"
|
||||
# Allow a layer to easily add to the list of patches or completely override them
|
||||
KERNEL_PATCHES = "${PATCHES}"
|
||||
|
||||
# Add a set of patches that enabled features, fixed bugs or disabled buggy features
|
||||
# that weren't part of the official PSP release
|
||||
@@ -52,13 +52,25 @@ PATCHES += "file://0001-am33x-Add-memory-addresses-for-crypto-modules.patch \
|
||||
file://0001-am335x-Add-crypto-driver-settings-to-defconfig.patch \
|
||||
file://0001-am335x-Add-pm_runtime-API-to-crypto-driver.patch \
|
||||
file://0002-am335x-Add-suspend-resume-routines-to-crypto-driver.patch \
|
||||
file://0001-ARM-AM33xx-hwmod-Convert-SHA0-crypto-device-data-to-.patch \
|
||||
file://0002-crypto-omap4-sham-Use-finer-grained-PM-management.patch \
|
||||
file://0003-crypto-omap4-sham-Add-suspend-resume-PM-support.patch \
|
||||
file://0004-crypto-omap4-sham-Don-t-use-hardcoded-base-address.patch \
|
||||
file://0005-ARM-AM33xx-hwmod-Convert-AES0-crypto-device-data-to-.patch \
|
||||
file://0006-crypto-omap4-aes-User-finer-grained-PM-management.patch \
|
||||
file://0007-crypto-omap4-aes-Add-suspend-resume-PM-support.patch \
|
||||
file://0008-crypto-omap4-aes-Don-t-use-hardcoded-base-address.patch \
|
||||
file://0009-ARM-AM33xx-hwmod-Convert-RNG-device-data-to-hwmod.patch \
|
||||
file://0010-hwrng-omap4-rng-Convert-to-use-pm_runtime-API.patch \
|
||||
file://0001-omap4-rng-Remove-check-for-GP-only-device-type-in-RN.patch \
|
||||
"
|
||||
|
||||
# Add SmartReflex support early driver patches while working to get the driver
|
||||
# upstream.
|
||||
PATCHES += "file://0001-am33xx-Add-SmartReflex-support.patch \
|
||||
file://0002-am33xx-Enable-CONFIG_AM33XX_SMARTREFLEX.patch \
|
||||
"
|
||||
file://0002-am33xx-Enable-CONFIG_AM33XX_SMARTREFLEX.patch \
|
||||
file://0002-Smartreflex-limited-to-ES-1.0.patch \
|
||||
"
|
||||
|
||||
# Add a patch to the omap-serial driver to allow suspend/resume during
|
||||
# Bluetooth traffic
|
||||
@@ -73,8 +85,11 @@ PATCHES += "file://0001-am335xevm-using-edge-triggered-interrupts-for-WLAN.patch
|
||||
# Add patch to enable pullup on WLAN enable
|
||||
PATCHES += "file://0001-am335x-enable-pullup-on-the-WLAN-enable-pin-fo.patch"
|
||||
|
||||
# Update SPI flash layout. Increase space allocated for u-boot
|
||||
PATCHES += "file://0001-ARM-OMAP2-AM335x-Update-SPI-flash-layout.patch"
|
||||
|
||||
# Copy the am33x-cm3 firmware if it is available
|
||||
do_compile_prepend() {
|
||||
do_configure_append() {
|
||||
if [ -e "${STAGING_DIR_HOST}/${base_libdir}/firmware/am335x-pm-firmware.bin" ]
|
||||
then
|
||||
cp "${STAGING_DIR_HOST}/${base_libdir}/firmware/am335x-pm-firmware.bin" "${S}/firmware"
|
||||
+168
@@ -0,0 +1,168 @@
|
||||
From 9193aa814bde2b56aaae1949d42d8849cb60260e Mon Sep 17 00:00:00 2001
|
||||
From: "Mark A. Greer" <mgreer@animalcreek.com>
|
||||
Date: Tue, 11 Dec 2012 09:20:16 -0700
|
||||
Subject: [PATCH 01/10] ARM: AM33xx: hwmod: Convert SHA0 crypto device data to
|
||||
hwmod
|
||||
|
||||
Convert the device data for the AM33xx SHA0 crypto modules
|
||||
from explicit platform_data to hwmod.
|
||||
|
||||
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
|
||||
---
|
||||
arch/arm/mach-omap2/devices.c | 68 +++---------------------------
|
||||
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 32 ++++++++++++++
|
||||
2 files changed, 39 insertions(+), 61 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
|
||||
index c2e1d84..3679369 100644
|
||||
--- a/arch/arm/mach-omap2/devices.c
|
||||
+++ b/arch/arm/mach-omap2/devices.c
|
||||
@@ -726,72 +726,18 @@ static void omap_init_sham(void)
|
||||
}
|
||||
|
||||
#elif defined(CONFIG_CRYPTO_DEV_OMAP4_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP4_SHAM_MODULE)
|
||||
-
|
||||
-static struct resource omap4_sham_resources[] = {
|
||||
- {
|
||||
- .start = AM33XX_SHA1MD5_P_BASE,
|
||||
- .end = AM33XX_SHA1MD5_P_BASE + 0x120,
|
||||
- .flags = IORESOURCE_MEM,
|
||||
- },
|
||||
- {
|
||||
- .start = AM33XX_IRQ_SHAEIP57t0_P,
|
||||
- .flags = IORESOURCE_IRQ,
|
||||
- },
|
||||
- {
|
||||
- .start = AM33XX_DMA_SHAEIP57T0_DIN,
|
||||
- .flags = IORESOURCE_DMA,
|
||||
- }
|
||||
-};
|
||||
-
|
||||
-static int omap4_sham_resources_sz = ARRAY_SIZE(omap4_sham_resources);
|
||||
-
|
||||
-
|
||||
-static struct platform_device sham_device = {
|
||||
- .name = "omap4-sham",
|
||||
- .id = -1,
|
||||
-};
|
||||
-
|
||||
-#if 0
|
||||
-static void omap_init_sham(void)
|
||||
-{
|
||||
- sham_device.resource = omap4_sham_resources;
|
||||
- sham_device.num_resources = omap4_sham_resources_sz;
|
||||
-
|
||||
- platform_device_register(&sham_device);
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
-int __init omap_init_sham(void)
|
||||
+static void __init omap_init_sham(void)
|
||||
{
|
||||
- int id = -1;
|
||||
- struct platform_device *pdev;
|
||||
struct omap_hwmod *oh;
|
||||
- char *oh_name = "sha0";
|
||||
- char *name = "omap4-sham";
|
||||
-
|
||||
- oh = omap_hwmod_lookup(oh_name);
|
||||
- if (!oh) {
|
||||
- pr_err("Could not look up %s\n", oh_name);
|
||||
- return -ENODEV;
|
||||
- }
|
||||
-
|
||||
- pdev = omap_device_build(name, id, oh, NULL, 0, NULL, 0, 0);
|
||||
- //pdev.resource = omap4_sham_resources;
|
||||
- //pdev.num_resources = omap4_sham_resources_sz;
|
||||
+ struct platform_device *pdev;
|
||||
|
||||
- if (IS_ERR(pdev)) {
|
||||
- WARN(1, "Can't build omap_device for %s:%s.\n",
|
||||
- name, oh->name);
|
||||
- return PTR_ERR(pdev);
|
||||
- }
|
||||
+ oh = omap_hwmod_lookup("sha0");
|
||||
+ if (!oh)
|
||||
+ return;
|
||||
|
||||
- return 0;
|
||||
+ pdev = omap_device_build("omap4-sham", -1, oh, NULL, 0, NULL, 0, 0);
|
||||
+ WARN(IS_ERR(pdev), "Can't build omap_device for omap-sham\n");
|
||||
}
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
#else
|
||||
static inline void omap_init_sham(void) { }
|
||||
#endif
|
||||
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
|
||||
index ee3ebd9..ad606c6 100644
|
||||
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
|
||||
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
|
||||
@@ -79,6 +79,7 @@ static struct omap_hwmod am33xx_spi1_hwmod;
|
||||
static struct omap_hwmod am33xx_elm_hwmod;
|
||||
static struct omap_hwmod am33xx_adc_tsc_hwmod;
|
||||
static struct omap_hwmod am33xx_rtc_hwmod;
|
||||
+static struct omap_hwmod am33xx_sha0_hwmod;
|
||||
static struct omap_hwmod am33xx_mcasp0_hwmod;
|
||||
static struct omap_hwmod am33xx_mcasp1_hwmod;
|
||||
static struct omap_hwmod am33xx_ehrpwm0_hwmod;
|
||||
@@ -2167,8 +2168,16 @@ static struct omap_hwmod am33xx_rtc_hwmod = {
|
||||
};
|
||||
|
||||
/* sha0 */
|
||||
+static struct omap_hwmod_class_sysconfig am33xx_sha0_sysc = {
|
||||
+ .rev_offs = 0x100,
|
||||
+ .sysc_offs = 0x110,
|
||||
+ .syss_offs = 0x114,
|
||||
+ .sysc_flags = SYSS_HAS_RESET_STATUS,
|
||||
+};
|
||||
+
|
||||
static struct omap_hwmod_class am33xx_sha0_hwmod_class = {
|
||||
.name = "sha0",
|
||||
+ .sysc = &am33xx_sha0_sysc,
|
||||
};
|
||||
|
||||
static struct omap_hwmod_irq_info am33xx_sha0_irqs[] = {
|
||||
@@ -2181,6 +2190,27 @@ static struct omap_hwmod_dma_info am33xx_sha0_dma[] = {
|
||||
{ .dma_req = -1 }
|
||||
};
|
||||
|
||||
+struct omap_hwmod_addr_space am33xx_sha0_addr_space[] = {
|
||||
+ {
|
||||
+ .pa_start = 0x53100000,
|
||||
+ .pa_end = 0x53100000 + SZ_1M - 1,
|
||||
+ .flags = ADDR_TYPE_RT,
|
||||
+ },
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+struct omap_hwmod_ocp_if am33xx_l3_core__sha0 = {
|
||||
+ .master = &am33xx_l3_main_hwmod,
|
||||
+ .slave = &am33xx_sha0_hwmod,
|
||||
+ .clk = "sha0_fck",
|
||||
+ .addr = am33xx_sha0_addr_space,
|
||||
+ .user = OCP_USER_MPU,
|
||||
+};
|
||||
+
|
||||
+static struct omap_hwmod_ocp_if *am33xx_sha0_slaves[] = {
|
||||
+ &am33xx_l3_core__sha0,
|
||||
+};
|
||||
+
|
||||
static struct omap_hwmod am33xx_sha0_hwmod = {
|
||||
.name = "sha0",
|
||||
.class = &am33xx_sha0_hwmod_class,
|
||||
@@ -2194,6 +2224,8 @@ static struct omap_hwmod am33xx_sha0_hwmod = {
|
||||
.modulemode = MODULEMODE_SWCTRL,
|
||||
},
|
||||
},
|
||||
+ .slaves = am33xx_sha0_slaves,
|
||||
+ .slaves_cnt = ARRAY_SIZE(am33xx_sha0_slaves),
|
||||
};
|
||||
|
||||
/* 'smartreflex' class */
|
||||
--
|
||||
1.7.12
|
||||
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
From 54690cd10741ec54acc2555c3b699de310571a49 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Rini <trini@ti.com>
|
||||
Date: Fri, 7 Dec 2012 14:01:51 -0700
|
||||
Subject: [PATCH] ARM: OMAP2+: AM335x: Update SPI flash layout
|
||||
|
||||
Current U-Boot has grown, and our size of the environment was never
|
||||
correct, rework the offsets for minimal impact.
|
||||
|
||||
Signed-off-by: Tom Rini <trini@ti.com>
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
|
||||
index 50e1d9b..3357d88 100644
|
||||
--- a/arch/arm/mach-omap2/board-am335xevm.c
|
||||
+++ b/arch/arm/mach-omap2/board-am335xevm.c
|
||||
@@ -1201,17 +1201,17 @@ static struct mtd_partition am335x_spi_partitions[] = {
|
||||
{
|
||||
.name = "U-Boot",
|
||||
.offset = MTDPART_OFS_APPEND, /* Offset = 0x20000 */
|
||||
- .size = 2 * SZ_128K,
|
||||
+ .size = (3 * SZ_128K) - SZ_4K,
|
||||
},
|
||||
{
|
||||
.name = "U-Boot Env",
|
||||
- .offset = MTDPART_OFS_APPEND, /* Offset = 0x60000 */
|
||||
- .size = 2 * SZ_4K,
|
||||
+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x7F000 */
|
||||
+ .size = SZ_4K,
|
||||
},
|
||||
{
|
||||
.name = "Kernel",
|
||||
- .offset = MTDPART_OFS_APPEND, /* Offset = 0x62000 */
|
||||
- .size = 28 * SZ_128K,
|
||||
+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */
|
||||
+ .size = 866 * SZ_4K, /* size = 0x362000 */
|
||||
},
|
||||
{
|
||||
.name = "File System",
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
+19
-17
@@ -1,31 +1,32 @@
|
||||
From 1edc97015f69fac420c32df514e1d1d546041d42 Mon Sep 17 00:00:00 2001
|
||||
From cf67829e0c0cccb06a9f33d40fe43a122e8a5178 Mon Sep 17 00:00:00 2001
|
||||
From: Greg Turner <gregturner@ti.com>
|
||||
Date: Fri, 8 Jun 2012 13:54:13 -0500
|
||||
Subject: [PATCH] [am335x]: Add crypto driver settings to defconfig
|
||||
Subject: [PATCH] Add crypto driver settings to defconfig
|
||||
|
||||
* Add Crypto Driver and configuration to defconfig
|
||||
---
|
||||
arch/arm/configs/am335x_evm_defconfig | 39 +++++++++++++++++++++++---------
|
||||
1 files changed, 28 insertions(+), 11 deletions(-)
|
||||
arch/arm/configs/am335x_evm_defconfig | 40 +++++++++++++++++++++++----------
|
||||
1 files changed, 28 insertions(+), 12 deletions(-)
|
||||
mode change 100644 => 100755 arch/arm/configs/am335x_evm_defconfig
|
||||
|
||||
diff --git a/arch/arm/configs/am335x_evm_defconfig b/arch/arm/configs/am335x_evm_defconfig
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index de1eaad..0bf7efd
|
||||
index 9f45503..46528c4
|
||||
--- a/arch/arm/configs/am335x_evm_defconfig
|
||||
+++ b/arch/arm/configs/am335x_evm_defconfig
|
||||
@@ -1277,6 +1277,9 @@ CONFIG_SERIAL_OMAP_CONSOLE=y
|
||||
@@ -1278,7 +1278,9 @@ CONFIG_SERIAL_OMAP_CONSOLE=y
|
||||
# CONFIG_SERIAL_XILINX_PS_UART is not set
|
||||
# CONFIG_HVC_DCC is not set
|
||||
# CONFIG_IPMI_HANDLER is not set
|
||||
-# CONFIG_HW_RANDOM is not set
|
||||
+CONFIG_HW_RANDOM=y
|
||||
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
|
||||
+CONFIG_HW_RANDOM_OMAP4=y
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
# CONFIG_R3964 is not set
|
||||
# CONFIG_RAW_DRIVER is not set
|
||||
@@ -2472,36 +2475,38 @@ CONFIG_CRYPTO=y
|
||||
# CONFIG_TCG_TPM is not set
|
||||
@@ -2473,36 +2475,38 @@ CONFIG_CRYPTO=y
|
||||
#
|
||||
CONFIG_CRYPTO_ALGAPI=y
|
||||
CONFIG_CRYPTO_ALGAPI2=y
|
||||
@@ -50,7 +51,7 @@ index de1eaad..0bf7efd
|
||||
# CONFIG_CRYPTO_AUTHENC is not set
|
||||
-# CONFIG_CRYPTO_TEST is not set
|
||||
+CONFIG_CRYPTO_TEST=m
|
||||
|
||||
|
||||
#
|
||||
# Authenticated Encryption with Associated Data
|
||||
#
|
||||
@@ -58,7 +59,7 @@ index de1eaad..0bf7efd
|
||||
# CONFIG_CRYPTO_GCM is not set
|
||||
-# CONFIG_CRYPTO_SEQIV is not set
|
||||
+CONFIG_CRYPTO_SEQIV=y
|
||||
|
||||
|
||||
#
|
||||
# Block modes
|
||||
#
|
||||
@@ -69,7 +70,7 @@ index de1eaad..0bf7efd
|
||||
# CONFIG_CRYPTO_CTS is not set
|
||||
CONFIG_CRYPTO_ECB=y
|
||||
# CONFIG_CRYPTO_LRW is not set
|
||||
@@ -2511,7 +2516,7 @@ CONFIG_CRYPTO_ECB=y
|
||||
@@ -2512,7 +2516,7 @@ CONFIG_CRYPTO_ECB=y
|
||||
#
|
||||
# Hash modes
|
||||
#
|
||||
@@ -77,8 +78,8 @@ index de1eaad..0bf7efd
|
||||
+CONFIG_CRYPTO_HMAC=y
|
||||
# CONFIG_CRYPTO_XCBC is not set
|
||||
# CONFIG_CRYPTO_VMAC is not set
|
||||
|
||||
@@ -2521,14 +2526,14 @@ CONFIG_CRYPTO_ECB=y
|
||||
|
||||
@@ -2522,14 +2526,14 @@ CONFIG_CRYPTO_ECB=y
|
||||
CONFIG_CRYPTO_CRC32C=y
|
||||
# CONFIG_CRYPTO_GHASH is not set
|
||||
# CONFIG_CRYPTO_MD4 is not set
|
||||
@@ -96,7 +97,7 @@ index de1eaad..0bf7efd
|
||||
# CONFIG_CRYPTO_SHA512 is not set
|
||||
# CONFIG_CRYPTO_TGR192 is not set
|
||||
# CONFIG_CRYPTO_WP512 is not set
|
||||
@@ -2543,7 +2548,7 @@ CONFIG_CRYPTO_ARC4=y
|
||||
@@ -2544,7 +2548,7 @@ CONFIG_CRYPTO_ARC4=y
|
||||
# CONFIG_CRYPTO_CAMELLIA is not set
|
||||
# CONFIG_CRYPTO_CAST5 is not set
|
||||
# CONFIG_CRYPTO_CAST6 is not set
|
||||
@@ -105,7 +106,7 @@ index de1eaad..0bf7efd
|
||||
# CONFIG_CRYPTO_FCRYPT is not set
|
||||
# CONFIG_CRYPTO_KHAZAD is not set
|
||||
# CONFIG_CRYPTO_SALSA20 is not set
|
||||
@@ -2565,7 +2570,19 @@ CONFIG_CRYPTO_LZO=y
|
||||
@@ -2566,7 +2570,19 @@ CONFIG_CRYPTO_LZO=y
|
||||
# CONFIG_CRYPTO_ANSI_CPRNG is not set
|
||||
# CONFIG_CRYPTO_USER_API_HASH is not set
|
||||
# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
|
||||
@@ -124,7 +125,8 @@ index de1eaad..0bf7efd
|
||||
+# CONFIG_OCF_OCFNULL is not set
|
||||
+# CONFIG_OCF_BENCH is not set
|
||||
# CONFIG_BINARY_PRINTF is not set
|
||||
|
||||
|
||||
#
|
||||
--
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
From 13d5d52eda239b752b249b0f1b3b01b93a890b55 Mon Sep 17 00:00:00 2001
|
||||
From: Joel A Fernandes <joelagnel@ti.com>
|
||||
Date: Wed, 13 Feb 2013 15:37:15 -0600
|
||||
Subject: [PATCH] omap4-rng: Remove check for GP-only device type in RNG driver
|
||||
|
||||
HS devices can support RNG due to recent changes in firewall settings on L4.
|
||||
The patch enables RNG support on HS device.
|
||||
|
||||
Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
|
||||
---
|
||||
drivers/char/hw_random/omap4-rng.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/char/hw_random/omap4-rng.c b/drivers/char/hw_random/omap4-rng.c
|
||||
index 523ec63..9c3b87a 100644
|
||||
--- a/drivers/char/hw_random/omap4-rng.c
|
||||
+++ b/drivers/char/hw_random/omap4-rng.c
|
||||
@@ -285,7 +285,7 @@ static struct platform_driver omap4_rng_driver = {
|
||||
|
||||
static int __init omap4_rng_init(void)
|
||||
{
|
||||
- if (!cpu_is_am33xx() || omap_type() != OMAP2_DEVICE_TYPE_GP)
|
||||
+ if (!cpu_is_am33xx())
|
||||
return -ENODEV;
|
||||
|
||||
return platform_driver_register(&omap4_rng_driver);
|
||||
--
|
||||
1.7.4.1
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From 24051291ecae9c42697bd3217240205e17e95de3 Mon Sep 17 00:00:00 2001
|
||||
From: Greg Guyotte <gguyotte@ti.com>
|
||||
Date: Tue, 11 Dec 2012 21:53:24 -0600
|
||||
Subject: [PATCH 2/2] Smartreflex limited to ES 1.0
|
||||
|
||||
Pending complete characterization of Smartreflex on ES 2.0 silicon,
|
||||
the smartreflex function is disabled. SR continues to operate
|
||||
normally on ES 1.0 silicon. If running on AM335x ES 2.0 silicon,
|
||||
the SR driver will cleanly abort, causing no side effects.
|
||||
|
||||
Signed-off-by: Greg Guyotte <gguyotte@ti.com>
|
||||
---
|
||||
arch/arm/mach-omap2/am33xx-smartreflex-class2.c | 6 ++++++
|
||||
1 files changed, 6 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/am33xx-smartreflex-class2.c b/arch/arm/mach-omap2/am33xx-smartreflex-class2.c
|
||||
index 3ed74b3..6a66e68 100644
|
||||
--- a/arch/arm/mach-omap2/am33xx-smartreflex-class2.c
|
||||
+++ b/arch/arm/mach-omap2/am33xx-smartreflex-class2.c
|
||||
@@ -763,6 +763,12 @@ static int __init am33xx_sr_probe(struct platform_device *pdev)
|
||||
int ret;
|
||||
int i,j;
|
||||
|
||||
+ if (omap_rev() != AM335X_REV_ES1_0) {
|
||||
+ dev_err(&pdev->dev, "%s: Smartreflex requires ES 1.0\n",
|
||||
+ __func__);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
sr_info = kzalloc(sizeof(struct am33xx_sr), GFP_KERNEL);
|
||||
if (!sr_info) {
|
||||
dev_err(&pdev->dev, "%s: unable to allocate sr_info\n",
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
+98
@@ -0,0 +1,98 @@
|
||||
From 0c910915e0b14538e4a539a26a1c632d29ed7131 Mon Sep 17 00:00:00 2001
|
||||
From: "Mark A. Greer" <mgreer@animalcreek.com>
|
||||
Date: Tue, 11 Dec 2012 09:40:05 -0700
|
||||
Subject: [PATCH 02/10] crypto: omap4-sham: Use finer-grained PM management
|
||||
|
||||
Currently, the pm_runtime calls in omap4-sham enable
|
||||
things when the driver is probed and leave them enabled
|
||||
until the driver is removed. To fix this, move the
|
||||
pm_runtime calls to only enable the sham module when
|
||||
its actually in use.
|
||||
|
||||
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
|
||||
---
|
||||
drivers/crypto/omap4-sham.c | 23 ++++++++---------------
|
||||
1 file changed, 8 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/drivers/crypto/omap4-sham.c b/drivers/crypto/omap4-sham.c
|
||||
index 2fb71b9..6985c87 100644
|
||||
--- a/drivers/crypto/omap4-sham.c
|
||||
+++ b/drivers/crypto/omap4-sham.c
|
||||
@@ -138,7 +138,6 @@ struct omap4_sham_dev {
|
||||
struct device *dev;
|
||||
void __iomem *io_base;
|
||||
int irq;
|
||||
- struct clk *iclk;
|
||||
spinlock_t lock;
|
||||
int err;
|
||||
int dma;
|
||||
@@ -701,6 +700,8 @@ static void omap4_sham_finish_req(struct ahash_request *req, int err)
|
||||
dd->dflags &= ~(BIT(FLAGS_BUSY) | BIT(FLAGS_FINAL) | BIT(FLAGS_CPU) |
|
||||
BIT(FLAGS_DMA_READY) | BIT(FLAGS_OUTPUT_READY));
|
||||
|
||||
+ pm_runtime_put_sync(dd->dev);
|
||||
+
|
||||
if (req->base.complete)
|
||||
req->base.complete(&req->base, err);
|
||||
|
||||
@@ -742,6 +743,8 @@ static int omap4_sham_handle_queue(struct omap4_sham_dev *dd,
|
||||
dev_dbg(dd->dev, "handling new req, op: %lu, nbytes: %d\n",
|
||||
ctx->op, req->nbytes);
|
||||
|
||||
+ pm_runtime_get_sync(dd->dev);
|
||||
+
|
||||
if (!test_bit(FLAGS_INIT, &dd->dflags)) {
|
||||
set_bit(FLAGS_INIT, &dd->dflags);
|
||||
dd->err = 0;
|
||||
@@ -1306,11 +1309,6 @@ static int __devinit omap4_sham_probe(struct platform_device *pdev)
|
||||
if (err)
|
||||
goto dma_err;
|
||||
|
||||
- pm_runtime_enable(dev);
|
||||
- udelay(1);
|
||||
- pm_runtime_get_sync(dev);
|
||||
- udelay(1);
|
||||
-
|
||||
dd->io_base = ioremap(dd->phys_base, SZ_4K);
|
||||
if (!dd->io_base) {
|
||||
dev_err(dev, "can't ioremap\n");
|
||||
@@ -1318,7 +1316,11 @@ static int __devinit omap4_sham_probe(struct platform_device *pdev)
|
||||
goto io_err;
|
||||
}
|
||||
|
||||
+
|
||||
+ pm_runtime_enable(dev);
|
||||
+ pm_runtime_get_sync(dev);
|
||||
reg = omap4_sham_read(dd, SHA_REG_REV);
|
||||
+ pm_runtime_put_sync(&pdev->dev);
|
||||
|
||||
dev_info(dev, "AM33X SHA/MD5 hw accel rev: %u.%02u\n",
|
||||
(reg & SHA_REG_REV_X_MAJOR_MASK) >> 8, reg & SHA_REG_REV_Y_MINOR_MASK);
|
||||
@@ -1342,13 +1344,7 @@ err_algs:
|
||||
crypto_unregister_ahash(&algs[j]);
|
||||
iounmap(dd->io_base);
|
||||
io_err:
|
||||
- pm_runtime_put_sync(dev);
|
||||
- udelay(1);
|
||||
pm_runtime_disable(dev);
|
||||
- udelay(1);
|
||||
-
|
||||
-//clk_err:
|
||||
-// omap4_sham_dma_cleanup(dd);
|
||||
|
||||
dma_err:
|
||||
if (dd->irq >= 0)
|
||||
@@ -1377,10 +1373,7 @@ static int __devexit omap4_sham_remove(struct platform_device *pdev)
|
||||
crypto_unregister_ahash(&algs[i]);
|
||||
tasklet_kill(&dd->done_task);
|
||||
iounmap(dd->io_base);
|
||||
- pm_runtime_put_sync(&pdev->dev);
|
||||
- udelay(1);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
- udelay(1);
|
||||
|
||||
omap4_sham_dma_cleanup(dd);
|
||||
if (dd->irq >= 0)
|
||||
--
|
||||
1.7.12
|
||||
|
||||
+56
@@ -0,0 +1,56 @@
|
||||
From b0a47b49a61db95fdb2340548b967bdfe085df2d Mon Sep 17 00:00:00 2001
|
||||
From: "Mark A. Greer" <mgreer@animalcreek.com>
|
||||
Date: Wed, 12 Dec 2012 00:43:45 -0700
|
||||
Subject: [PATCH 03/10] crypto: omap4-sham: Add suspend/resume PM support
|
||||
|
||||
Add suspend/resume PM support to the omap4-sham driver
|
||||
|
||||
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
|
||||
---
|
||||
drivers/crypto/omap4-sham.c | 13 ++++---------
|
||||
1 file changed, 4 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/drivers/crypto/omap4-sham.c b/drivers/crypto/omap4-sham.c
|
||||
index 6985c87..963d0e1 100644
|
||||
--- a/drivers/crypto/omap4-sham.c
|
||||
+++ b/drivers/crypto/omap4-sham.c
|
||||
@@ -1386,24 +1386,19 @@ static int __devexit omap4_sham_remove(struct platform_device *pdev)
|
||||
|
||||
static int omap4_sham_suspend(struct device *dev)
|
||||
{
|
||||
- pr_debug("#### Crypto: Suspend call ####\n");
|
||||
-
|
||||
+ pm_runtime_put_sync(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int omap4_sham_resume(struct device *dev)
|
||||
{
|
||||
- pr_debug("#### Crypto: resume call ####\n");
|
||||
-
|
||||
+ pm_runtime_get_sync(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct dev_pm_ops omap4_sham_dev_pm_ops = {
|
||||
- .suspend = omap4_sham_suspend,
|
||||
- .resume = omap4_sham_resume,
|
||||
- .runtime_suspend = omap4_sham_suspend,
|
||||
- .runtime_resume = omap4_sham_resume,
|
||||
+ SET_SYSTEM_SLEEP_PM_OPS(omap4_sham_suspend, omap4_sham_resume)
|
||||
};
|
||||
|
||||
static struct platform_driver omap4_sham_driver = {
|
||||
@@ -1412,7 +1407,7 @@ static struct platform_driver omap4_sham_driver = {
|
||||
.driver = {
|
||||
.name = "omap4-sham",
|
||||
.owner = THIS_MODULE,
|
||||
- .pm = &omap4_sham_dev_pm_ops
|
||||
+ .pm = &omap4_sham_dev_pm_ops
|
||||
},
|
||||
};
|
||||
|
||||
--
|
||||
1.7.12
|
||||
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
From 08ea4b77652956c07b91b4de670ebc44f1395840 Mon Sep 17 00:00:00 2001
|
||||
From: "Mark A. Greer" <mgreer@animalcreek.com>
|
||||
Date: Tue, 11 Dec 2012 20:33:15 -0700
|
||||
Subject: [PATCH 04/10] crypto: omap4-sham: Don't use hardcoded base address
|
||||
|
||||
The omap4-sham driver currently uses a hardcoded base
|
||||
address for its register set instead of the address
|
||||
passed in by the system. Instead, use the address
|
||||
passed in by the system.
|
||||
|
||||
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
|
||||
---
|
||||
drivers/crypto/omap4-sham.c | 16 +++++++---------
|
||||
1 file changed, 7 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/drivers/crypto/omap4-sham.c b/drivers/crypto/omap4-sham.c
|
||||
index 963d0e1..b2fc03a 100644
|
||||
--- a/drivers/crypto/omap4-sham.c
|
||||
+++ b/drivers/crypto/omap4-sham.c
|
||||
@@ -1271,15 +1271,13 @@ static int __devinit omap4_sham_probe(struct platform_device *pdev)
|
||||
dd->irq = -1;
|
||||
|
||||
/* Get the base address */
|
||||
- //res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
- //if (!res) {
|
||||
- // dev_err(dev, "no MEM resource info\n");
|
||||
- // err = -ENODEV;
|
||||
- // goto res_err;
|
||||
- //}
|
||||
-
|
||||
- //dd->phys_base = res->start;
|
||||
- dd->phys_base = AM33XX_SHA1MD5_P_BASE;
|
||||
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
+ if (!res) {
|
||||
+ dev_err(dev, "no MEM resource info\n");
|
||||
+ err = -ENODEV;
|
||||
+ goto res_err;
|
||||
+ }
|
||||
+ dd->phys_base = res->start;
|
||||
|
||||
/* Get the DMA */
|
||||
res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
|
||||
--
|
||||
1.7.12
|
||||
|
||||
+165
@@ -0,0 +1,165 @@
|
||||
From ff9e06c41de00f281dd21ed66e8477d933ce69dd Mon Sep 17 00:00:00 2001
|
||||
From: "Mark A. Greer" <mgreer@animalcreek.com>
|
||||
Date: Tue, 11 Dec 2012 20:46:49 -0700
|
||||
Subject: [PATCH 05/10] ARM: AM33xx: hwmod: Convert AES0 crypto device data to
|
||||
hwmod
|
||||
|
||||
Convert the device data for the AM33xx AES0 crypto modules
|
||||
from explicit platform_data to hwmod.
|
||||
|
||||
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
|
||||
---
|
||||
arch/arm/mach-omap2/devices.c | 65 ++++--------------------------
|
||||
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 32 +++++++++++++++
|
||||
2 files changed, 39 insertions(+), 58 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
|
||||
index 3679369..e4caa06 100644
|
||||
--- a/arch/arm/mach-omap2/devices.c
|
||||
+++ b/arch/arm/mach-omap2/devices.c
|
||||
@@ -809,69 +809,18 @@ static void omap_init_aes(void)
|
||||
}
|
||||
|
||||
#elif defined(CONFIG_CRYPTO_DEV_OMAP4_AES) || defined(CONFIG_CRYPTO_DEV_OMAP4_AES_MODULE)
|
||||
-
|
||||
-static struct resource omap4_aes_resources[] = {
|
||||
- {
|
||||
- .start = AM33XX_AES0_P_BASE,
|
||||
- .end = AM33XX_AES0_P_BASE + 0x4C,
|
||||
- .flags = IORESOURCE_MEM,
|
||||
- },
|
||||
- {
|
||||
- .start = AM33XX_DMA_AESEIP36T0_DOUT,
|
||||
- .flags = IORESOURCE_DMA,
|
||||
- },
|
||||
- {
|
||||
- .start = AM33XX_DMA_AESEIP36T0_DIN,
|
||||
- .flags = IORESOURCE_DMA,
|
||||
- }
|
||||
-};
|
||||
-static int omap4_aes_resources_sz = ARRAY_SIZE(omap4_aes_resources);
|
||||
-
|
||||
-static struct platform_device aes_device = {
|
||||
- .name = "omap4-aes",
|
||||
- .id = -1,
|
||||
-};
|
||||
-
|
||||
-#if 0
|
||||
-static void omap_init_aes(void)
|
||||
+static void __init omap_init_aes(void)
|
||||
{
|
||||
- aes_device.resource = omap4_aes_resources;
|
||||
- aes_device.num_resources = omap4_aes_resources_sz;
|
||||
- platform_device_register(&aes_device);
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
-int __init omap_init_aes(void)
|
||||
-{
|
||||
- int id = -1;
|
||||
- struct platform_device *pdev;
|
||||
struct omap_hwmod *oh;
|
||||
- char *oh_name = "aes0";
|
||||
- char *name = "omap4-aes";
|
||||
-
|
||||
- oh = omap_hwmod_lookup(oh_name);
|
||||
- if (!oh) {
|
||||
- pr_err("Could not look up %s\n", oh_name);
|
||||
- return -ENODEV;
|
||||
- }
|
||||
-
|
||||
- pdev = omap_device_build(name, id, oh, NULL, 0, NULL, 0, 0);
|
||||
- //pdev.resource = omap4_sham_resources;
|
||||
- //pdev.num_resources = omap4_sham_resources_sz;
|
||||
+ struct platform_device *pdev;
|
||||
|
||||
- if (IS_ERR(pdev)) {
|
||||
- WARN(1, "Can't build omap_device for %s:%s.\n",
|
||||
- name, oh->name);
|
||||
- return PTR_ERR(pdev);
|
||||
- }
|
||||
+ oh = omap_hwmod_lookup("aes0");
|
||||
+ if (!oh)
|
||||
+ return;
|
||||
|
||||
- return 0;
|
||||
+ pdev = omap_device_build("omap4-aes", -1, oh, NULL, 0, NULL, 0, 0);
|
||||
+ WARN(IS_ERR(pdev), "Can't build omap_device for omap-aes\n");
|
||||
}
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
#else
|
||||
static inline void omap_init_aes(void) { }
|
||||
#endif
|
||||
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
|
||||
index ad606c6..90e25d7 100644
|
||||
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
|
||||
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
|
||||
@@ -78,6 +78,7 @@ static struct omap_hwmod am33xx_spi0_hwmod;
|
||||
static struct omap_hwmod am33xx_spi1_hwmod;
|
||||
static struct omap_hwmod am33xx_elm_hwmod;
|
||||
static struct omap_hwmod am33xx_adc_tsc_hwmod;
|
||||
+static struct omap_hwmod am33xx_aes0_hwmod;
|
||||
static struct omap_hwmod am33xx_rtc_hwmod;
|
||||
static struct omap_hwmod am33xx_sha0_hwmod;
|
||||
static struct omap_hwmod am33xx_mcasp0_hwmod;
|
||||
@@ -427,8 +428,16 @@ static struct omap_hwmod am33xx_adc_tsc_hwmod = {
|
||||
};
|
||||
|
||||
/* 'aes' class */
|
||||
+static struct omap_hwmod_class_sysconfig am33xx_aes_sysc = {
|
||||
+ .rev_offs = 0x80,
|
||||
+ .sysc_offs = 0x84,
|
||||
+ .syss_offs = 0x88,
|
||||
+ .sysc_flags = SYSS_HAS_RESET_STATUS,
|
||||
+};
|
||||
+
|
||||
static struct omap_hwmod_class am33xx_aes_hwmod_class = {
|
||||
.name = "aes",
|
||||
+ .sysc = &am33xx_aes_sysc,
|
||||
};
|
||||
|
||||
/* aes0 */
|
||||
@@ -443,6 +452,27 @@ static struct omap_hwmod_dma_info am33xx_aes0_dma[] = {
|
||||
{ .dma_req = -1 }
|
||||
};
|
||||
|
||||
+static struct omap_hwmod_addr_space am33xx_aes0_addrs[] = {
|
||||
+ {
|
||||
+ .pa_start = 0x53500000,
|
||||
+ .pa_end = 0x53500000 + SZ_1M - 1,
|
||||
+ .flags = ADDR_TYPE_RT
|
||||
+ },
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+static struct omap_hwmod_ocp_if am33xx_l3_main__aes0 = {
|
||||
+ .master = &am33xx_l3_main_hwmod,
|
||||
+ .slave = &am33xx_aes0_hwmod,
|
||||
+ .clk = "aes0_fck",
|
||||
+ .addr = am33xx_aes0_addrs,
|
||||
+ .user = OCP_USER_MPU | OCP_USER_SDMA,
|
||||
+};
|
||||
+
|
||||
+static struct omap_hwmod_ocp_if *am33xx_aes0_slaves[] = {
|
||||
+ &am33xx_l3_main__aes0,
|
||||
+};
|
||||
+
|
||||
static struct omap_hwmod am33xx_aes0_hwmod = {
|
||||
.name = "aes0",
|
||||
.class = &am33xx_aes_hwmod_class,
|
||||
@@ -456,6 +486,8 @@ static struct omap_hwmod am33xx_aes0_hwmod = {
|
||||
.modulemode = MODULEMODE_SWCTRL,
|
||||
},
|
||||
},
|
||||
+ .slaves = am33xx_aes0_slaves,
|
||||
+ .slaves_cnt = ARRAY_SIZE(am33xx_aes0_slaves),
|
||||
};
|
||||
|
||||
/* cefuse */
|
||||
--
|
||||
1.7.12
|
||||
|
||||
+127
@@ -0,0 +1,127 @@
|
||||
From 5f56e1d486aaef9bcfaa57129c493a95185043fd Mon Sep 17 00:00:00 2001
|
||||
From: "Mark A. Greer" <mgreer@animalcreek.com>
|
||||
Date: Tue, 11 Dec 2012 21:00:13 -0700
|
||||
Subject: [PATCH 06/10] crypto: omap4-aes: User finer-grained PM management
|
||||
|
||||
Currently, the pm_runtime calls in omap4-aes enable
|
||||
things when the driver is probed and leave them enabled
|
||||
until the driver is removed. To fix this, move the
|
||||
pm_runtime calls to only enable the aes module when
|
||||
its actually in use.
|
||||
|
||||
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
|
||||
---
|
||||
drivers/crypto/omap4-aes.c | 39 ++++++++++++++++-----------------------
|
||||
1 file changed, 16 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/drivers/crypto/omap4-aes.c b/drivers/crypto/omap4-aes.c
|
||||
index dec2de4..a957709 100644
|
||||
--- a/drivers/crypto/omap4-aes.c
|
||||
+++ b/drivers/crypto/omap4-aes.c
|
||||
@@ -80,7 +80,6 @@ struct omap4_aes_dev {
|
||||
struct list_head list;
|
||||
unsigned long phys_base;
|
||||
void __iomem *io_base;
|
||||
- struct clk *iclk;
|
||||
struct omap4_aes_ctx *ctx;
|
||||
struct device *dev;
|
||||
unsigned long flags;
|
||||
@@ -146,7 +145,7 @@ static void omap4_aes_write_n(struct omap4_aes_dev *dd, u32 offset,
|
||||
|
||||
static int omap4_aes_hw_init(struct omap4_aes_dev *dd)
|
||||
{
|
||||
- omap4_aes_write(dd, AES_REG_SYSCFG, 0);
|
||||
+ pm_runtime_get_sync(dd->dev);
|
||||
|
||||
if (!(dd->flags & FLAGS_INIT)) {
|
||||
dd->flags |= FLAGS_INIT;
|
||||
@@ -489,11 +488,17 @@ static void omap4_aes_finish_req(struct omap4_aes_dev *dd, int err)
|
||||
|
||||
pr_debug("err: %d\n", err);
|
||||
|
||||
+ pm_runtime_put_sync(dd->dev);
|
||||
dd->flags &= ~FLAGS_BUSY;
|
||||
|
||||
req->base.complete(&req->base, err);
|
||||
}
|
||||
|
||||
+static void omap4_aes_dma_stop(struct omap4_aes_dev *dd)
|
||||
+{
|
||||
+ omap4_aes_write_mask(dd, AES_REG_SYSCFG, 0, AES_REG_SYSCFG_DREQ_MASK);
|
||||
+}
|
||||
+
|
||||
static int omap4_aes_crypt_dma_stop(struct omap4_aes_dev *dd)
|
||||
{
|
||||
int err = 0;
|
||||
@@ -501,7 +506,7 @@ static int omap4_aes_crypt_dma_stop(struct omap4_aes_dev *dd)
|
||||
|
||||
pr_debug("total: %d\n", dd->total);
|
||||
|
||||
- omap4_aes_write_mask(dd, AES_REG_SYSCFG, 0, AES_REG_SYSCFG_DREQ_MASK);
|
||||
+ omap4_aes_dma_stop(dd);
|
||||
|
||||
edma_stop(dd->dma_lch_in);
|
||||
edma_clean_channel(dd->dma_lch_in);
|
||||
@@ -819,21 +824,22 @@ static int omap4_aes_probe(struct platform_device *pdev)
|
||||
else
|
||||
dd->dma_in = res->start;
|
||||
|
||||
- pm_runtime_enable(dev);
|
||||
- udelay(1);
|
||||
- pm_runtime_get_sync(dev);
|
||||
- udelay(1);
|
||||
-
|
||||
dd->io_base = ioremap(dd->phys_base, SZ_4K);
|
||||
if (!dd->io_base) {
|
||||
dev_err(dev, "can't ioremap\n");
|
||||
err = -ENOMEM;
|
||||
- goto err_io;
|
||||
+ goto err_data;
|
||||
}
|
||||
|
||||
- omap4_aes_hw_init(dd);
|
||||
+ pm_runtime_enable(dev);
|
||||
+ pm_runtime_get_sync(dev);
|
||||
+
|
||||
+ omap4_aes_dma_stop(dd);
|
||||
+
|
||||
reg = omap4_aes_read(dd, AES_REG_REV);
|
||||
|
||||
+ pm_runtime_put_sync(dev);
|
||||
+
|
||||
dev_info(dev, "AM33X AES hw accel rev: %u.%02u\n",
|
||||
((reg & AES_REG_REV_X_MAJOR_MASK) >> 8),
|
||||
(reg & AES_REG_REV_Y_MINOR_MASK));
|
||||
@@ -870,17 +876,8 @@ err_dma:
|
||||
tasklet_kill(&dd->done_task);
|
||||
tasklet_kill(&dd->queue_task);
|
||||
iounmap(dd->io_base);
|
||||
-
|
||||
-err_io:
|
||||
- pm_runtime_put_sync(dev);
|
||||
- udelay(1);
|
||||
pm_runtime_disable(dev);
|
||||
- udelay(1);
|
||||
|
||||
-
|
||||
-//err_res:
|
||||
- //kfree(dd);
|
||||
- //dd = NULL;
|
||||
err_data:
|
||||
dev_err(dev, "initialization failed.\n");
|
||||
return err;
|
||||
@@ -905,11 +902,7 @@ static int omap4_aes_remove(struct platform_device *pdev)
|
||||
tasklet_kill(&dd->queue_task);
|
||||
omap4_aes_dma_cleanup(dd);
|
||||
iounmap(dd->io_base);
|
||||
- pm_runtime_put_sync(&pdev->dev);
|
||||
- udelay(1);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
- udelay(1);
|
||||
-
|
||||
kfree(dd);
|
||||
dd = NULL;
|
||||
|
||||
--
|
||||
1.7.12
|
||||
|
||||
+56
@@ -0,0 +1,56 @@
|
||||
From 90b8eaec8de51fab15872f8737a5148b99f80282 Mon Sep 17 00:00:00 2001
|
||||
From: "Mark A. Greer" <mgreer@animalcreek.com>
|
||||
Date: Wed, 12 Dec 2012 00:46:52 -0700
|
||||
Subject: [PATCH 07/10] crypto: omap4-aes: Add suspend/resume PM support
|
||||
|
||||
Add suspend/resume PM support to the omap4-aes driver
|
||||
|
||||
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
|
||||
---
|
||||
drivers/crypto/omap4-aes.c | 13 ++++---------
|
||||
1 file changed, 4 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/drivers/crypto/omap4-aes.c b/drivers/crypto/omap4-aes.c
|
||||
index a957709..941b8a1 100644
|
||||
--- a/drivers/crypto/omap4-aes.c
|
||||
+++ b/drivers/crypto/omap4-aes.c
|
||||
@@ -911,24 +911,19 @@ static int omap4_aes_remove(struct platform_device *pdev)
|
||||
|
||||
static int omap4_aes_suspend(struct device *dev)
|
||||
{
|
||||
- pr_debug("#### Crypto: Suspend call ####\n");
|
||||
-
|
||||
+ pm_runtime_put_sync(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int omap4_aes_resume(struct device *dev)
|
||||
{
|
||||
- pr_debug("#### Crypto: resume call ####\n");
|
||||
-
|
||||
+ pm_runtime_get_sync(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct dev_pm_ops omap4_aes_dev_pm_ops = {
|
||||
- .suspend = omap4_aes_suspend,
|
||||
- .resume = omap4_aes_resume,
|
||||
- .runtime_suspend = omap4_aes_suspend,
|
||||
- .runtime_resume = omap4_aes_resume,
|
||||
+ SET_SYSTEM_SLEEP_PM_OPS(omap4_aes_suspend, omap4_aes_resume)
|
||||
};
|
||||
|
||||
static struct platform_driver omap4_aes_driver = {
|
||||
@@ -937,7 +932,7 @@ static struct platform_driver omap4_aes_driver = {
|
||||
.driver = {
|
||||
.name = "omap4-aes",
|
||||
.owner = THIS_MODULE,
|
||||
- .pm = &omap4_aes_dev_pm_ops
|
||||
+ .pm = &omap4_aes_dev_pm_ops
|
||||
},
|
||||
};
|
||||
|
||||
--
|
||||
1.7.12
|
||||
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
From 8084600ca78354fad147593256b9e32ef5d15148 Mon Sep 17 00:00:00 2001
|
||||
From: "Mark A. Greer" <mgreer@animalcreek.com>
|
||||
Date: Tue, 11 Dec 2012 21:09:58 -0700
|
||||
Subject: [PATCH 08/10] crypto: omap4-aes: Don't use hardcoded base address
|
||||
|
||||
The omap4-aes driver currently uses a hardcoded base
|
||||
address for its register set instead of the address
|
||||
passed in by the system. Instead, use the address
|
||||
passed in by the system.
|
||||
|
||||
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
|
||||
---
|
||||
drivers/crypto/omap4-aes.c | 16 +++++++---------
|
||||
1 file changed, 7 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/drivers/crypto/omap4-aes.c b/drivers/crypto/omap4-aes.c
|
||||
index 941b8a1..984a15e 100644
|
||||
--- a/drivers/crypto/omap4-aes.c
|
||||
+++ b/drivers/crypto/omap4-aes.c
|
||||
@@ -800,15 +800,13 @@ static int omap4_aes_probe(struct platform_device *pdev)
|
||||
crypto_init_queue(&dd->queue, AM33X_AES_QUEUE_LENGTH);
|
||||
|
||||
/* Get the base address */
|
||||
- //res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
- //if (!res) {
|
||||
- // dev_err(dev, "invalid resource type\n");
|
||||
- // err = -ENODEV;
|
||||
- // goto err_res;
|
||||
- //}
|
||||
-
|
||||
- //dd->phys_base = res->start;
|
||||
- dd->phys_base = AM33XX_AES0_P_BASE;
|
||||
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
+ if (!res) {
|
||||
+ dev_err(dev, "invalid resource type\n");
|
||||
+ err = -ENODEV;
|
||||
+ goto err_data;
|
||||
+ }
|
||||
+ dd->phys_base = res->start;
|
||||
|
||||
/* Get the DMA */
|
||||
res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
|
||||
--
|
||||
1.7.12
|
||||
|
||||
+176
@@ -0,0 +1,176 @@
|
||||
From 45cc04d9de2820cba138d5782e7c568edf0078a0 Mon Sep 17 00:00:00 2001
|
||||
From: "Mark A. Greer" <mgreer@animalcreek.com>
|
||||
Date: Wed, 12 Dec 2012 16:17:12 -0700
|
||||
Subject: [PATCH 09/10] ARM: AM33xx: hwmod: Convert RNG device data to hwmod
|
||||
|
||||
Convert the device data for the AM33xx RNG module
|
||||
from explicit platform_data to hwmod.
|
||||
|
||||
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
|
||||
---
|
||||
arch/arm/mach-omap2/devices.c | 18 +++++++++
|
||||
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 64 ++++++++++++++++++++++++++++++
|
||||
arch/arm/plat-omap/devices.c | 22 ----------
|
||||
3 files changed, 82 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
|
||||
index e4caa06..8e2f4a0 100644
|
||||
--- a/arch/arm/mach-omap2/devices.c
|
||||
+++ b/arch/arm/mach-omap2/devices.c
|
||||
@@ -825,6 +825,23 @@ static void __init omap_init_aes(void)
|
||||
static inline void omap_init_aes(void) { }
|
||||
#endif
|
||||
|
||||
+#if IS_ENABLED(CONFIG_HW_RANDOM_OMAP4)
|
||||
+static void __init omap_init_rng(void)
|
||||
+{
|
||||
+ struct omap_hwmod *oh;
|
||||
+ struct platform_device *pdev;
|
||||
+
|
||||
+ oh = omap_hwmod_lookup("rng");
|
||||
+ if (!oh)
|
||||
+ return;
|
||||
+
|
||||
+ pdev = omap_device_build("omap4_rng", -1, oh, NULL, 0, NULL, 0, 0);
|
||||
+ WARN(IS_ERR(pdev), "Can't build omap_device for omap-rng\n");
|
||||
+}
|
||||
+#else
|
||||
+static inline void omap_init_rng(void) {}
|
||||
+#endif
|
||||
+
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
|
||||
@@ -1475,6 +1492,7 @@ static int __init omap2_init_devices(void)
|
||||
omap_init_sti();
|
||||
omap_init_sham();
|
||||
omap_init_aes();
|
||||
+ omap_init_rng();
|
||||
omap_init_vout();
|
||||
am33xx_register_edma();
|
||||
am33xx_init_pcm();
|
||||
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
|
||||
index 90e25d7..6c5ebc7 100644
|
||||
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
|
||||
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
|
||||
@@ -94,6 +94,7 @@ static struct omap_hwmod am33xx_lcdc_hwmod;
|
||||
static struct omap_hwmod am33xx_mailbox_hwmod;
|
||||
static struct omap_hwmod am33xx_cpgmac0_hwmod;
|
||||
static struct omap_hwmod am33xx_mdio_hwmod;
|
||||
+static struct omap_hwmod am33xx_rng_hwmod;
|
||||
|
||||
/*
|
||||
* ERRATA: (Yet to conform from IP team)
|
||||
@@ -3541,6 +3542,67 @@ static struct omap_hwmod am33xx_pruss_hwmod = {
|
||||
.rst_lines_cnt = ARRAY_SIZE(am33xx_pruss_resets),
|
||||
};
|
||||
|
||||
+/* rng */
|
||||
+static struct omap_hwmod_sysc_fields omap3_rng_sysc_fields = {
|
||||
+ .sidle_shift = 3,
|
||||
+ .autoidle_shift = 0,
|
||||
+};
|
||||
+
|
||||
+static struct omap_hwmod_class_sysconfig am33xx_rng_sysc = {
|
||||
+ .rev_offs = 0x1fe0,
|
||||
+ .sysc_offs = 0x1fe4,
|
||||
+ .rst_offs = 0x1ff0,
|
||||
+ .sysc_flags = SYSC_HAS_AUTOIDLE,
|
||||
+ .sysc_fields = &omap3_rng_sysc_fields,
|
||||
+};
|
||||
+
|
||||
+static struct omap_hwmod_class am33xx_rng_hwmod_class = {
|
||||
+ .name = "rng",
|
||||
+ .sysc = &am33xx_rng_sysc,
|
||||
+};
|
||||
+
|
||||
+static struct omap_hwmod_irq_info am33xx_rng_irqs[] = {
|
||||
+ { .irq = 111 },
|
||||
+ { .irq = -1 }
|
||||
+};
|
||||
+
|
||||
+struct omap_hwmod_addr_space am33xx_rng_addr_space[] = {
|
||||
+ {
|
||||
+ .pa_start = 0x48310000,
|
||||
+ .pa_end = 0x48310000 + SZ_8K - 1,
|
||||
+ .flags = ADDR_TYPE_RT,
|
||||
+ },
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+struct omap_hwmod_ocp_if am33xx_l4per__rng = {
|
||||
+ .master = &am33xx_l4per_hwmod,
|
||||
+ .slave = &am33xx_rng_hwmod,
|
||||
+ .clk = "rng_fck",
|
||||
+ .addr = am33xx_rng_addr_space,
|
||||
+ .user = OCP_USER_MPU,
|
||||
+};
|
||||
+
|
||||
+static struct omap_hwmod_ocp_if *am33xx_rng_slaves[] = {
|
||||
+ &am33xx_l4per__rng,
|
||||
+};
|
||||
+
|
||||
+static struct omap_hwmod am33xx_rng_hwmod = {
|
||||
+ .name = "rng",
|
||||
+ .class = &am33xx_rng_hwmod_class,
|
||||
+ .clkdm_name = "l4ls_clkdm",
|
||||
+ .mpu_irqs = am33xx_rng_irqs,
|
||||
+ .main_clk = "rng_fck",
|
||||
+ .prcm = {
|
||||
+ .omap4 = {
|
||||
+ .clkctrl_offs = AM33XX_CM_PER_RNG_CLKCTRL_OFFSET,
|
||||
+ .modulemode = MODULEMODE_SWCTRL,
|
||||
+ },
|
||||
+ },
|
||||
+ .slaves = am33xx_rng_slaves,
|
||||
+ .slaves_cnt = ARRAY_SIZE(am33xx_rng_slaves),
|
||||
+};
|
||||
+
|
||||
static __initdata struct omap_hwmod *am33xx_hwmods[] = {
|
||||
/* l3 class */
|
||||
&am33xx_l3_instr_hwmod,
|
||||
@@ -3661,6 +3723,8 @@ static __initdata struct omap_hwmod *am33xx_hwmods[] = {
|
||||
&am33xx_gfx_hwmod,
|
||||
/* pruss */
|
||||
&am33xx_pruss_hwmod,
|
||||
+ /* rng */
|
||||
+ &am33xx_rng_hwmod,
|
||||
NULL,
|
||||
};
|
||||
|
||||
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
|
||||
index 52720b4..52d7ad4 100644
|
||||
--- a/arch/arm/plat-omap/devices.c
|
||||
+++ b/arch/arm/plat-omap/devices.c
|
||||
@@ -105,28 +105,6 @@ static void omap_init_rng(void)
|
||||
{
|
||||
(void) platform_device_register(&omap_rng_device);
|
||||
}
|
||||
-#elif defined(CONFIG_HW_RANDOM_OMAP4) || defined(CONFIG_HW_RANDOM_OMAP4_MODULE)
|
||||
-
|
||||
-static struct resource rng_resources[] = {
|
||||
- {
|
||||
- .start = AM33XX_RNG_BASE,
|
||||
- .end = AM33XX_RNG_BASE + 0x1FFC,
|
||||
- .flags = IORESOURCE_MEM,
|
||||
- },
|
||||
-};
|
||||
-
|
||||
-static struct platform_device omap4_rng_device = {
|
||||
- .name = "omap4_rng",
|
||||
- .id = -1,
|
||||
- .num_resources = ARRAY_SIZE(rng_resources),
|
||||
- .resource = rng_resources,
|
||||
-};
|
||||
-
|
||||
-static void omap_init_rng(void)
|
||||
-{
|
||||
- (void) platform_device_register(&omap4_rng_device);
|
||||
-}
|
||||
-
|
||||
#else
|
||||
static inline void omap_init_rng(void) {}
|
||||
#endif
|
||||
--
|
||||
1.7.12
|
||||
|
||||
+91
@@ -0,0 +1,91 @@
|
||||
From 1b4d57c404a14b263b39e251e0bc5dc76fc95932 Mon Sep 17 00:00:00 2001
|
||||
From: "Mark A. Greer" <mgreer@animalcreek.com>
|
||||
Date: Wed, 12 Dec 2012 20:13:49 -0700
|
||||
Subject: [PATCH 10/10] hwrng: omap4-rng: Convert to use pm_runtime API
|
||||
|
||||
Convert the omap4-rng driver to use the pm_runtime
|
||||
API instead of the clk API.
|
||||
|
||||
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
|
||||
---
|
||||
drivers/char/hw_random/omap4-rng.c | 24 +++++++++++-------------
|
||||
1 file changed, 11 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/drivers/char/hw_random/omap4-rng.c b/drivers/char/hw_random/omap4-rng.c
|
||||
index 523ec63..98c96c1 100644
|
||||
--- a/drivers/char/hw_random/omap4-rng.c
|
||||
+++ b/drivers/char/hw_random/omap4-rng.c
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/random.h>
|
||||
-#include <linux/clk.h>
|
||||
+#include <linux/pm_runtime.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/hw_random.h>
|
||||
@@ -111,7 +111,6 @@
|
||||
|
||||
|
||||
static void __iomem *rng_base;
|
||||
-static struct clk *rng_fck;
|
||||
static struct platform_device *rng_dev;
|
||||
|
||||
#define trng_read(reg) \
|
||||
@@ -172,13 +171,8 @@ static int __devinit omap4_rng_probe(struct platform_device *pdev)
|
||||
if (rng_dev)
|
||||
return -EBUSY;
|
||||
|
||||
- rng_fck = clk_get(&pdev->dev, "rng_fck");
|
||||
- if (IS_ERR(rng_fck)) {
|
||||
- dev_err(&pdev->dev, "Could not get rng_fck\n");
|
||||
- ret = PTR_ERR(rng_fck);
|
||||
- return ret;
|
||||
- } else
|
||||
- clk_enable(rng_fck);
|
||||
+ pm_runtime_enable(&pdev->dev);
|
||||
+ pm_runtime_get_sync(&pdev->dev);
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!res) {
|
||||
@@ -223,8 +217,8 @@ err_register:
|
||||
err_ioremap:
|
||||
release_mem_region(res->start, resource_size(res));
|
||||
err_region:
|
||||
- clk_disable(rng_fck);
|
||||
- clk_put(rng_fck);
|
||||
+ pm_runtime_put_sync(&pdev->dev);
|
||||
+ pm_runtime_disable(&pdev->dev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -238,8 +232,8 @@ static int __exit omap4_rng_remove(struct platform_device *pdev)
|
||||
|
||||
iounmap(rng_base);
|
||||
|
||||
- clk_disable(rng_fck);
|
||||
- clk_put(rng_fck);
|
||||
+ pm_runtime_put_sync(&pdev->dev);
|
||||
+ pm_runtime_disable(&pdev->dev);
|
||||
release_mem_region(res->start, resource_size(res));
|
||||
rng_base = NULL;
|
||||
|
||||
@@ -252,11 +246,15 @@ static int omap4_rng_suspend(struct platform_device *pdev, pm_message_t message)
|
||||
{
|
||||
trng_write(trng_read(CONTROL) & ~RNG_REG_CONTROL_ENABLE_TRNG, CONTROL);
|
||||
|
||||
+ pm_runtime_put_sync(&pdev->dev);
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int omap4_rng_resume(struct platform_device *pdev)
|
||||
{
|
||||
+ pm_runtime_get_sync(&pdev->dev);
|
||||
+
|
||||
trng_write(trng_read(CONTROL) | RNG_REG_CONTROL_ENABLE_TRNG, CONTROL);
|
||||
|
||||
return 0;
|
||||
--
|
||||
1.7.12
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
use-kernel-config=am335x_evm_defconfig
|
||||
Reference in New Issue
Block a user