Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-18 06:15:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ARM] msm: Add 8k power collapse support to smd

Browse Source 
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
This commit is contained in:
Arve Hjønnevåg 2009-06-16 14:48:21 -07:00 committed by Daniel Walker
parent 283794100d
commit ec9d3d14ff
2 changed files with 59 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
arch/arm/mach-msm/smd.c
View File

@ -1038,6 +1038,25 @@ uint32_t smsm_get_state(enum smsm_state_item item)
return rv;
}
#ifdef CONFIG_ARCH_MSM_SCORPION
int smsm_set_sleep_duration(uint32_t delay)
{
struct msm_dem_slave_data *ptr = smem_alloc(SMEM_APPS_DEM_SLAVE_DATA,
sizeof(*ptr));
if (ptr == NULL) {
pr_err("smsm_set_sleep_duration <SM NO APPS_DEM_SLAVE_DATA>\n");
return -EIO;
}
if (msm_smd_debug_mask & MSM_SMSM_DEBUG)
pr_info("smsm_set_sleep_duration %d -> %d\n",
ptr->sleep_time, delay);
ptr->sleep_time = delay;
return 0;
}
#else
int smsm_set_sleep_duration(uint32_t delay)
{
uint32_t *ptr;
@ -1054,22 +1073,7 @@ int smsm_set_sleep_duration(uint32_t delay)
return 0;
}
int smsm_set_interrupt_info(struct smsm_interrupt_info *info)
{
struct smsm_interrupt_info *ptr;
ptr = smem_alloc(SMEM_SMSM_INT_INFO, sizeof(*ptr));
if (ptr == NULL) {
pr_err("smsm_set_sleep_duration <SM NO INT_INFO>\n");
return -EIO;
}
if (msm_smd_debug_mask & MSM_SMSM_DEBUG)
pr_info("smsm_set_interrupt_info %x %x -> %x %x\n",
ptr->aArm_en_mask, ptr->aArm_interrupts_pending,
info->aArm_en_mask, info->aArm_interrupts_pending);
*ptr = *info;
return 0;
}
#endif
#define MAX_NUM_SLEEP_CLIENTS 64
#define MAX_SLEEP_NAME_LEN 8
@ -1115,12 +1119,13 @@ void smsm_print_sleep_info(void)
if (ptr)
pr_info("SMEM_SLEEP_POWER_COLLAPSE_DISABLED: %x\n", *ptr);
#ifndef CONFIG_ARCH_MSM_SCORPION
int_info = smem_alloc(SMEM_SMSM_INT_INFO, sizeof(*int_info));
if (int_info)
pr_info("SMEM_SMSM_INT_INFO %x %x %x\n",
int_info->aArm_en_mask,
int_info->aArm_interrupts_pending,
int_info->aArm_wakeup_reason);
int_info->interrupt_mask,
int_info->pending_interrupts,
int_info->wakeup_reason);
gpio = smem_alloc(SMEM_GPIO_INT, sizeof(*gpio));
if (gpio) {
@ -1135,7 +1140,8 @@ void smsm_print_sleep_info(void)
i, gpio->num_fired[i], gpio->fired[i][0],
gpio->fired[i][1]);
}
#else
#endif
spin_unlock_irqrestore(&smem_lock, flags);
}
@ -1180,7 +1186,10 @@ int smd_core_init(void)
/* indicate that we're up and running */
smsm_change_state(SMSM_STATE_APPS,
~0, SMSM_INIT | SMSM_SMDINIT | SMSM_RPCINIT);
~0, SMSM_INIT | SMSM_SMDINIT | SMSM_RPCINIT | SMSM_RUN);
#ifdef CONFIG_ARCH_MSM_SCORPION
smsm_change_state(SMSM_STATE_APPS_DEM, ~0, 0);
#endif
pr_info("smd_core_init() done\n");
@ -1232,7 +1241,15 @@ static int debug_read_stat(char *buf, int max)
i += scnprintf(buf + i, max - i, "smsm: a9: %08x a11: %08x\n",
raw_smsm_get_state(SMSM_STATE_MODEM),
raw_smsm_get_state(SMSM_STATE_APPS));
#ifdef CONFIG_ARCH_MSM_SCORPION
i += scnprintf(buf + i, max - i, "smsm dem: apps: %08x modem: %08x "
"qdsp6: %08x power: %08x time: %08x\n",
raw_smsm_get_state(SMSM_STATE_APPS_DEM),
raw_smsm_get_state(SMSM_STATE_MODEM_DEM),
raw_smsm_get_state(SMSM_STATE_QDSP6_DEM),
raw_smsm_get_state(SMSM_STATE_POWER_MASTER_DEM),
raw_smsm_get_state(SMSM_STATE_TIME_MASTER_DEM));
#endif
if (msg) {
msg[SZ_DIAG_ERR_MSG - 1] = 0;
i += scnprintf(buf + i, max - i, "diag: '%s'\n", msg);

24
arch/arm/mach-msm/smd_private.h
View File

@ -61,12 +61,29 @@ struct smem_shared
#define SMSM_V1_SIZE (sizeof(unsigned) * 8)
#define SMSM_V2_SIZE (sizeof(unsigned) * 4)
#ifndef CONFIG_ARCH_MSM_SCORPION
struct smsm_interrupt_info
{
uint32_t aArm_en_mask;
uint32_t aArm_interrupts_pending;
uint32_t aArm_wakeup_reason;
uint32_t interrupt_mask;
uint32_t pending_interrupts;
uint32_t wakeup_reason;
};
#else
#define DEM_MAX_PORT_NAME_LEN (20)
struct msm_dem_slave_data {
uint32_t sleep_time;
uint32_t interrupt_mask;
uint32_t resources_used;
uint32_t reserved1;
uint32_t wakeup_reason;
uint32_t pending_interrupts;
uint32_t rpc_prog;
uint32_t rpc_proc;
char smd_port_name[DEM_MAX_PORT_NAME_LEN];
uint32_t reserved2;
};
#endif
#define SZ_DIAG_ERR_MSG 0xC8
#define ID_DIAG_ERR_MSG SMEM_DIAG_ERR_MESSAGE
@ -131,7 +148,6 @@ void *smem_alloc(unsigned id, unsigned size);
int smsm_change_state(enum smsm_state_item item, uint32_t clear_mask, uint32_t set_mask);
uint32_t smsm_get_state(enum smsm_state_item item);
int smsm_set_sleep_duration(uint32_t delay);
int smsm_set_interrupt_info(struct smsm_interrupt_info *info);
void smsm_print_sleep_info(void);
#define SMEM_NUM_SMD_CHANNELS 64