Merge "msm: iomap-8064: Add RPM, SAW-L2 and SAW-CPU memory map" into msm-3.0
diff --git a/Documentation/devicetree/bindings/spi/spi_qsd.txt b/Documentation/devicetree/bindings/spi/spi_qsd.txt
new file mode 100644
index 0000000..5839f63
--- /dev/null
+++ b/Documentation/devicetree/bindings/spi/spi_qsd.txt
@@ -0,0 +1,16 @@
+Qualcomm Serial Peripheral Interface (SPI)
+
+Required properties:
+- compatible : should be "qcom,spi-qup-v2".
+- reg : offset and length of the QUP register map.
+- interrupts : should contain the QUP core interrupt.
+- spi-max-frequency : specifies maximum SPI clock frequency, Units - Hz.
+
+Example:
+ spi@f9924000 {
+ compatible = "qcom,spi-qup-v2";
+ reg = <0xf9924000 0x1000>;
+ interrupts = <96>;
+ spi-max-frequency = <24000000>;
+ };
+
diff --git a/arch/arm/boot/dts/msmcopper.dts b/arch/arm/boot/dts/msmcopper.dts
index 6561c71..b00237a 100644
--- a/arch/arm/boot/dts/msmcopper.dts
+++ b/arch/arm/boot/dts/msmcopper.dts
@@ -70,4 +70,10 @@
qcom,bam-dma-res-pipes = <6>;
};
+ spi@f9924000 {
+ compatible = "qcom,spi-qup-v2";
+ reg = <0xf9924000 0x1000>;
+ interrupts = <96>;
+ spi-max-frequency = <24000000>;
+ };
};
diff --git a/arch/arm/configs/msm7627a-perf_defconfig b/arch/arm/configs/msm7627a-perf_defconfig
index ca974b2..00ff580 100644
--- a/arch/arm/configs/msm7627a-perf_defconfig
+++ b/arch/arm/configs/msm7627a-perf_defconfig
@@ -45,6 +45,7 @@
CONFIG_MSM7X27A_AUDIO=y
CONFIG_MSM_DMA_TEST=y
# CONFIG_MSM_JTAG_V7 is not set
+CONFIG_MSM_SLEEP_STATS_DEVICE=y
CONFIG_BT_MSM_PINTEST=y
CONFIG_MSM_RPC_VIBRATOR=y
CONFIG_PM8XXX_RPC_VIBRATOR=y
diff --git a/arch/arm/configs/msm7627a_defconfig b/arch/arm/configs/msm7627a_defconfig
index cfa06a8..3cf01a1 100644
--- a/arch/arm/configs/msm7627a_defconfig
+++ b/arch/arm/configs/msm7627a_defconfig
@@ -45,6 +45,7 @@
CONFIG_MSM7X27A_AUDIO=y
CONFIG_MSM_DMA_TEST=y
# CONFIG_MSM_JTAG_V7 is not set
+CONFIG_MSM_SLEEP_STATS_DEVICE=y
CONFIG_BT_MSM_PINTEST=y
CONFIG_MSM_RPC_VIBRATOR=y
CONFIG_PM8XXX_RPC_VIBRATOR=y
diff --git a/arch/arm/configs/msm8960-perf_defconfig b/arch/arm/configs/msm8960-perf_defconfig
index 00202ee..0780d20 100644
--- a/arch/arm/configs/msm8960-perf_defconfig
+++ b/arch/arm/configs/msm8960-perf_defconfig
@@ -321,6 +321,7 @@
CONFIG_FB_MSM_OVERLAY0_WRITEBACK=y
CONFIG_FB_MSM_MIPI_PANEL_DETECT=y
CONFIG_FB_MSM_HDMI_MSM_PANEL=y
+CONFIG_FB_MSM_WRITEBACK_MSM_PANEL=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_SOUND=y
diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index bac1123..bd92fe3 100644
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -324,6 +324,7 @@
CONFIG_FB_MSM_OVERLAY0_WRITEBACK=y
CONFIG_FB_MSM_MIPI_PANEL_DETECT=y
CONFIG_FB_MSM_HDMI_MSM_PANEL=y
+CONFIG_FB_MSM_WRITEBACK_MSM_PANEL=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_SOUND=y
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index ee9b2de..9df90cd 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1845,6 +1845,9 @@
depends on CPU_IDLE
default n
+config MSM_SLEEP_STATS_DEVICE
+ bool "Enable exporting of MSM sleep device stats to userspace"
+
config MSM_STANDALONE_POWER_COLLAPSE
bool "Enable standalone power collapse"
default n
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index bae4678..8b866d8 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -301,7 +301,8 @@
endif
endif
-obj-$(CONFIG_MSM_SLEEP_STATS) += msm_rq_stats.o idle_stats.o idle_stats_device.o
+obj-$(CONFIG_MSM_SLEEP_STATS) += msm_rq_stats.o idle_stats.o
+obj-$(CONFIG_MSM_SLEEP_STATS_DEVICE) += idle_stats_device.o
obj-$(CONFIG_MSM_SHOW_RESUME_IRQ) += msm_show_resume_irq.o
obj-$(CONFIG_BT_MSM_PINTEST) += btpintest.o
obj-$(CONFIG_MSM_FAKE_BATTERY) += fish_battery.o
diff --git a/arch/arm/mach-msm/bam_dmux.c b/arch/arm/mach-msm/bam_dmux.c
index bfe4f81..10203b1 100644
--- a/arch/arm/mach-msm/bam_dmux.c
+++ b/arch/arm/mach-msm/bam_dmux.c
@@ -1497,7 +1497,7 @@
mutex_unlock(&dfab_status_lock);
return;
}
- rc = clk_enable(dfab_clk);
+ rc = clk_prepare_enable(dfab_clk);
if (rc)
DMUX_LOG_KERR("bam_dmux vote for dfab failed rc = %d\n", rc);
dfab_is_on = 1;
@@ -1514,7 +1514,7 @@
mutex_unlock(&dfab_status_lock);
return;
}
- clk_disable(dfab_clk);
+ clk_disable_unprepare(dfab_clk);
dfab_is_on = 0;
mutex_unlock(&dfab_status_lock);
}
diff --git a/arch/arm/mach-msm/board-8064.c b/arch/arm/mach-msm/board-8064.c
index 9f66e5d..1aedd55 100644
--- a/arch/arm/mach-msm/board-8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -22,6 +22,7 @@
#include <linux/spi/spi.h>
#include <linux/dma-mapping.h>
#include <linux/platform_data/qcom_crypto_device.h>
+#include <linux/ion.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/hardware/gic.h>
@@ -29,6 +30,7 @@
#include <mach/board.h>
#include <mach/msm_iomap.h>
+#include <mach/ion.h>
#include <linux/usb/msm_hsusb.h>
#include <linux/usb/android.h>
#include <mach/socinfo.h>
@@ -37,7 +39,9 @@
#include "devices.h"
#include <mach/gpio.h>
#include <mach/gpiomux.h>
+#ifdef CONFIG_ANDROID_PMEM
#include <linux/android_pmem.h>
+#endif
#include <mach/msm_memtypes.h>
#include <linux/bootmem.h>
#include <asm/setup.h>
@@ -46,27 +50,36 @@
#include "msm_watchdog.h"
#include "board-8064.h"
-#define MSM_PMEM_KERNEL_EBI1_SIZE 0x600000
-#define MSM_PMEM_ADSP_SIZE 0x3800000
+#define MSM_PMEM_ADSP_SIZE 0x7800000
#define MSM_PMEM_AUDIO_SIZE 0x2B4000
-#define MSM_PMEM_SIZE 0x1800000 /* 24 Mbytes */
+#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
+#define MSM_PMEM_SIZE 0x4000000 /* 64 Mbytes */
+#else
+#define MSM_PMEM_SIZE 0x2800000 /* 40 Mbytes */
+#endif
-static struct memtype_reserve apq8064_reserve_table[] __initdata = {
- [MEMTYPE_SMI] = {
- },
- [MEMTYPE_EBI0] = {
- .flags = MEMTYPE_FLAGS_1M_ALIGN,
- },
- [MEMTYPE_EBI1] = {
- .flags = MEMTYPE_FLAGS_1M_ALIGN,
- },
-};
+#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION
+#define MSM_PMEM_KERNEL_EBI1_SIZE 0xB0C000
+#define MSM_ION_SF_SIZE MSM_PMEM_SIZE
+#define MSM_ION_MM_SIZE MSM_PMEM_ADSP_SIZE
+#define MSM_ION_MFC_SIZE SZ_8K
+#define MSM_ION_HEAP_NUM 5
+#else
+#define MSM_PMEM_KERNEL_EBI1_SIZE 0x110C000
+#define MSM_ION_HEAP_NUM 1
+#endif
-static int apq8064_paddr_to_memtype(unsigned int paddr)
+#ifdef CONFIG_KERNEL_PMEM_EBI_REGION
+static unsigned pmem_kernel_ebi1_size = MSM_PMEM_KERNEL_EBI1_SIZE;
+static int __init pmem_kernel_ebi1_size_setup(char *p)
{
- return MEMTYPE_EBI1;
+ pmem_kernel_ebi1_size = memparse(p, NULL);
+ return 0;
}
+early_param("pmem_kernel_ebi1_size", pmem_kernel_ebi1_size_setup);
+#endif
+#ifdef CONFIG_ANDROID_PMEM
static unsigned pmem_size = MSM_PMEM_SIZE;
static int __init pmem_size_setup(char *p)
{
@@ -92,7 +105,10 @@
return 0;
}
early_param("pmem_audio_size", pmem_audio_size_setup);
+#endif
+#ifdef CONFIG_ANDROID_PMEM
+#ifndef CONFIG_MSM_MULTIMEDIA_USE_ION
static struct android_pmem_platform_data android_pmem_pdata = {
.name = "pmem",
.allocator_type = PMEM_ALLOCATORTYPE_ALLORNOTHING,
@@ -112,20 +128,12 @@
.cached = 0,
.memory_type = MEMTYPE_EBI1,
};
-
-static unsigned pmem_kernel_ebi1_size = MSM_PMEM_KERNEL_EBI1_SIZE;
-static int __init pmem_kernel_ebi1_size_setup(char *p)
-{
- pmem_kernel_ebi1_size = memparse(p, NULL);
- return 0;
-}
-early_param("pmem_kernel_ebi1_size", pmem_kernel_ebi1_size_setup);
-
static struct platform_device android_pmem_adsp_device = {
.name = "android_pmem",
.id = 2,
.dev = { .platform_data = &android_pmem_adsp_pdata },
};
+#endif
static struct android_pmem_platform_data android_pmem_audio_pdata = {
.name = "pmem_audio",
@@ -139,12 +147,28 @@
.id = 4,
.dev = { .platform_data = &android_pmem_audio_pdata },
};
+#endif
+
+static struct memtype_reserve apq8064_reserve_table[] __initdata = {
+ [MEMTYPE_SMI] = {
+ },
+ [MEMTYPE_EBI0] = {
+ .flags = MEMTYPE_FLAGS_1M_ALIGN,
+ },
+ [MEMTYPE_EBI1] = {
+ .flags = MEMTYPE_FLAGS_1M_ALIGN,
+ },
+};
static void __init size_pmem_devices(void)
{
+#ifdef CONFIG_ANDROID_PMEM
+#ifndef CONFIG_MSM_MULTIMEDIA_USE_ION
android_pmem_adsp_pdata.size = pmem_adsp_size;
android_pmem_pdata.size = pmem_size;
+#endif
android_pmem_audio_pdata.size = MSM_PMEM_AUDIO_SIZE;
+#endif
}
static void __init reserve_memory_for(struct android_pmem_platform_data *p)
@@ -154,16 +178,97 @@
static void __init reserve_pmem_memory(void)
{
+#ifdef CONFIG_ANDROID_PMEM
+#ifndef CONFIG_MSM_MULTIMEDIA_USE_ION
reserve_memory_for(&android_pmem_adsp_pdata);
reserve_memory_for(&android_pmem_pdata);
+#endif
reserve_memory_for(&android_pmem_audio_pdata);
apq8064_reserve_table[MEMTYPE_EBI1].size += pmem_kernel_ebi1_size;
+#endif
+}
+
+static int apq8064_paddr_to_memtype(unsigned int paddr)
+{
+ return MEMTYPE_EBI1;
+}
+
+#ifdef CONFIG_ION_MSM
+#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION
+static struct ion_cp_heap_pdata cp_mm_ion_pdata = {
+ .permission_type = IPT_TYPE_MM_CARVEOUT,
+};
+
+static struct ion_cp_heap_pdata cp_mfc_ion_pdata = {
+ .permission_type = IPT_TYPE_MFC_SHAREDMEM,
+};
+
+static struct ion_co_heap_pdata co_ion_pdata = {
+};
+#endif
+static struct ion_platform_data ion_pdata = {
+ .nr = MSM_ION_HEAP_NUM,
+ .heaps = {
+ {
+ .id = ION_SYSTEM_HEAP_ID,
+ .type = ION_HEAP_TYPE_SYSTEM,
+ .name = ION_VMALLOC_HEAP_NAME,
+ },
+#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION
+ {
+ .id = ION_SF_HEAP_ID,
+ .type = ION_HEAP_TYPE_CARVEOUT,
+ .name = ION_SF_HEAP_NAME,
+ .size = MSM_ION_SF_SIZE,
+ .memory_type = ION_EBI_TYPE,
+ .extra_data = (void *) &co_ion_pdata,
+ },
+ {
+ .id = ION_CP_MM_HEAP_ID,
+ .type = ION_HEAP_TYPE_CP,
+ .name = ION_MM_HEAP_NAME,
+ .size = MSM_ION_MM_SIZE,
+ .memory_type = ION_EBI_TYPE,
+ .extra_data = (void *) &cp_mm_ion_pdata,
+ },
+ {
+ .id = ION_CP_MFC_HEAP_ID,
+ .type = ION_HEAP_TYPE_CP,
+ .name = ION_MFC_HEAP_NAME,
+ .size = MSM_ION_MFC_SIZE,
+ .memory_type = ION_EBI_TYPE,
+ .extra_data = (void *) &cp_mfc_ion_pdata,
+ },
+ {
+ .id = ION_IOMMU_HEAP_ID,
+ .type = ION_HEAP_TYPE_IOMMU,
+ .name = ION_IOMMU_HEAP_NAME,
+ },
+#endif
+ }
+};
+
+static struct platform_device ion_dev = {
+ .name = "ion-msm",
+ .id = 1,
+ .dev = { .platform_data = &ion_pdata },
+};
+#endif
+
+static void reserve_ion_memory(void)
+{
+#if defined(CONFIG_ION_MSM) && defined(CONFIG_MSM_MULTIMEDIA_USE_ION)
+ apq8064_reserve_table[MEMTYPE_EBI1].size += MSM_ION_MM_SIZE;
+ apq8064_reserve_table[MEMTYPE_EBI1].size += MSM_ION_SF_SIZE;
+ apq8064_reserve_table[MEMTYPE_EBI1].size += MSM_ION_MFC_SIZE;
+#endif
}
static void __init apq8064_calculate_reserve_sizes(void)
{
size_pmem_devices();
reserve_pmem_memory();
+ reserve_ion_memory();
}
static struct reserve_info apq8064_reserve_info __initdata = {
@@ -464,9 +569,16 @@
&apq8064_device_otg,
&apq8064_device_gadget_peripheral,
&android_usb_device,
+#ifdef CONFIG_ANDROID_PMEM
+#ifndef CONFIG_MSM_MULTIMEDIA_USE_ION
&android_pmem_device,
&android_pmem_adsp_device,
+#endif
&android_pmem_audio_device,
+#endif
+#ifdef CONFIG_ION_MSM
+ &ion_dev,
+#endif
&msm8064_device_watchdog,
&msm8064_device_saw_regulator_core0,
&msm8064_device_saw_regulator_core1,
diff --git a/arch/arm/mach-msm/board-8930-gpiomux.c b/arch/arm/mach-msm/board-8930-gpiomux.c
index fc64ed2..84dbea8 100644
--- a/arch/arm/mach-msm/board-8930-gpiomux.c
+++ b/arch/arm/mach-msm/board-8930-gpiomux.c
@@ -156,29 +156,22 @@
.pull = GPIOMUX_PULL_DOWN,
};
#ifdef MSM8930_PHASE_2
-static struct gpiomux_setting hsusb_act_cfg = {
- .func = GPIOMUX_FUNC_GPIO,
- .drv = GPIOMUX_DRV_8MA,
- .pull = GPIOMUX_PULL_UP,
-};
-
static struct gpiomux_setting hsusb_sus_cfg = {
.func = GPIOMUX_FUNC_GPIO,
.drv = GPIOMUX_DRV_2MA,
- .pull = GPIOMUX_PULL_DOWN,
+ .pull = GPIOMUX_PULL_NONE,
+ .dir = GPIOMUX_OUT_LOW,
};
static struct msm_gpiomux_config msm8930_hsusb_configs[] = {
{
.gpio = 63, /* HSUSB_EXTERNAL_5V_LDO_EN */
.settings = {
- [GPIOMUX_ACTIVE] = &hsusb_act_cfg,
[GPIOMUX_SUSPENDED] = &hsusb_sus_cfg,
},
},
{
.gpio = 97, /* HSUSB_5V_EN */
.settings = {
- [GPIOMUX_ACTIVE] = &hsusb_act_cfg,
[GPIOMUX_SUSPENDED] = &hsusb_sus_cfg,
},
},
diff --git a/arch/arm/mach-msm/board-8930-pmic.c b/arch/arm/mach-msm/board-8930-pmic.c
index 6cb69f6..2f59d9d 100644
--- a/arch/arm/mach-msm/board-8930-pmic.c
+++ b/arch/arm/mach-msm/board-8930-pmic.c
@@ -198,10 +198,49 @@
.wakeup = 1,
};
+static int pm8921_therm_mitigation[] = {
+ 1100,
+ 700,
+ 600,
+ 325,
+};
+
+#define MAX_VOLTAGE_MV 4200
+static struct pm8921_charger_platform_data pm8921_chg_pdata __devinitdata = {
+ .safety_time = 180,
+ .update_time = 60000,
+ .max_voltage = MAX_VOLTAGE_MV,
+ .min_voltage = 3200,
+ .resume_voltage_delta = 100,
+ .term_current = 100,
+ .cool_temp = 10,
+ .warm_temp = 40,
+ .temp_check_period = 1,
+ .max_bat_chg_current = 1100,
+ .cool_bat_chg_current = 350,
+ .warm_bat_chg_current = 350,
+ .cool_bat_voltage = 4100,
+ .warm_bat_voltage = 4100,
+ .thermal_mitigation = pm8921_therm_mitigation,
+ .thermal_levels = ARRAY_SIZE(pm8921_therm_mitigation),
+};
+
+static struct pm8xxx_ccadc_platform_data pm8xxx_ccadc_pdata = {
+ .r_sense = 10,
+};
+
static struct pm8xxx_misc_platform_data pm8xxx_misc_pdata = {
.priority = 0,
};
+static struct pm8921_bms_platform_data pm8921_bms_pdata __devinitdata = {
+ .r_sense = 10,
+ .i_test = 2500,
+ .v_failure = 3000,
+ .calib_delay_ms = 600000,
+ .max_voltage_uv = MAX_VOLTAGE_MV * 1000,
+};
+
static struct pm8038_platform_data pm8038_platform_data __devinitdata = {
.irq_pdata = &pm8xxx_irq_pdata,
.gpio_pdata = &pm8xxx_gpio_pdata,
@@ -210,7 +249,10 @@
.pwrkey_pdata = &pm8xxx_pwrkey_pdata,
.misc_pdata = &pm8xxx_misc_pdata,
.regulator_pdatas = msm8930_pm8038_regulator_pdata,
+ .charger_pdata = &pm8921_chg_pdata,
+ .bms_pdata = &pm8921_bms_pdata,
.adc_pdata = &pm8xxx_adc_pdata,
+ .ccadc_pdata = &pm8xxx_ccadc_pdata,
};
static struct msm_ssbi_platform_data msm8930_ssbi_pm8038_pdata __devinitdata = {
diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index 533d4f7..2849945 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -128,10 +128,11 @@
#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION
#define MSM_PMEM_KERNEL_EBI1_SIZE 0xB0C000
-#define MSM_ION_SF_SIZE 0x1800000 /* 24MB */
+#define MSM_ION_SF_SIZE 0x2800000 /* 40MB */
+#define MSM_ION_MM_FW_SIZE 0x200000 /* (2MB) */
#define MSM_ION_MM_SIZE 0x4000000 /* (64MB) */
#define MSM_ION_MFC_SIZE SZ_8K
-#define MSM_ION_HEAP_NUM 5
+#define MSM_ION_HEAP_NUM 6
#else
#define MSM_PMEM_KERNEL_EBI1_SIZE 0x110C000
#define MSM_ION_HEAP_NUM 1
@@ -285,12 +286,20 @@
#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION
static struct ion_cp_heap_pdata cp_mm_ion_pdata = {
.permission_type = IPT_TYPE_MM_CARVEOUT,
+ .align = PAGE_SIZE,
};
static struct ion_cp_heap_pdata cp_mfc_ion_pdata = {
.permission_type = IPT_TYPE_MFC_SHAREDMEM,
+ .align = PAGE_SIZE,
};
static struct ion_co_heap_pdata co_ion_pdata = {
+ .adjacent_mem_id = INVALID_HEAP_ID,
+ .align = PAGE_SIZE,
+};
+static struct ion_co_heap_pdata fw_co_ion_pdata = {
+ .adjacent_mem_id = ION_CP_MM_HEAP_ID,
+ .align = SZ_128K,
};
#endif
static struct ion_platform_data ion_pdata = {
@@ -308,7 +317,7 @@
.name = ION_SF_HEAP_NAME,
.size = MSM_ION_SF_SIZE,
.memory_type = ION_EBI_TYPE,
- .extra_data = &co_ion_pdata,
+ .extra_data = (void *) &co_ion_pdata,
},
{
.id = ION_CP_MM_HEAP_ID,
@@ -319,6 +328,14 @@
.extra_data = (void *) &cp_mm_ion_pdata,
},
{
+ .id = ION_MM_FIRMWARE_HEAP_ID,
+ .type = ION_HEAP_TYPE_CARVEOUT,
+ .name = ION_MM_FIRMWARE_HEAP_NAME,
+ .size = MSM_ION_MM_FW_SIZE,
+ .memory_type = ION_EBI_TYPE,
+ .extra_data = (void *) &fw_co_ion_pdata,
+ },
+ {
.id = ION_CP_MFC_HEAP_ID,
.type = ION_HEAP_TYPE_CP,
.name = ION_MFC_HEAP_NAME,
@@ -347,6 +364,7 @@
#if defined(CONFIG_ION_MSM) && defined(CONFIG_MSM_MULTIMEDIA_USE_ION)
msm8930_reserve_table[MEMTYPE_EBI1].size += MSM_ION_SF_SIZE;
msm8930_reserve_table[MEMTYPE_EBI1].size += MSM_ION_MM_SIZE;
+ msm8930_reserve_table[MEMTYPE_EBI1].size += MSM_ION_MM_FW_SIZE;
msm8930_reserve_table[MEMTYPE_EBI1].size += MSM_ION_MFC_SIZE;
#endif
}
diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index b19445d..b67fdd0 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -142,9 +142,10 @@
#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION
#define MSM_PMEM_KERNEL_EBI1_SIZE 0xB0C000
#define MSM_ION_SF_SIZE 0x2800000 /* (40MB) */
+#define MSM_ION_MM_FW_SIZE 0x200000 /* (2MB) */
#define MSM_ION_MM_SIZE 0x4000000 /* (64MB) */
#define MSM_ION_MFC_SIZE SZ_8K
-#define MSM_ION_HEAP_NUM 5
+#define MSM_ION_HEAP_NUM 6
#define MSM_LIQUID_ION_MM_SIZE (MSM_ION_MM_SIZE + 0x600000)
static unsigned int msm_ion_cp_mm_size = MSM_ION_MM_SIZE;
#else
@@ -312,16 +313,24 @@
#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION
static struct ion_cp_heap_pdata cp_mm_ion_pdata = {
.permission_type = IPT_TYPE_MM_CARVEOUT,
+ .align = PAGE_SIZE,
};
static struct ion_cp_heap_pdata cp_mfc_ion_pdata = {
.permission_type = IPT_TYPE_MFC_SHAREDMEM,
+ .align = PAGE_SIZE,
};
static struct ion_co_heap_pdata co_ion_pdata = {
+ .adjacent_mem_id = INVALID_HEAP_ID,
+ .align = PAGE_SIZE,
+};
+
+static struct ion_co_heap_pdata fw_co_ion_pdata = {
+ .adjacent_mem_id = ION_CP_MM_HEAP_ID,
+ .align = SZ_128K,
};
#endif
-
static struct ion_platform_data ion_pdata = {
.nr = MSM_ION_HEAP_NUM,
.heaps = {
@@ -337,7 +346,7 @@
.name = ION_SF_HEAP_NAME,
.size = MSM_ION_SF_SIZE,
.memory_type = ION_EBI_TYPE,
- .extra_data = &co_ion_pdata,
+ .extra_data = (void *) &co_ion_pdata,
},
{
.id = ION_CP_MM_HEAP_ID,
@@ -348,6 +357,14 @@
.extra_data = (void *) &cp_mm_ion_pdata,
},
{
+ .id = ION_MM_FIRMWARE_HEAP_ID,
+ .type = ION_HEAP_TYPE_CARVEOUT,
+ .name = ION_MM_FIRMWARE_HEAP_NAME,
+ .size = MSM_ION_MM_FW_SIZE,
+ .memory_type = ION_EBI_TYPE,
+ .extra_data = (void *) &fw_co_ion_pdata,
+ },
+ {
.id = ION_CP_MFC_HEAP_ID,
.type = ION_HEAP_TYPE_CP,
.name = ION_MFC_HEAP_NAME,
@@ -394,6 +411,7 @@
}
}
msm8960_reserve_table[MEMTYPE_EBI1].size += msm_ion_cp_mm_size;
+ msm8960_reserve_table[MEMTYPE_EBI1].size += MSM_ION_MM_FW_SIZE;
msm8960_reserve_table[MEMTYPE_EBI1].size += MSM_ION_SF_SIZE;
msm8960_reserve_table[MEMTYPE_EBI1].size += MSM_ION_MFC_SIZE;
#endif
diff --git a/arch/arm/mach-msm/board-copper.c b/arch/arm/mach-msm/board-copper.c
index a372eb6..f26187e 100644
--- a/arch/arm/mach-msm/board-copper.c
+++ b/arch/arm/mach-msm/board-copper.c
@@ -77,6 +77,8 @@
CLK_DUMMY("dfab_clk", DFAB_CLK, NULL, 0),
CLK_DUMMY("dma_bam_pclk", DMA_BAM_P_CLK, NULL, 0),
CLK_DUMMY("mem_clk", NULL, NULL, 0),
+ CLK_DUMMY("core_clk", SPI_CLK, "spi_qsd.1", OFF),
+ CLK_DUMMY("iface_clk", SPI_P_CLK, "spi_qsd.1", OFF),
};
struct clock_init_data msm_dummy_clock_init_data __initdata = {
@@ -89,6 +91,8 @@
"msm_serial_hsl.0", NULL),
OF_DEV_AUXDATA("qcom,hsusb-otg", 0xF9A55000, \
"msm_otg", NULL),
+ OF_DEV_AUXDATA("qcom,spi-qup-v2", 0xF9924000, \
+ "spi_qsd.1", NULL),
{}
};
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index df04bb2..7699aa8 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -2672,12 +2672,13 @@
#define MSM_ION_SF_SIZE 0x1800000 /* 24MB */
#define MSM_ION_CAMERA_SIZE MSM_PMEM_ADSP_SIZE
-#define MSM_ION_MM_SIZE 0x3800000 /* 56MB */
+#define MSM_ION_MM_FW_SIZE 0x200000 /* (2MB) */
+#define MSM_ION_MM_SIZE 0x3600000 /* (54MB) */
#define MSM_ION_MFC_SIZE SZ_8K
#define MSM_ION_WB_SIZE 0x600000 /* 6MB */
#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION
-#define MSM_ION_HEAP_NUM 6
+#define MSM_ION_HEAP_NUM 7
#else
#define MSM_ION_HEAP_NUM 1
#endif
@@ -5242,6 +5243,7 @@
#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION
static struct ion_cp_heap_pdata cp_mm_ion_pdata = {
.permission_type = IPT_TYPE_MM_CARVEOUT,
+ .align = PAGE_SIZE,
.request_region = request_smi_region,
.release_region = release_smi_region,
.setup_region = setup_smi_region,
@@ -5249,6 +5251,7 @@
static struct ion_cp_heap_pdata cp_mfc_ion_pdata = {
.permission_type = IPT_TYPE_MFC_SHAREDMEM,
+ .align = PAGE_SIZE,
.request_region = request_smi_region,
.release_region = release_smi_region,
.setup_region = setup_smi_region,
@@ -5256,9 +5259,17 @@
static struct ion_cp_heap_pdata cp_wb_ion_pdata = {
.permission_type = IPT_TYPE_MDP_WRITEBACK,
+ .align = PAGE_SIZE,
+};
+
+static struct ion_co_heap_pdata fw_co_ion_pdata = {
+ .adjacent_mem_id = ION_CP_MM_HEAP_ID,
+ .align = SZ_128K,
};
static struct ion_co_heap_pdata co_ion_pdata = {
+ .adjacent_mem_id = INVALID_HEAP_ID,
+ .align = PAGE_SIZE,
};
#endif
static struct ion_platform_data ion_pdata = {
@@ -5276,7 +5287,7 @@
.name = ION_SF_HEAP_NAME,
.size = MSM_ION_SF_SIZE,
.memory_type = ION_EBI_TYPE,
- .extra_data = &co_ion_pdata,
+ .extra_data = (void *)&co_ion_pdata,
},
{
.id = ION_CP_MM_HEAP_ID,
@@ -5287,6 +5298,14 @@
.extra_data = (void *) &cp_mm_ion_pdata,
},
{
+ .id = ION_MM_FIRMWARE_HEAP_ID,
+ .type = ION_HEAP_TYPE_CARVEOUT,
+ .name = ION_MM_FIRMWARE_HEAP_NAME,
+ .size = MSM_ION_MM_FW_SIZE,
+ .memory_type = ION_SMI_TYPE,
+ .extra_data = (void *) &fw_co_ion_pdata,
+ },
+ {
.id = ION_CAMERA_HEAP_ID,
.type = ION_HEAP_TYPE_CARVEOUT,
.name = ION_CAMERA_HEAP_NAME,
@@ -5353,6 +5372,7 @@
{
#if defined(CONFIG_ION_MSM) && defined(CONFIG_MSM_MULTIMEDIA_USE_ION)
msm8x60_reserve_table[MEMTYPE_EBI1].size += MSM_ION_SF_SIZE;
+ msm8x60_reserve_table[MEMTYPE_SMI].size += MSM_ION_MM_FW_SIZE;
msm8x60_reserve_table[MEMTYPE_SMI].size += MSM_ION_MM_SIZE;
msm8x60_reserve_table[MEMTYPE_SMI].size += MSM_ION_MFC_SIZE;
msm8x60_reserve_table[MEMTYPE_EBI1].size += MSM_ION_CAMERA_SIZE;
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 295c7d9..68c5059 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -5313,6 +5313,13 @@
CLK_LOOKUP("core_clk", gfx3d_clk.c, "msm_iommu.9"),
CLK_LOOKUP("core_clk", gfx2d0_clk.c, "msm_iommu.10"),
CLK_LOOKUP("core_clk", gfx2d1_clk.c, "msm_iommu.11"),
+
+ CLK_LOOKUP("mdp_iommu_clk", mdp_axi_clk.c, "msm_vidc.0"),
+ CLK_LOOKUP("rot_iommu_clk", rot_axi_clk.c, "msm_vidc.0"),
+ CLK_LOOKUP("vcodec_iommu0_clk", vcodec_axi_a_clk.c, "msm_vidc.0"),
+ CLK_LOOKUP("vcodec_iommu1_clk", vcodec_axi_b_clk.c, "msm_vidc.0"),
+ CLK_LOOKUP("smmu_iface_clk", smmu_p_clk.c, "msm_vidc.0"),
+
CLK_LOOKUP("dfab_dsps_clk", dfab_dsps_clk.c, NULL),
CLK_LOOKUP("core_clk", dfab_usb_hs_clk.c, "msm_otg"),
CLK_LOOKUP("bus_clk", dfab_sdc1_clk.c, "msm_sdcc.1"),
diff --git a/arch/arm/mach-msm/idle_stats_device.c b/arch/arm/mach-msm/idle_stats_device.c
index 5c4b6a3..c28cf94 100644
--- a/arch/arm/mach-msm/idle_stats_device.c
+++ b/arch/arm/mach-msm/idle_stats_device.c
@@ -137,8 +137,7 @@
device->stats = &device->stats_vector[1];
else
device->stats = &device->stats_vector[0];
- device->stats->event = (stats->event &
- MSM_IDLE_STATS_EVENT_BUSY_TIMER_EXPIRED);
+ device->stats->event = 0;
device->stats->nr_collected = 0;
spin_unlock(&device->lock);
if (stats->nr_collected >= MSM_IDLE_STATS_NR_MAX_INTERVALS) {
@@ -217,7 +216,7 @@
device->remaining_time =
hrtimer_get_remaining(&device->busy_timer);
if (ktime_to_us(device->remaining_time) <= 0)
- device->remaining_time = us_to_ktime(1);
+ device->remaining_time = us_to_ktime(0);
} else {
device->remaining_time = us_to_ktime(0);
}
@@ -228,8 +227,11 @@
void msm_idle_stats_idle_end(struct msm_idle_stats_device *device,
struct msm_idle_pulse *pulse)
{
+ u32 idle_time = 0;
spin_lock(&device->lock);
if (ktime_to_us(device->idle_start) != 0) {
+ idle_time = ktime_to_us(ktime_get())
+ - ktime_to_us(device->idle_start);
device->idle_start = us_to_ktime(0);
msm_idle_stats_add_sample(device, pulse);
if (device->stats->event &
@@ -240,7 +242,10 @@
MSM_IDLE_STATS_EVENT_BUSY_TIMER_EXPIRED_RESET);
} else if (ktime_to_us(device->busy_timer_interval) > 0) {
ktime_t busy_timer = device->busy_timer_interval;
- if ((pulse->wait_interval > 0) &&
+ /* if it is serialized, it would be full busy,
+ * checking 80%
+ */
+ if ((pulse->wait_interval*5 >= idle_time*4) &&
(ktime_to_us(device->remaining_time) > 0) &&
(ktime_to_us(device->remaining_time) <
ktime_to_us(busy_timer)))
diff --git a/arch/arm/mach-msm/sdio_al_test.c b/arch/arm/mach-msm/sdio_al_test.c
index a71aae3..c97588f 100644
--- a/arch/arm/mach-msm/sdio_al_test.c
+++ b/arch/arm/mach-msm/sdio_al_test.c
@@ -146,7 +146,6 @@
SDIO_DIAG,
SDIO_DUN,
SDIO_SMEM,
- SDIO_CIQ,
SDIO_CSVT,
SDIO_MAX_CHANNELS
};
@@ -250,7 +249,7 @@
struct dentry *rpc_sender_rmnet_a2_perf_test;
struct dentry *all_channels_test;
struct dentry *host_sender_no_lp_diag_test;
- struct dentry *host_sender_no_lp_diag_rpc_ciq_test;
+ struct dentry *host_sender_no_lp_diag_rpc_test;
struct dentry *rmnet_small_packets_test;
struct dentry *rmnet_rtt_test;
struct dentry *csvt_rtt_test;
@@ -297,7 +296,6 @@
u8 *smem_buf;
uint32_t smem_counter;
- struct platform_device *ciq_app_pdev;
struct platform_device *csvt_app_pdev;
wait_queue_head_t wait_q;
@@ -1181,7 +1179,6 @@
set_params_a2_perf(test_ctx->test_ch_arr[SDIO_RMNT]);
set_params_a2_perf(test_ctx->test_ch_arr[SDIO_DUN]);
set_params_smem_test(test_ctx->test_ch_arr[SDIO_SMEM]);
- set_params_loopback_9k(test_ctx->test_ch_arr[SDIO_CIQ]);
set_params_a2_perf(test_ctx->test_ch_arr[SDIO_CSVT]);
ret = test_start();
@@ -1284,8 +1281,8 @@
.read = host_sender_no_lp_diag_test_read,
};
-/* HOST SENDER NO LP DIAG, RPC, CIQ TEST */
-static ssize_t host_sender_no_lp_diag_rpc_ciq_test_write(
+/* HOST SENDER NO LP DIAG, RPC TEST */
+static ssize_t host_sender_no_lp_diag_rpc_test_write(
struct file *file,
const char __user *buf,
size_t count,
@@ -1295,8 +1292,8 @@
int i = 0;
int number = -1;
- pr_info(TEST_MODULE_NAME "-- HOST SENDER NO LP FOR DIAG, RPC, "
- "CIQ TEST --");
+ pr_info(TEST_MODULE_NAME "-- HOST SENDER NO LP FOR DIAG, RPC "
+ "TEST --");
number = sdio_al_test_extract_number(buf, count);
@@ -1313,7 +1310,6 @@
sdio_al_test_initial_dev_and_chan(test_ctx);
set_params_8k_sender_no_lp(test_ctx->test_ch_arr[SDIO_DIAG]);
- set_params_8k_sender_no_lp(test_ctx->test_ch_arr[SDIO_CIQ]);
set_params_8k_sender_no_lp(test_ctx->test_ch_arr[SDIO_RPC]);
ret = test_start();
@@ -1325,7 +1321,7 @@
return count;
}
-static ssize_t host_sender_no_lp_diag_rpc_ciq_test_read(
+static ssize_t host_sender_no_lp_diag_rpc_test_read(
struct file *file,
char __user *buffer,
size_t count,
@@ -1334,7 +1330,7 @@
memset((void *)buffer, 0, count);
snprintf(buffer, count,
- "\nHOST_SENDER_NO_LP_DIAG_RPC_CIQ_TEST\n"
+ "\nHOST_SENDER_NO_LP_DIAG_RPC_TEST\n"
"===================================\n"
"Description:\n"
"TBD\n");
@@ -1347,10 +1343,10 @@
}
}
-const struct file_operations host_sender_no_lp_diag_rpc_ciq_test_ops = {
+const struct file_operations host_sender_no_lp_diag_rpc_test_ops = {
.open = sdio_al_test_open,
- .write = host_sender_no_lp_diag_rpc_ciq_test_write,
- .read = host_sender_no_lp_diag_rpc_ciq_test_read,
+ .write = host_sender_no_lp_diag_rpc_test_write,
+ .read = host_sender_no_lp_diag_rpc_test_read,
};
/* RMNET SMALL PACKETS TEST */
@@ -1774,7 +1770,6 @@
set_params_modem_reset(test_ctx->test_ch_arr[SDIO_RMNT]);
set_params_modem_reset(test_ctx->test_ch_arr[SDIO_DUN]);
- set_params_modem_reset(test_ctx->test_ch_arr[SDIO_CIQ]);
ret = test_start();
@@ -1844,7 +1839,6 @@
set_params_modem_reset(test_ctx->test_ch_arr[SDIO_DIAG]);
set_params_modem_reset(test_ctx->test_ch_arr[SDIO_RMNT]);
set_params_modem_reset(test_ctx->test_ch_arr[SDIO_DUN]);
- set_params_modem_reset(test_ctx->test_ch_arr[SDIO_CIQ]);
ret = test_start();
@@ -1910,7 +1904,6 @@
sdio_al_test_initial_dev_and_chan(test_ctx);
set_params_loopback_9k_close(ch_arr[SDIO_DIAG]);
- set_params_loopback_9k_close(ch_arr[SDIO_CIQ]);
set_params_loopback_9k_close(ch_arr[SDIO_RPC]);
set_params_loopback_9k_close(ch_arr[SDIO_SMEM]);
set_params_loopback_9k_close(ch_arr[SDIO_QMI]);
@@ -1924,9 +1917,8 @@
break;
pr_info(TEST_MODULE_NAME " -- correctness test for"
- "DIAG, CIQ ");
+ "DIAG ");
set_params_loopback_9k(ch_arr[SDIO_DIAG]);
- set_params_loopback_9k(ch_arr[SDIO_CIQ]);
ret = test_start();
@@ -1950,7 +1942,7 @@
"Description:\n"
"In this test the host sends 5k packets to the modem in the "
"following sequence: Send a random burst of packets on "
- "Diag, CIQ and Rmnet channels, read 0 or a random number "
+ "Diag and Rmnet channels, read 0 or a random number "
"of packets, close and re-open the channel. At the end of the "
"test, the channel is verified by running a loopback test\n\n"
"END OF DESCRIPTION\n");
@@ -2373,8 +2365,6 @@
set_params_lpm_test(test_ctx->test_ch_arr[SDIO_RPC],
SDIO_TEST_LPM_RANDOM, 0);
- set_params_lpm_test(test_ctx->test_ch_arr[SDIO_CIQ],
- SDIO_TEST_LPM_RANDOM, 0);
set_params_lpm_test(test_ctx->test_ch_arr[SDIO_DIAG],
SDIO_TEST_LPM_RANDOM, 0);
set_params_lpm_test(test_ctx->test_ch_arr[SDIO_QMI],
@@ -2403,7 +2393,7 @@
"Description:\n"
"In this test, the HOST and CLIENT "
"send messages to each other,\n"
- "random in time, over RPC, QMI, DIAG AND CIQ channels\n"
+ "random in time, over RPC, QMI AND DIAG channels\n"
"(i.e, on both SDIO devices).\n"
"All events are being recorded, and later on,\n"
"they are being analysed by the HOST and by the CLIENT,\n"
@@ -2545,12 +2535,12 @@
NULL,
&host_sender_no_lp_diag_test_ops);
- test_ctx->debug.host_sender_no_lp_diag_rpc_ciq_test =
- debugfs_create_file("170_host_sender_no_lp_diag_rpc_ciq_test",
+ test_ctx->debug.host_sender_no_lp_diag_rpc_test =
+ debugfs_create_file("170_host_sender_no_lp_diag_rpc_test",
S_IRUGO | S_IWUGO,
test_ctx->debug.debug_root,
NULL,
- &host_sender_no_lp_diag_rpc_ciq_test_ops);
+ &host_sender_no_lp_diag_rpc_test_ops);
test_ctx->debug.rmnet_small_packets_test =
debugfs_create_file("180_rmnet_small_packets_test",
@@ -2697,9 +2687,6 @@
else if (!strncmp(name, "SDIO_SMEM_TEST",
strnlen("SDIO_SMEM_TEST", TEST_CH_NAME_SIZE)))
return SDIO_SMEM;
- else if (!strncmp(name, "SDIO_CIQ_TEST",
- strnlen("SDIO_CIQ_TEST", TEST_CH_NAME_SIZE)))
- return SDIO_CIQ;
else if (!strncmp(name, "SDIO_CSVT_TEST",
strnlen("SDIO_CSVT_TEST", TEST_CH_NAME_SIZE)))
return SDIO_CSVT;
@@ -5829,7 +5816,6 @@
case SDIO_RPC:
tch->packet_length = 128; /* max is 2K*/
break;
- case SDIO_CIQ:
case SDIO_DIAG:
case SDIO_RMNT:
default:
@@ -6297,34 +6283,6 @@
}
-static int sdio_test_channel_ciq_probe(struct platform_device *pdev)
-{
- int ret = 0;
-
- if (!pdev)
- return -ENODEV;
-
- test_ctx->ciq_app_pdev = platform_device_alloc("SDIO_CIQ_TEST_APP", -1);
- ret = platform_device_add(test_ctx->ciq_app_pdev);
- if (ret) {
- pr_err(MODULE_NAME ":platform_device_add failed, "
- "ret=%d\n", ret);
- return ret;
- }
-
- return sdio_test_channel_probe(pdev);
-}
-
-static int sdio_test_channel_ciq_remove(struct platform_device *pdev)
-{
- if (!pdev)
- return -ENODEV;
-
- platform_device_unregister(test_ctx->ciq_app_pdev);
-
- return sdio_test_channel_remove(pdev);
-}
-
static int sdio_test_channel_csvt_probe(struct platform_device *pdev)
{
int ret = 0;
@@ -6408,15 +6366,6 @@
},
};
-static struct platform_driver sdio_ciq_drv = {
- .probe = sdio_test_channel_ciq_probe,
- .remove = sdio_test_channel_ciq_remove,
- .driver = {
- .name = "SDIO_CIQ_TEST",
- .owner = THIS_MODULE,
- },
-};
-
static struct platform_driver sdio_csvt_drv = {
.probe = sdio_test_channel_csvt_probe,
.remove = sdio_test_channel_csvt_remove,
@@ -6494,7 +6443,6 @@
platform_driver_register(&sdio_smem_drv);
platform_driver_register(&sdio_rmnt_drv);
platform_driver_register(&sdio_dun_drv);
- platform_driver_register(&sdio_ciq_drv);
platform_driver_register(&sdio_csvt_drv);
return ret;
@@ -6523,7 +6471,6 @@
platform_driver_unregister(&sdio_smem_drv);
platform_driver_unregister(&sdio_rmnt_drv);
platform_driver_unregister(&sdio_dun_drv);
- platform_driver_unregister(&sdio_ciq_drv);
platform_driver_unregister(&sdio_csvt_drv);
for (i = 0; i < SDIO_MAX_CHANNELS; i++) {
diff --git a/arch/arm/mach-msm/sdio_tty.c b/arch/arm/mach-msm/sdio_tty.c
index 2aaa41e..41bc270 100644
--- a/arch/arm/mach-msm/sdio_tty.c
+++ b/arch/arm/mach-msm/sdio_tty.c
@@ -30,11 +30,6 @@
#define MAX_SDIO_TTY_DEV_NAME_SIZE 25
/* Configurations per channel device */
-/* CIQ */
-#define SDIO_TTY_CIQ_DEV "sdio_tty_ciq_0"
-#define SDIO_TTY_CIQ_TEST_DEV "sdio_tty_ciq_test_0"
-#define SDIO_TTY_CH_CIQ "SDIO_CIQ"
-
/* CSVT */
#define SDIO_TTY_CSVT_DEV "sdio_tty_csvt_0"
#define SDIO_TTY_CSVT_TEST_DEV "sdio_tty_csvt_test_0"
@@ -48,15 +43,11 @@
};
enum sdio_tty_devices {
- SDIO_CIQ,
- SDIO_CIQ_TEST_APP,
SDIO_CSVT,
SDIO_CSVT_TEST_APP,
};
static const struct platform_device_id sdio_tty_id_table[] = {
- { "SDIO_CIQ", SDIO_CIQ },
- { "SDIO_CIQ_TEST_APP", SDIO_CIQ_TEST_APP },
{ "SDIO_CSVT", SDIO_CSVT },
{ "SDIO_CSVT_TEST_APP", SDIO_CSVT_TEST_APP },
{ },
@@ -95,8 +86,6 @@
* Enable sdio_tty debug messages
* By default the sdio_tty debug messages are turned off
*/
-static int ciq_debug_msg_on;
-module_param(ciq_debug_msg_on, int, 0);
static int csvt_debug_msg_on;
module_param(csvt_debug_msg_on, int, 0);
@@ -677,16 +666,6 @@
pr_debug(SDIO_TTY_MODULE_NAME ": %s for %s", __func__, pdev->name);
switch (device_id) {
- case SDIO_CIQ:
- device_name = SDIO_TTY_CIQ_DEV;
- channel_name = SDIO_TTY_CH_CIQ;
- debug_msg_on = ciq_debug_msg_on;
- break;
- case SDIO_CIQ_TEST_APP:
- device_name = SDIO_TTY_CIQ_TEST_DEV;
- channel_name = SDIO_TTY_CH_CIQ;
- debug_msg_on = ciq_debug_msg_on;
- break;
case SDIO_CSVT:
device_name = SDIO_TTY_CSVT_DEV;
channel_name = SDIO_TTY_CH_CSVT;
diff --git a/drivers/char/msm_rotator.c b/drivers/char/msm_rotator.c
index 529d9dd..bd48925 100644
--- a/drivers/char/msm_rotator.c
+++ b/drivers/char/msm_rotator.c
@@ -569,11 +569,18 @@
unsigned int in_paddr,
unsigned int out_paddr,
unsigned int use_imem,
- int new_session)
+ int new_session,
+ unsigned int out_chroma_paddr)
{
int bpp;
+ uint32_t dst_format;
- if (info->src.format != info->dst.format)
+ if (info->src.format == MDP_YCRYCB_H2V1)
+ dst_format = MDP_Y_CRCB_H2V1;
+ else
+ return -EINVAL;
+
+ if (info->dst.format != dst_format)
return -EINVAL;
bpp = get_bpp(info->src.format);
@@ -584,15 +591,25 @@
iowrite32(out_paddr +
((info->dst_y * info->dst.width) + info->dst_x),
MSM_ROTATOR_OUTP0_ADDR);
+ iowrite32(out_chroma_paddr +
+ ((info->dst_y * info->dst.width)/2 + info->dst_x),
+ MSM_ROTATOR_OUTP1_ADDR);
if (new_session) {
- iowrite32(info->src.width,
+ iowrite32(info->src.width * bpp,
MSM_ROTATOR_SRC_YSTRIDE1);
- iowrite32(info->dst.width,
- MSM_ROTATOR_OUT_YSTRIDE1);
+ if (info->rotations & MDP_ROT_90)
+ iowrite32(info->dst.width |
+ (info->dst.width*2) << 16,
+ MSM_ROTATOR_OUT_YSTRIDE1);
+ else
+ iowrite32(info->dst.width |
+ (info->dst.width) << 16,
+ MSM_ROTATOR_OUT_YSTRIDE1);
+
iowrite32(GET_PACK_PATTERN(CLR_Y, CLR_CR, CLR_Y, CLR_CB, 8),
MSM_ROTATOR_SRC_UNPACK_PATTERN1);
- iowrite32(GET_PACK_PATTERN(CLR_Y, CLR_CR, CLR_Y, CLR_CB, 8),
+ iowrite32(GET_PACK_PATTERN(0, 0, CLR_CR, CLR_CB, 8),
MSM_ROTATOR_OUT_PACK_PATTERN1);
iowrite32((1 << 18) | /* chroma sampling 1=H2V1 */
(ROTATIONS_TO_BITMASK(info->rotations) << 9) |
@@ -1036,7 +1053,8 @@
case MDP_YCRYCB_H2V1:
rc = msm_rotator_ycrycb(msm_rotator_dev->img_info[s],
in_paddr, out_paddr, use_imem,
- msm_rotator_dev->last_session_idx != s);
+ msm_rotator_dev->last_session_idx != s,
+ out_chroma_paddr);
break;
default:
rc = -EINVAL;
diff --git a/drivers/gpu/ion/ion.c b/drivers/gpu/ion/ion.c
index d436ef4..34145fe 100644
--- a/drivers/gpu/ion/ion.c
+++ b/drivers/gpu/ion/ion.c
@@ -77,7 +77,7 @@
struct rb_root handles;
struct mutex lock;
unsigned int heap_mask;
- const char *name;
+ char *name;
struct task_struct *task;
pid_t pid;
struct dentry *debug_root;
@@ -365,6 +365,11 @@
struct ion_device *dev = client->dev;
struct ion_buffer *buffer = NULL;
unsigned long secure_allocation = flags & ION_SECURE;
+ const unsigned int MAX_DBG_STR_LEN = 64;
+ char dbg_str[MAX_DBG_STR_LEN];
+ unsigned int dbg_str_idx = 0;
+
+ dbg_str[0] = '\0';
/*
* traverse the list of heaps available in this system in priority
@@ -387,11 +392,31 @@
buffer = ion_buffer_create(heap, dev, len, align, flags);
if (!IS_ERR_OR_NULL(buffer))
break;
+ if (dbg_str_idx < MAX_DBG_STR_LEN) {
+ unsigned int len_left = MAX_DBG_STR_LEN-dbg_str_idx-1;
+ int ret_value = snprintf(&dbg_str[dbg_str_idx],
+ len_left, "%s ", heap->name);
+ if (ret_value >= len_left) {
+ /* overflow */
+ dbg_str[MAX_DBG_STR_LEN-1] = '\0';
+ dbg_str_idx = MAX_DBG_STR_LEN;
+ } else if (ret_value >= 0) {
+ dbg_str_idx += ret_value;
+ } else {
+ /* error */
+ dbg_str[MAX_DBG_STR_LEN-1] = '\0';
+ }
+ }
}
mutex_unlock(&dev->lock);
- if (IS_ERR_OR_NULL(buffer))
+ if (IS_ERR_OR_NULL(buffer)) {
+ pr_debug("ION is unable to allocate 0x%x bytes (alignment: "
+ "0x%x) from heap(s) %sfor client %s with heap "
+ "mask 0x%x\n",
+ len, align, dbg_str, client->name, client->heap_mask);
return ERR_PTR(PTR_ERR(buffer));
+ }
handle = ion_handle_create(client, buffer);
@@ -984,6 +1009,7 @@
struct rb_node *parent = NULL;
struct ion_client *entry;
pid_t pid;
+ unsigned int name_len = strnlen(name, 64);
get_task_struct(current->group_leader);
task_lock(current->group_leader);
@@ -1017,7 +1043,17 @@
client->dev = dev;
client->handles = RB_ROOT;
mutex_init(&client->lock);
- client->name = name;
+
+ client->name = kzalloc(sizeof(name_len+1), GFP_KERNEL);
+ if (!client->name) {
+ put_task_struct(current->group_leader);
+ kfree(client);
+ return ERR_PTR(-ENOMEM);
+ } else {
+ strncpy(client->name, name, name_len);
+ client->name[name_len] = '\0';
+ }
+
client->heap_mask = heap_mask;
client->task = task;
client->pid = pid;
@@ -1083,6 +1119,7 @@
debugfs_remove_recursive(client->debug_root);
mutex_unlock(&dev->lock);
+ kfree(client->name);
kfree(client);
}
@@ -1568,30 +1605,8 @@
seq_printf(s, "%16.s %16u %16x\n", client->name, client->pid,
size);
}
- if (heap->ops->get_allocated) {
- seq_printf(s, "total bytes currently allocated: %lx\n",
- heap->ops->get_allocated(heap));
- }
- if (heap->ops->get_total) {
- seq_printf(s, "total heap size: %lx\n",
- heap->ops->get_total(heap));
- }
- if (heap->ops->get_alloc_cnt) {
- seq_printf(s, "allocation count: %lx\n",
- heap->ops->get_alloc_cnt(heap));
- }
- if (heap->ops->get_umap_cnt) {
- seq_printf(s, "umapping count: %lx\n",
- heap->ops->get_umap_cnt(heap));
- }
- if (heap->ops->get_kmap_cnt) {
- seq_printf(s, "kmapping count: %lx\n",
- heap->ops->get_kmap_cnt(heap));
- }
- if (heap->ops->get_secured) {
- seq_printf(s, "secured heap: %s\n",
- heap->ops->get_secured(heap) ? "Yes" : "No");
- }
+ if (heap->ops->print_debug)
+ heap->ops->print_debug(heap, s);
return 0;
}
diff --git a/drivers/gpu/ion/ion_carveout_heap.c b/drivers/gpu/ion/ion_carveout_heap.c
index 1c35f5c..ad0c7b1 100644
--- a/drivers/gpu/ion/ion_carveout_heap.c
+++ b/drivers/gpu/ion/ion_carveout_heap.c
@@ -25,6 +25,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/iommu.h>
+#include <linux/seq_file.h>
#include "ion_priv.h"
#include <mach/iommu_domains.h>
@@ -131,28 +132,55 @@
vfree(buffer->sglist);
}
+static int ion_carveout_request_region(struct ion_carveout_heap *carveout_heap)
+{
+ int ret_value = 0;
+ if (atomic_inc_return(&carveout_heap->map_count) == 1) {
+ if (carveout_heap->request_region) {
+ ret_value = carveout_heap->request_region(
+ carveout_heap->bus_id);
+ if (ret_value) {
+ pr_err("Unable to request SMI region");
+ atomic_dec(&carveout_heap->map_count);
+ }
+ }
+ }
+ return ret_value;
+}
+
+static int ion_carveout_release_region(struct ion_carveout_heap *carveout_heap)
+{
+ int ret_value = 0;
+ if (atomic_dec_and_test(&carveout_heap->map_count)) {
+ if (carveout_heap->release_region) {
+ ret_value = carveout_heap->release_region(
+ carveout_heap->bus_id);
+ if (ret_value)
+ pr_err("Unable to release SMI region");
+ }
+ }
+ return ret_value;
+}
+
void *ion_carveout_heap_map_kernel(struct ion_heap *heap,
struct ion_buffer *buffer,
unsigned long flags)
{
struct ion_carveout_heap *carveout_heap =
container_of(heap, struct ion_carveout_heap, heap);
+ void *ret_value;
- if (atomic_inc_return(&carveout_heap->map_count) == 1) {
- if (carveout_heap->request_region) {
- int ret = carveout_heap->request_region(
- carveout_heap->bus_id);
- if (ret) {
- pr_err("Unable to request SMI region");
- atomic_dec(&carveout_heap->map_count);
- return NULL;
- }
- }
- }
+ if (ion_carveout_request_region(carveout_heap))
+ return NULL;
+
if (ION_IS_CACHED(flags))
- return ioremap_cached(buffer->priv_phys, buffer->size);
+ ret_value = ioremap_cached(buffer->priv_phys, buffer->size);
else
- return ioremap(buffer->priv_phys, buffer->size);
+ ret_value = ioremap(buffer->priv_phys, buffer->size);
+
+ if (!ret_value)
+ ion_carveout_release_region(carveout_heap);
+ return ret_value;
}
void ion_carveout_heap_unmap_kernel(struct ion_heap *heap,
@@ -164,15 +192,7 @@
__arch_iounmap(buffer->vaddr);
buffer->vaddr = NULL;
- if (atomic_dec_and_test(&carveout_heap->map_count)) {
- if (carveout_heap->release_region) {
- int ret = carveout_heap->release_region(
- carveout_heap->bus_id);
- if (ret)
- pr_err("Unable to release SMI region");
- }
- }
-
+ ion_carveout_release_region(carveout_heap);
return;
}
@@ -181,29 +201,25 @@
{
struct ion_carveout_heap *carveout_heap =
container_of(heap, struct ion_carveout_heap, heap);
+ int ret_value = 0;
- if (atomic_inc_return(&carveout_heap->map_count) == 1) {
- if (carveout_heap->request_region) {
- int ret = carveout_heap->request_region(
- carveout_heap->bus_id);
- if (ret) {
- pr_err("Unable to request SMI region");
- atomic_dec(&carveout_heap->map_count);
- return -EINVAL;
- }
- }
- }
+ if (ion_carveout_request_region(carveout_heap))
+ return -EINVAL;
if (ION_IS_CACHED(flags))
- return remap_pfn_range(vma, vma->vm_start,
+ ret_value = remap_pfn_range(vma, vma->vm_start,
__phys_to_pfn(buffer->priv_phys) + vma->vm_pgoff,
vma->vm_end - vma->vm_start,
vma->vm_page_prot);
else
- return remap_pfn_range(vma, vma->vm_start,
+ ret_value = remap_pfn_range(vma, vma->vm_start,
__phys_to_pfn(buffer->priv_phys) + vma->vm_pgoff,
vma->vm_end - vma->vm_start,
pgprot_noncached(vma->vm_page_prot));
+
+ if (ret_value)
+ ion_carveout_release_region(carveout_heap);
+ return ret_value;
}
void ion_carveout_heap_unmap_user(struct ion_heap *heap,
@@ -211,15 +227,7 @@
{
struct ion_carveout_heap *carveout_heap =
container_of(heap, struct ion_carveout_heap, heap);
-
- if (atomic_dec_and_test(&carveout_heap->map_count)) {
- if (carveout_heap->release_region) {
- int ret = carveout_heap->release_region(
- carveout_heap->bus_id);
- if (ret)
- pr_err("Unable to release SMI region");
- }
- }
+ ion_carveout_release_region(carveout_heap);
}
int ion_carveout_cache_ops(struct ion_heap *heap, struct ion_buffer *buffer,
@@ -248,20 +256,16 @@
return 0;
}
-static unsigned long ion_carveout_get_allocated(struct ion_heap *heap)
+static int ion_carveout_print_debug(struct ion_heap *heap, struct seq_file *s)
{
struct ion_carveout_heap *carveout_heap =
container_of(heap, struct ion_carveout_heap, heap);
- return carveout_heap->allocated_bytes;
-}
+ seq_printf(s, "total bytes currently allocated: %lx\n",
+ carveout_heap->allocated_bytes);
+ seq_printf(s, "total heap size: %lx\n", carveout_heap->total_size);
-static unsigned long ion_carveout_get_total(struct ion_heap *heap)
-{
- struct ion_carveout_heap *carveout_heap =
- container_of(heap, struct ion_carveout_heap, heap);
-
- return carveout_heap->total_size;
+ return 0;
}
int ion_carveout_heap_map_iommu(struct ion_buffer *buffer,
@@ -377,8 +381,7 @@
.map_dma = ion_carveout_heap_map_dma,
.unmap_dma = ion_carveout_heap_unmap_dma,
.cache_op = ion_carveout_cache_ops,
- .get_allocated = ion_carveout_get_allocated,
- .get_total = ion_carveout_get_total,
+ .print_debug = ion_carveout_print_debug,
.map_iommu = ion_carveout_heap_map_iommu,
.unmap_iommu = ion_carveout_heap_unmap_iommu,
};
diff --git a/drivers/gpu/ion/ion_cp_heap.c b/drivers/gpu/ion/ion_cp_heap.c
index 5737d21..16ace6f 100644
--- a/drivers/gpu/ion/ion_cp_heap.c
+++ b/drivers/gpu/ion/ion_cp_heap.c
@@ -25,6 +25,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/memory_alloc.h>
+#include <linux/seq_file.h>
#include <mach/msm_memtypes.h>
#include <mach/scm.h>
#include "ion_priv.h"
@@ -39,6 +40,8 @@
* @base: the base address of the memory pool.
* @permission_type: Identifier for the memory used by SCM for protecting
* and unprotecting memory.
+ * @secure_base: Base address used when securing a heap that is shared.
+ * @secure_size: Size used when securing a heap that is shared.
* @lock: mutex to protect shared access.
* @heap_secured: Identifies the heap_id as secure or not.
* @allocated_bytes: the total number of allocated bytes from the pool.
@@ -59,6 +62,8 @@
struct gen_pool *pool;
ion_phys_addr_t base;
unsigned int permission_type;
+ ion_phys_addr_t secure_base;
+ size_t secure_size;
struct mutex lock;
unsigned int heap_secured;
unsigned long allocated_bytes;
@@ -94,14 +99,14 @@
int ret_value = 0;
if (cp_heap->heap_secured == NON_SECURED_HEAP) {
- int ret_value = ion_cp_protect_mem(cp_heap->base,
- cp_heap->total_size, cp_heap->permission_type);
+ int ret_value = ion_cp_protect_mem(cp_heap->secure_base,
+ cp_heap->secure_size, cp_heap->permission_type);
if (ret_value) {
pr_err("Failed to protect memory for heap %s - "
- "error code: %d", heap->name, ret_value);
+ "error code: %d\n", heap->name, ret_value);
} else {
cp_heap->heap_secured = SECURED_HEAP;
- pr_debug("Protected heap %s @ 0x%x",
+ pr_debug("Protected heap %s @ 0x%x\n",
heap->name, (unsigned int) cp_heap->base);
}
}
@@ -119,14 +124,14 @@
if (cp_heap->heap_secured == SECURED_HEAP) {
int error_code = ion_cp_unprotect_mem(
- cp_heap->base, cp_heap->total_size,
+ cp_heap->secure_base, cp_heap->secure_size,
cp_heap->permission_type);
if (error_code) {
pr_err("Failed to un-protect memory for heap %s - "
- "error code: %d", heap->name, error_code);
+ "error code: %d\n", heap->name, error_code);
} else {
cp_heap->heap_secured = NON_SECURED_HEAP;
- pr_debug("Un-protected heap %s @ 0x%x", heap->name,
+ pr_debug("Un-protected heap %s @ 0x%x\n", heap->name,
(unsigned int) cp_heap->base);
}
}
@@ -148,14 +153,14 @@
if (!secure_allocation && cp_heap->heap_secured == SECURED_HEAP) {
mutex_unlock(&cp_heap->lock);
pr_err("ION cannot allocate un-secure memory from protected"
- " heap %s", heap->name);
+ " heap %s\n", heap->name);
return ION_CP_ALLOCATE_FAIL;
}
if (secure_allocation && cp_heap->umap_count > 0) {
mutex_unlock(&cp_heap->lock);
pr_err("ION cannot allocate secure memory from heap with "
- "outstanding user space mappings for heap %s",
+ "outstanding user space mappings for heap %s\n",
heap->name);
return ION_CP_ALLOCATE_FAIL;
}
@@ -178,7 +183,7 @@
cp_heap->allocated_bytes) > size)
pr_debug("%s: heap %s has enough memory (%lx) but"
" the allocation of size %lx still failed."
- " Memory is probably fragmented.",
+ " Memory is probably fragmented.\n",
__func__, heap->name,
cp_heap->total_size -
cp_heap->allocated_bytes, size);
@@ -328,7 +333,7 @@
mutex_lock(&cp_heap->lock);
if (cp_heap->heap_secured == SECURED_HEAP && ION_IS_CACHED(flags)) {
- pr_err("Unable to map secured heap %s as cached", heap->name);
+ pr_err("Unable to map secured heap %s as cached\n", heap->name);
mutex_unlock(&cp_heap->lock);
return NULL;
}
@@ -450,77 +455,34 @@
return 0;
}
-static unsigned long ion_cp_get_allocated(struct ion_heap *heap)
+static int ion_cp_print_debug(struct ion_heap *heap, struct seq_file *s)
{
- struct ion_cp_heap *cp_heap =
- container_of(heap, struct ion_cp_heap, heap);
- unsigned long allocated_bytes;
-
- mutex_lock(&cp_heap->lock);
- allocated_bytes = cp_heap->allocated_bytes;
- mutex_unlock(&cp_heap->lock);
-
- return allocated_bytes;
-}
-
-static unsigned long ion_cp_get_total(struct ion_heap *heap)
-{
- struct ion_cp_heap *cp_heap =
- container_of(heap, struct ion_cp_heap, heap);
-
- return cp_heap->total_size;
-}
-
-static unsigned long ion_cp_get_umap_count(struct ion_heap *heap)
-{
- struct ion_cp_heap *cp_heap =
- container_of(heap, struct ion_cp_heap, heap);
- unsigned long umap_count;
-
- mutex_lock(&cp_heap->lock);
- umap_count = cp_heap->umap_count;
- mutex_unlock(&cp_heap->lock);
-
- return umap_count;
-}
-
-static unsigned long ion_cp_get_kmap_count(struct ion_heap *heap)
-{
- struct ion_cp_heap *cp_heap =
- container_of(heap, struct ion_cp_heap, heap);
- unsigned long kmap_count;
-
- mutex_lock(&cp_heap->lock);
- kmap_count = cp_heap->kmap_count;
- mutex_unlock(&cp_heap->lock);
-
- return kmap_count;
-}
-
-static unsigned long ion_cp_get_alloc_count(struct ion_heap *heap)
-{
- struct ion_cp_heap *cp_heap =
- container_of(heap, struct ion_cp_heap, heap);
+ unsigned long total_alloc;
+ unsigned long total_size;
unsigned long alloc_count;
-
- mutex_lock(&cp_heap->lock);
- alloc_count = cp_heap->alloc_count;
- mutex_unlock(&cp_heap->lock);
-
- return alloc_count;
-}
-
-static unsigned long ion_cp_get_secured(struct ion_heap *heap)
-{
+ unsigned long umap_count;
+ unsigned long kmap_count;
+ unsigned long heap_secured;
struct ion_cp_heap *cp_heap =
container_of(heap, struct ion_cp_heap, heap);
- unsigned long secured_heap = 0;
mutex_lock(&cp_heap->lock);
- secured_heap = cp_heap->heap_secured == SECURED_HEAP;
+ total_alloc = cp_heap->allocated_bytes;
+ total_size = cp_heap->total_size;
+ alloc_count = cp_heap->alloc_count;
+ umap_count = cp_heap->umap_count;
+ kmap_count = cp_heap->kmap_count;
+ heap_secured = cp_heap->heap_secured == SECURED_HEAP;
mutex_unlock(&cp_heap->lock);
- return secured_heap;
+ seq_printf(s, "total bytes currently allocated: %lx\n", total_alloc);
+ seq_printf(s, "total heap size: %lx\n", total_size);
+ seq_printf(s, "allocation count: %lx\n", alloc_count);
+ seq_printf(s, "umapping count: %lx\n", umap_count);
+ seq_printf(s, "kmapping count: %lx\n", kmap_count);
+ seq_printf(s, "secured heap: %s\n", heap_secured ? "Yes" : "No");
+
+ return 0;
}
int ion_cp_secure_heap(struct ion_heap *heap)
@@ -557,32 +519,11 @@
.map_dma = ion_cp_heap_map_dma,
.unmap_dma = ion_cp_heap_unmap_dma,
.cache_op = ion_cp_cache_ops,
- .get_allocated = ion_cp_get_allocated,
- .get_total = ion_cp_get_total,
- .get_umap_cnt = ion_cp_get_umap_count,
- .get_kmap_cnt = ion_cp_get_kmap_count,
- .get_alloc_cnt = ion_cp_get_alloc_count,
- .get_secured = ion_cp_get_secured,
+ .print_debug = ion_cp_print_debug,
.secure_heap = ion_cp_secure_heap,
.unsecure_heap = ion_cp_unsecure_heap,
};
-static unsigned long ion_cp_get_base(unsigned long size, int memory_type)
-{
- switch (memory_type) {
- case ION_EBI_TYPE:
- return allocate_contiguous_ebi_nomap(size, PAGE_SIZE);
- break;
- case ION_SMI_TYPE:
- return allocate_contiguous_memory_nomap(size, MEMTYPE_SMI,
- PAGE_SIZE);
- break;
- default:
- return 0;
- }
-}
-
-
struct ion_heap *ion_cp_heap_create(struct ion_platform_heap *heap_data)
{
struct ion_cp_heap *cp_heap;
@@ -592,15 +533,6 @@
if (!cp_heap)
return ERR_PTR(-ENOMEM);
- heap_data->base = ion_cp_get_base(heap_data->size,
- heap_data->memory_type);
- if (!heap_data->base) {
- pr_err("%s: could not get memory for heap %s"
- " (id %x)\n", __func__, heap_data->name,
- heap_data->id);
- goto free_heap;
- }
-
mutex_init(&cp_heap->lock);
cp_heap->pool = gen_pool_create(12, -1);
@@ -620,10 +552,16 @@
cp_heap->heap.ops = &cp_heap_ops;
cp_heap->heap.type = ION_HEAP_TYPE_CP;
cp_heap->heap_secured = NON_SECURED_HEAP;
+ cp_heap->secure_base = cp_heap->base;
+ cp_heap->secure_size = heap_data->size;
if (heap_data->extra_data) {
struct ion_cp_heap_pdata *extra_data =
heap_data->extra_data;
cp_heap->permission_type = extra_data->permission_type;
+ if (extra_data->secure_size) {
+ cp_heap->secure_base = extra_data->secure_base;
+ cp_heap->secure_size = extra_data->secure_size;
+ }
if (extra_data->setup_region)
cp_heap->bus_id = extra_data->setup_region();
if (extra_data->request_region)
@@ -664,7 +602,7 @@
unsigned int end;
unsigned int permission_type;
unsigned char lock;
-};
+} __attribute__ ((__packed__));
static int ion_cp_protect_mem(unsigned int phy_base, unsigned int size,
diff --git a/drivers/gpu/ion/ion_priv.h b/drivers/gpu/ion/ion_priv.h
index 98709b6..78dfe6e 100644
--- a/drivers/gpu/ion/ion_priv.h
+++ b/drivers/gpu/ion/ion_priv.h
@@ -139,8 +139,6 @@
int (*cache_op)(struct ion_heap *heap, struct ion_buffer *buffer,
void *vaddr, unsigned int offset,
unsigned int length, unsigned int cmd);
- unsigned long (*get_allocated)(struct ion_heap *heap);
- unsigned long (*get_total)(struct ion_heap *heap);
int (*map_iommu)(struct ion_buffer *buffer,
struct ion_iommu_map *map_data,
unsigned int domain_num,
@@ -149,10 +147,7 @@
unsigned long iova_length,
unsigned long flags);
void (*unmap_iommu)(struct ion_iommu_map *data);
- unsigned long (*get_umap_cnt)(struct ion_heap *heap);
- unsigned long (*get_kmap_cnt)(struct ion_heap *heap);
- unsigned long (*get_alloc_cnt)(struct ion_heap *heap);
- unsigned long (*get_secured)(struct ion_heap *heap);
+ int (*print_debug)(struct ion_heap *heap, struct seq_file *s);
int (*secure_heap)(struct ion_heap *heap);
int (*unsecure_heap)(struct ion_heap *heap);
};
diff --git a/drivers/gpu/ion/ion_system_heap.c b/drivers/gpu/ion/ion_system_heap.c
index 5957658..316740e 100644
--- a/drivers/gpu/ion/ion_system_heap.c
+++ b/drivers/gpu/ion/ion_system_heap.c
@@ -2,7 +2,7 @@
* drivers/gpu/ion/ion_system_heap.c
*
* Copyright (C) 2011 Google, Inc.
- * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -22,6 +22,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/iommu.h>
+#include <linux/seq_file.h>
#include <mach/iommu_domains.h>
#include "ion_priv.h"
#include <mach/memory.h>
@@ -189,9 +190,12 @@
return 0;
}
-static unsigned long ion_system_heap_get_allocated(struct ion_heap *heap)
+static int ion_system_print_debug(struct ion_heap *heap, struct seq_file *s)
{
- return atomic_read(&system_heap_allocated);
+ seq_printf(s, "total bytes currently allocated: %lx\n",
+ (unsigned long) atomic_read(&system_heap_allocated));
+
+ return 0;
}
int ion_system_heap_map_iommu(struct ion_buffer *buffer,
@@ -274,7 +278,7 @@
.unmap_kernel = ion_system_heap_unmap_kernel,
.map_user = ion_system_heap_map_user,
.cache_op = ion_system_heap_cache_ops,
- .get_allocated = ion_system_heap_get_allocated,
+ .print_debug = ion_system_print_debug,
.map_iommu = ion_system_heap_map_iommu,
.unmap_iommu = ion_system_heap_unmap_iommu,
};
@@ -387,9 +391,13 @@
return 0;
}
-static unsigned long ion_system_contig_heap_get_allocated(struct ion_heap *heap)
+static int ion_system_contig_print_debug(struct ion_heap *heap,
+ struct seq_file *s)
{
- return atomic_read(&system_contig_heap_allocated);
+ seq_printf(s, "total bytes currently allocated: %lx\n",
+ (unsigned long) atomic_read(&system_contig_heap_allocated));
+
+ return 0;
}
int ion_system_contig_heap_map_iommu(struct ion_buffer *buffer,
@@ -470,7 +478,7 @@
.unmap_kernel = ion_system_heap_unmap_kernel,
.map_user = ion_system_contig_heap_map_user,
.cache_op = ion_system_contig_heap_cache_ops,
- .get_allocated = ion_system_contig_heap_get_allocated,
+ .print_debug = ion_system_contig_print_debug,
.map_iommu = ion_system_contig_heap_map_iommu,
.unmap_iommu = ion_system_heap_unmap_iommu,
};
diff --git a/drivers/gpu/ion/msm/msm_ion.c b/drivers/gpu/ion/msm/msm_ion.c
index 3df2b53..f71f514 100644
--- a/drivers/gpu/ion/msm/msm_ion.c
+++ b/drivers/gpu/ion/msm/msm_ion.c
@@ -42,21 +42,119 @@
}
EXPORT_SYMBOL(msm_ion_unsecure_heap);
-static unsigned long msm_ion_get_base(unsigned long size, int memory_type)
+static unsigned long msm_ion_get_base(unsigned long size, int memory_type,
+ unsigned int align)
{
switch (memory_type) {
case ION_EBI_TYPE:
- return allocate_contiguous_ebi_nomap(size, PAGE_SIZE);
+ return allocate_contiguous_ebi_nomap(size, align);
break;
case ION_SMI_TYPE:
return allocate_contiguous_memory_nomap(size, MEMTYPE_SMI,
- PAGE_SIZE);
+ align);
break;
default:
+ pr_err("%s: Unknown memory type %d\n", __func__, memory_type);
return 0;
}
}
+static struct ion_platform_heap *find_heap(const struct ion_platform_heap
+ heap_data[],
+ unsigned int nr_heaps,
+ int heap_id)
+{
+ unsigned int i;
+ for (i = 0; i < nr_heaps; ++i) {
+ const struct ion_platform_heap *heap = &heap_data[i];
+ if (heap->id == heap_id)
+ return (struct ion_platform_heap *) heap;
+ }
+ return 0;
+}
+
+static void allocate_co_memory(struct ion_platform_heap *heap,
+ struct ion_platform_heap heap_data[],
+ unsigned int nr_heaps)
+{
+ struct ion_co_heap_pdata *co_heap_data =
+ (struct ion_co_heap_pdata *) heap->extra_data;
+ if (co_heap_data->adjacent_mem_id != INVALID_HEAP_ID) {
+ struct ion_platform_heap *shared_heap =
+ find_heap(heap_data, nr_heaps,
+ co_heap_data->adjacent_mem_id);
+ if (shared_heap) {
+ struct ion_cp_heap_pdata *cp_data =
+ (struct ion_cp_heap_pdata *) shared_heap->extra_data;
+ heap->base = msm_ion_get_base(
+ heap->size + shared_heap->size,
+ shared_heap->memory_type,
+ co_heap_data->align);
+ if (heap->base) {
+ shared_heap->base = heap->base + heap->size;
+ cp_data->secure_base = heap->base;
+ cp_data->secure_size =
+ heap->size + shared_heap->size;
+ } else {
+ pr_err("%s: could not get memory for heap %s "
+ "(id %x)\n", __func__, heap->name, heap->id);
+ }
+
+ }
+ }
+}
+
+/* Fixup heaps in board file to support two heaps being adjacent to each other.
+ * A flag (adjacent_mem_id) in the platform data tells us that the heap phy
+ * memory location must be adjacent to the specified heap. We do this by
+ * carving out memory for both heaps and then splitting up the memory to the
+ * two heaps. The heap specifying the "adjacent_mem_id" get the base of the
+ * memory while heap specified in "adjacent_mem_id" get base+size as its
+ * base address.
+ * Note: Modifies platform data and allocates memory.
+ */
+static void msm_ion_heap_fixup(struct ion_platform_heap heap_data[],
+ unsigned int nr_heaps)
+{
+ unsigned int i;
+
+ for (i = 0; i < nr_heaps; i++) {
+ struct ion_platform_heap *heap = &heap_data[i];
+ if (!heap->base && heap->type == ION_HEAP_TYPE_CARVEOUT) {
+ if (heap->extra_data)
+ allocate_co_memory(heap, heap_data, nr_heaps);
+ }
+ }
+}
+
+static void msm_ion_allocate(struct ion_platform_heap *heap)
+{
+
+ if (!heap->base && heap->extra_data) {
+ unsigned int align = 0;
+ switch (heap->type) {
+ case ION_HEAP_TYPE_CARVEOUT:
+ align =
+ ((struct ion_co_heap_pdata *) heap->extra_data)->align;
+ break;
+ case ION_HEAP_TYPE_CP:
+ align =
+ ((struct ion_cp_heap_pdata *) heap->extra_data)->align;
+ break;
+ default:
+ break;
+ }
+ if (align) {
+ heap->base = msm_ion_get_base(heap->size,
+ heap->memory_type,
+ align);
+ if (!heap->base)
+ pr_err("%s: could not get memory for heap %s "
+ "(id %x)\n", __func__, heap->name, heap->id);
+ }
+ }
+}
+
static int msm_ion_probe(struct platform_device *pdev)
{
struct ion_platform_data *pdata = pdev->dev.platform_data;
@@ -78,28 +176,26 @@
goto freeheaps;
}
+ msm_ion_heap_fixup(pdata->heaps, num_heaps);
+
/* create the heaps as specified in the board file */
for (i = 0; i < num_heaps; i++) {
struct ion_platform_heap *heap_data = &pdata->heaps[i];
-
- if (heap_data->type == ION_HEAP_TYPE_CARVEOUT) {
- heap_data->base = msm_ion_get_base(heap_data->size,
- heap_data->memory_type);
- if (!heap_data->base) {
- pr_err("%s: could not get memory for heap %s"
- " (id %x)\n", __func__, heap_data->name,
- heap_data->id);
- continue;
- }
- }
+ msm_ion_allocate(heap_data);
heaps[i] = ion_heap_create(heap_data);
if (IS_ERR_OR_NULL(heaps[i])) {
- pr_err("%s: could not create ion heap %s"
- " (id %x)\n", __func__, heap_data->name,
- heap_data->id);
heaps[i] = 0;
continue;
+ } else {
+ if (heap_data->size)
+ pr_info("ION heap %s created at %lx "
+ "with size %x\n", heap_data->name,
+ heap_data->base,
+ heap_data->size);
+ else
+ pr_info("ION heap %s created\n",
+ heap_data->name);
}
ion_device_add_heap(idev, heaps[i]);
diff --git a/drivers/gpu/msm/Makefile b/drivers/gpu/msm/Makefile
index 39a7b04..908b63d 100644
--- a/drivers/gpu/msm/Makefile
+++ b/drivers/gpu/msm/Makefile
@@ -14,7 +14,7 @@
msm_kgsl_core-$(CONFIG_MSM_KGSL_CFF_DUMP) += kgsl_cffdump.o
msm_kgsl_core-$(CONFIG_MSM_KGSL_DRM) += kgsl_drm.o
msm_kgsl_core-$(CONFIG_MSM_SCM) += kgsl_pwrscale_trustzone.o
-msm_kgsl_core-$(CONFIG_MSM_SLEEP_STATS) += kgsl_pwrscale_idlestats.o
+msm_kgsl_core-$(CONFIG_MSM_SLEEP_STATS_DEVICE) += kgsl_pwrscale_idlestats.o
msm_adreno-y += \
adreno_ringbuffer.o \
diff --git a/drivers/gpu/msm/kgsl_pwrscale.c b/drivers/gpu/msm/kgsl_pwrscale.c
index 55e5383..4c9a239 100644
--- a/drivers/gpu/msm/kgsl_pwrscale.c
+++ b/drivers/gpu/msm/kgsl_pwrscale.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -42,7 +42,7 @@
#ifdef CONFIG_MSM_SCM
&kgsl_pwrscale_policy_tz,
#endif
-#ifdef CONFIG_MSM_SLEEP_STATS
+#ifdef CONFIG_MSM_SLEEP_STATS_DEVICE
&kgsl_pwrscale_policy_idlestats,
#endif
NULL
diff --git a/drivers/mfd/pm8038-core.c b/drivers/mfd/pm8038-core.c
index c90ea16..8a9d289 100644
--- a/drivers/mfd/pm8038-core.c
+++ b/drivers/mfd/pm8038-core.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -21,6 +21,7 @@
#include <linux/msm_ssbi.h>
#include <linux/mfd/core.h>
#include <linux/mfd/pm8xxx/pm8038.h>
+#include <linux/mfd/pm8xxx/pm8921.h>
#include <linux/mfd/pm8xxx/core.h>
#include <linux/mfd/pm8xxx/regulator.h>
@@ -155,6 +156,63 @@
.num_resources = ARRAY_SIZE(adc_cell_resources),
};
+static const struct resource charger_cell_resources[] __devinitconst = {
+ SINGLE_IRQ_RESOURCE("USBIN_VALID_IRQ", PM8921_USBIN_VALID_IRQ),
+ SINGLE_IRQ_RESOURCE("USBIN_OV_IRQ", PM8921_USBIN_OV_IRQ),
+ SINGLE_IRQ_RESOURCE("BATT_INSERTED_IRQ", PM8921_BATT_INSERTED_IRQ),
+ SINGLE_IRQ_RESOURCE("VBATDET_LOW_IRQ", PM8921_VBATDET_LOW_IRQ),
+ SINGLE_IRQ_RESOURCE("USBIN_UV_IRQ", PM8921_USBIN_UV_IRQ),
+ SINGLE_IRQ_RESOURCE("VBAT_OV_IRQ", PM8921_VBAT_OV_IRQ),
+ SINGLE_IRQ_RESOURCE("CHGWDOG_IRQ", PM8921_CHGWDOG_IRQ),
+ SINGLE_IRQ_RESOURCE("VCP_IRQ", PM8921_VCP_IRQ),
+ SINGLE_IRQ_RESOURCE("ATCDONE_IRQ", PM8921_ATCDONE_IRQ),
+ SINGLE_IRQ_RESOURCE("ATCFAIL_IRQ", PM8921_ATCFAIL_IRQ),
+ SINGLE_IRQ_RESOURCE("CHGDONE_IRQ", PM8921_CHGDONE_IRQ),
+ SINGLE_IRQ_RESOURCE("CHGFAIL_IRQ", PM8921_CHGFAIL_IRQ),
+ SINGLE_IRQ_RESOURCE("CHGSTATE_IRQ", PM8921_CHGSTATE_IRQ),
+ SINGLE_IRQ_RESOURCE("LOOP_CHANGE_IRQ", PM8921_LOOP_CHANGE_IRQ),
+ SINGLE_IRQ_RESOURCE("FASTCHG_IRQ", PM8921_FASTCHG_IRQ),
+ SINGLE_IRQ_RESOURCE("TRKLCHG_IRQ", PM8921_TRKLCHG_IRQ),
+ SINGLE_IRQ_RESOURCE("BATT_REMOVED_IRQ", PM8921_BATT_REMOVED_IRQ),
+ SINGLE_IRQ_RESOURCE("BATTTEMP_HOT_IRQ", PM8921_BATTTEMP_HOT_IRQ),
+ SINGLE_IRQ_RESOURCE("CHGHOT_IRQ", PM8921_CHGHOT_IRQ),
+ SINGLE_IRQ_RESOURCE("BATTTEMP_COLD_IRQ", PM8921_BATTTEMP_COLD_IRQ),
+ SINGLE_IRQ_RESOURCE("CHG_GONE_IRQ", PM8921_CHG_GONE_IRQ),
+ SINGLE_IRQ_RESOURCE("BAT_TEMP_OK_IRQ", PM8921_BAT_TEMP_OK_IRQ),
+ SINGLE_IRQ_RESOURCE("COARSE_DET_LOW_IRQ", PM8921_COARSE_DET_LOW_IRQ),
+ SINGLE_IRQ_RESOURCE("VDD_LOOP_IRQ", PM8921_VDD_LOOP_IRQ),
+ SINGLE_IRQ_RESOURCE("VREG_OV_IRQ", PM8921_VREG_OV_IRQ),
+ SINGLE_IRQ_RESOURCE("VBATDET_IRQ", PM8921_VBATDET_IRQ),
+ SINGLE_IRQ_RESOURCE("BATFET_IRQ", PM8921_BATFET_IRQ),
+ SINGLE_IRQ_RESOURCE("PSI_IRQ", PM8921_PSI_IRQ),
+ SINGLE_IRQ_RESOURCE("DCIN_VALID_IRQ", PM8921_DCIN_VALID_IRQ),
+ SINGLE_IRQ_RESOURCE("DCIN_OV_IRQ", PM8921_DCIN_OV_IRQ),
+ SINGLE_IRQ_RESOURCE("DCIN_UV_IRQ", PM8921_DCIN_UV_IRQ),
+};
+
+static const struct resource bms_cell_resources[] __devinitconst = {
+ SINGLE_IRQ_RESOURCE("PM8921_BMS_SBI_WRITE_OK", PM8921_BMS_SBI_WRITE_OK),
+ SINGLE_IRQ_RESOURCE("PM8921_BMS_CC_THR", PM8921_BMS_CC_THR),
+ SINGLE_IRQ_RESOURCE("PM8921_BMS_VSENSE_THR", PM8921_BMS_VSENSE_THR),
+ SINGLE_IRQ_RESOURCE("PM8921_BMS_VSENSE_FOR_R", PM8921_BMS_VSENSE_FOR_R),
+ SINGLE_IRQ_RESOURCE("PM8921_BMS_OCV_FOR_R", PM8921_BMS_OCV_FOR_R),
+ SINGLE_IRQ_RESOURCE("PM8921_BMS_GOOD_OCV", PM8921_BMS_GOOD_OCV),
+ SINGLE_IRQ_RESOURCE("PM8921_BMS_VSENSE_AVG", PM8921_BMS_VSENSE_AVG),
+};
+
+static struct mfd_cell charger_cell __devinitdata = {
+ .name = PM8921_CHARGER_DEV_NAME,
+ .id = -1,
+ .resources = charger_cell_resources,
+ .num_resources = ARRAY_SIZE(charger_cell_resources),
+};
+
+static struct mfd_cell bms_cell __devinitdata = {
+ .name = PM8921_BMS_DEV_NAME,
+ .id = -1,
+ .resources = bms_cell_resources,
+ .num_resources = ARRAY_SIZE(bms_cell_resources),
+};
static const struct resource mpp_cell_resources[] __devinitconst = {
{
.start = PM8038_IRQ_BLOCK_BIT(PM8038_MPP_BLOCK_START, 0),
@@ -470,6 +528,39 @@
}
}
+ if (pdata->charger_pdata) {
+ pdata->charger_pdata->charger_cdata.vbat_channel = CHANNEL_VBAT;
+ pdata->charger_pdata->charger_cdata.batt_temp_channel
+ = CHANNEL_BATT_THERM;
+ pdata->charger_pdata->charger_cdata.batt_id_channel
+ = CHANNEL_BATT_ID;
+ charger_cell.platform_data = pdata->charger_pdata;
+ charger_cell.pdata_size =
+ sizeof(struct pm8921_charger_platform_data);
+ ret = mfd_add_devices(pmic->dev, 0, &charger_cell, 1, NULL,
+ irq_base);
+ if (ret) {
+ pr_err("Failed to add charger subdevice ret=%d\n", ret);
+ goto bail;
+ }
+ }
+
+ if (pdata->bms_pdata) {
+ pdata->bms_pdata->bms_cdata.batt_temp_channel
+ = CHANNEL_BATT_THERM;
+ pdata->bms_pdata->bms_cdata.vbat_channel = CHANNEL_VBAT;
+ pdata->bms_pdata->bms_cdata.ref625mv_channel = CHANNEL_625MV;
+ pdata->bms_pdata->bms_cdata.ref1p25v_channel = CHANNEL_125V;
+ pdata->bms_pdata->bms_cdata.batt_id_channel = CHANNEL_BATT_ID;
+ bms_cell.platform_data = pdata->bms_pdata;
+ bms_cell.pdata_size = sizeof(struct pm8921_bms_platform_data);
+ ret = mfd_add_devices(pmic->dev, 0, &bms_cell, 1, NULL,
+ irq_base);
+ if (ret) {
+ pr_err("Failed to add bms subdevice ret=%d\n", ret);
+ goto bail;
+ }
+ }
return 0;
bail:
if (pmic->irq_chip) {
diff --git a/drivers/misc/tzcom.c b/drivers/misc/tzcom.c
index ba03064..e662f43 100644
--- a/drivers/misc/tzcom.c
+++ b/drivers/misc/tzcom.c
@@ -1,6 +1,6 @@
/* Qualcomm TrustZone communicator driver
*
- * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -28,6 +28,7 @@
#include <linux/mutex.h>
#include <linux/android_pmem.h>
#include <linux/io.h>
+#include <linux/ion.h>
#include <mach/scm.h>
#include <mach/peripheral-loader.h>
#include <linux/tzcom.h>
@@ -53,7 +54,7 @@
static struct class *driver_class;
static dev_t tzcom_device_no;
static struct cdev tzcom_cdev;
-
+struct ion_client *ion_clnt;
static u8 *sb_in_virt;
static s32 sb_in_phys;
static size_t sb_in_length = 20 * SZ_1K;
@@ -280,13 +281,13 @@
* _________________________________________________________
* OUTPUT SHARED BUFFER
*/
-static int tzcom_send_cmd(struct tzcom_data_t *data, void __user *argp)
+static int __tzcom_send_cmd(struct tzcom_data_t *data,
+ struct tzcom_send_cmd_op_req *req)
{
int ret = 0;
unsigned long flags;
u32 reqd_len_sb_in = 0;
u32 reqd_len_sb_out = 0;
- struct tzcom_send_cmd_op_req req;
struct tzcom_command cmd;
struct tzcom_response resp;
struct tzcom_callback *next_callback;
@@ -296,30 +297,24 @@
size_t new_entry_len = 0;
struct tzcom_registered_svc_list *ptr_svc;
- ret = copy_from_user(&req, argp, sizeof(req));
- if (ret) {
- PERR("copy_from_user failed");
- return ret;
- }
-
- if (req.cmd_buf == NULL || req.resp_buf == NULL) {
+ if (req->cmd_buf == NULL || req->resp_buf == NULL) {
PERR("cmd buffer or response buffer is null");
return -EINVAL;
}
- if (req.cmd_len <= 0 || req.resp_len <= 0 ||
- req.cmd_len > sb_in_length || req.resp_len > sb_in_length) {
+ if (req->cmd_len <= 0 || req->resp_len <= 0 ||
+ req->cmd_len > sb_in_length || req->resp_len > sb_in_length) {
PERR("cmd buffer length or "
"response buffer length not valid");
return -EINVAL;
}
PDEBUG("received cmd_req.req: 0x%p",
- req.cmd_buf);
+ req->cmd_buf);
PDEBUG("received cmd_req.rsp size: %u, ptr: 0x%p",
- req.resp_len,
- req.resp_buf);
+ req->resp_len,
+ req->resp_buf);
- reqd_len_sb_in = req.cmd_len + req.resp_len;
+ reqd_len_sb_in = req->cmd_len + req->resp_len;
if (reqd_len_sb_in > sb_in_length) {
PDEBUG("Not enough memory to fit cmd_buf and "
"resp_buf. Required: %u, Available: %u",
@@ -327,23 +322,25 @@
return -ENOMEM;
}
- /* Copy req.cmd_buf to SB in and set req.resp_buf to SB in + cmd_len */
+ /* Copy req->cmd_buf to SB in and set
+ * req->resp_buf to SB in + cmd_len
+ */
mutex_lock(&sb_in_lock);
PDEBUG("Before memcpy on sb_in");
- memcpy(sb_in_virt, req.cmd_buf, req.cmd_len);
+ memcpy(sb_in_virt, req->cmd_buf, req->cmd_len);
PDEBUG("After memcpy on sb_in");
/* cmd_type will always be a new here */
cmd.cmd_type = TZ_SCHED_CMD_NEW;
cmd.sb_in_cmd_addr = (u8 *) tzcom_virt_to_phys(sb_in_virt);
- cmd.sb_in_cmd_len = req.cmd_len;
+ cmd.sb_in_cmd_len = req->cmd_len;
resp.cmd_status = TZ_SCHED_STATUS_INCOMPLETE;
resp.sb_in_rsp_addr = (u8 *) tzcom_virt_to_phys(sb_in_virt +
- req.cmd_len);
- resp.sb_in_rsp_len = req.resp_len;
+ req->cmd_len);
+ resp.sb_in_rsp_len = req->resp_len;
- PDEBUG("before call tzcom_scm_call, cmd_id = : %u", req.cmd_id);
+ PDEBUG("before call tzcom_scm_call, cmd_id = : %u", req->cmd_id);
PDEBUG("before call tzcom_scm_call, sizeof(cmd) = : %u", sizeof(cmd));
ret = tzcom_scm_call((const void *) &cmd, sizeof(cmd),
@@ -442,13 +439,31 @@
mutex_lock(&sb_in_lock);
resp.sb_in_rsp_addr = sb_in_virt + cmd.sb_in_cmd_len;
- resp.sb_in_rsp_len = req.resp_len;
- memcpy(req.resp_buf, resp.sb_in_rsp_addr, resp.sb_in_rsp_len);
+ resp.sb_in_rsp_len = req->resp_len;
+ memcpy(req->resp_buf, resp.sb_in_rsp_addr, resp.sb_in_rsp_len);
/* Zero out memory for security purpose */
memset(sb_in_virt, 0, reqd_len_sb_in);
mutex_unlock(&sb_in_lock);
- PDEBUG("sending cmd_req.rsp "
+ return ret;
+}
+
+
+static int tzcom_send_cmd(struct tzcom_data_t *data, void __user *argp)
+{
+ int ret = 0;
+ struct tzcom_send_cmd_op_req req;
+
+ ret = copy_from_user(&req, argp, sizeof(req));
+ if (ret) {
+ PERR("copy_from_user failed");
+ return ret;
+ }
+ ret = __tzcom_send_cmd(data, &req);
+ if (ret)
+ return ret;
+
+ PDEBUG("sending cmd_req->rsp "
"size: %u, ptr: 0x%p", req.resp_len,
req.resp_buf);
ret = copy_to_user(argp, &req, sizeof(req));
@@ -456,7 +471,99 @@
PDEBUG("copy_to_user failed");
return ret;
}
+ return ret;
+}
+static int __tzcom_send_cmd_req_clean_up(
+ struct tzcom_send_cmd_fd_op_req *req)
+{
+ char *field;
+ uint32_t *update;
+ int ret = 0;
+ int i = 0;
+
+ for (i = 0; i < MAX_ION_FD; i++) {
+ if (req->ifd_data[i].fd != 0) {
+ field = (char *)req->cmd_buf +
+ req->ifd_data[i].cmd_buf_offset;
+ update = (uint32_t *) field;
+ *update = 0;
+ }
+ }
+ return ret;
+}
+
+static int __tzcom_update_with_phy_addr(
+ struct tzcom_send_cmd_fd_op_req *req)
+{
+ struct ion_handle *ihandle;
+ char *field;
+ uint32_t *update;
+ ion_phys_addr_t pa;
+ int ret = 0;
+ int i = 0;
+ uint32_t length;
+
+ for (i = 0; i < MAX_ION_FD; i++) {
+ if (req->ifd_data[i].fd != 0) {
+ /* Get the handle of the shared fd */
+ ihandle = ion_import_fd(ion_clnt, req->ifd_data[i].fd);
+ if (ihandle == NULL) {
+ PERR("Ion client can't retrieve the handle\n");
+ return -ENOMEM;
+ }
+ field = (char *) req->cmd_buf +
+ req->ifd_data[i].cmd_buf_offset;
+ update = (uint32_t *) field;
+
+ /* Populate the cmd data structure with the phys_addr */
+ ret = ion_phys(ion_clnt, ihandle, &pa, &length);
+ if (ret)
+ return -ENOMEM;
+
+ *update = (uint32_t)pa;
+ ion_free(ion_clnt, ihandle);
+ }
+ }
+ return ret;
+}
+
+static int tzcom_send_cmd_with_fd(struct tzcom_data_t *data,
+ void __user *argp)
+{
+ int ret = 0;
+ struct tzcom_send_cmd_fd_op_req req;
+ struct tzcom_send_cmd_op_req send_cmd_req;
+
+ ret = copy_from_user(&req, argp, sizeof(req));
+ if (ret) {
+ PERR("copy_from_user failed");
+ return ret;
+ }
+
+ send_cmd_req.cmd_id = req.cmd_id;
+ send_cmd_req.cmd_buf = req.cmd_buf;
+ send_cmd_req.cmd_len = req.cmd_len;
+ send_cmd_req.resp_buf = req.resp_buf;
+ send_cmd_req.resp_len = req.resp_len;
+
+ ret = __tzcom_update_with_phy_addr(&req);
+ if (ret)
+ return ret;
+ ret = __tzcom_send_cmd(data, &send_cmd_req);
+ __tzcom_send_cmd_req_clean_up(&req);
+
+ if (ret)
+ return ret;
+
+ PDEBUG("sending cmd_req->rsp "
+ "size: %u, ptr: 0x%p", req.resp_len,
+ req.resp_buf);
+ ret = copy_to_user(argp, &req, sizeof(req));
+ if (ret) {
+ PDEBUG("copy_to_user failed");
+ return ret;
+ }
return ret;
}
@@ -713,6 +820,19 @@
PERR("failed tzcom_send_cmd: %d", ret);
break;
}
+ case TZCOM_IOCTL_SEND_CMD_FD_REQ: {
+ PDEBUG("ioctl send_cmd_req()");
+ /* Only one client allowed here at a time */
+ mutex_lock(&send_cmd_lock);
+ atomic_inc(&tzcom_data->ioctl_count);
+ ret = tzcom_send_cmd_with_fd(tzcom_data, argp);
+ atomic_dec(&tzcom_data->ioctl_count);
+ wake_up_interruptible(&tzcom_data->abort_wq);
+ mutex_unlock(&send_cmd_lock);
+ if (ret)
+ PERR("failed tzcom_send_cmd: %d", ret);
+ break;
+ }
case TZCOM_IOCTL_READ_NEXT_CMD_REQ: {
PDEBUG("ioctl read_next_cmd_req()");
atomic_inc(&tzcom_data->ioctl_count);
@@ -971,7 +1091,7 @@
}
PDEBUG("sb_out virt address: %p, phys address: 0x%x",
sb_out_virt, tzcom_virt_to_phys(sb_out_virt));
-
+ ion_clnt = msm_ion_client_create(0x03, "tzcom");
/* Initialized in tzcom_open */
pil = NULL;
@@ -1012,6 +1132,7 @@
device_destroy(driver_class, tzcom_device_no);
class_destroy(driver_class);
unregister_chrdev_region(tzcom_device_no, 1);
+ ion_client_destroy(ion_clnt);
}
diff --git a/drivers/thermal/msm8960_tsens.c b/drivers/thermal/msm8960_tsens.c
index 63d8666..a616ffc 100644
--- a/drivers/thermal/msm8960_tsens.c
+++ b/drivers/thermal/msm8960_tsens.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -81,7 +81,7 @@
/* Initial temperature threshold values */
#define TSENS_LOWER_LIMIT_TH 0x50
#define TSENS_UPPER_LIMIT_TH 0xdf
-#define TSENS_MIN_LIMIT_TH 0x38
+#define TSENS_MIN_LIMIT_TH 0x0
#define TSENS_MAX_LIMIT_TH 0xff
#define TSENS_S0_STATUS_ADDR (MSM_CLK_CTL_BASE + 0x00003628)
@@ -424,6 +424,15 @@
return tsens_tz_get_trip_temp(thermal, TSENS_TRIP_STAGE3, temp);
}
+static int tsens_tz_notify(struct thermal_zone_device *thermal,
+ int count, enum thermal_trip_type type)
+{
+ /* TSENS driver does not shutdown the device.
+ All Thermal notification are sent to the
+ thermal daemon to take appropriate action */
+ return 1;
+}
+
static int tsens_tz_set_trip_temp(struct thermal_zone_device *thermal,
int trip, long temp)
{
@@ -519,6 +528,7 @@
.get_trip_temp = tsens_tz_get_trip_temp,
.set_trip_temp = tsens_tz_set_trip_temp,
.get_crit_temp = tsens_tz_get_crit_temp,
+ .notify = tsens_tz_notify,
};
static void notify_uspace_tsens_fn(struct work_struct *work)
diff --git a/drivers/usb/gadget/f_diag.c b/drivers/usb/gadget/f_diag.c
index f492143..10a9256 100644
--- a/drivers/usb/gadget/f_diag.c
+++ b/drivers/usb/gadget/f_diag.c
@@ -2,7 +2,7 @@
* Diag Function Device - Route ARM9 and ARM11 DIAG messages
* between HOST and DEVICE.
* Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2008-2012, Code Aurora Forum. All rights reserved.
* Author: Brian Swetland <swetland@google.com>
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -525,6 +525,7 @@
if (rc) {
ERROR(dev->cdev, "can't enable %s, result %d\n",
dev->in->name, rc);
+ dev->in->driver_data = NULL;
return rc;
}
dev->out->driver_data = dev;
@@ -533,6 +534,8 @@
ERROR(dev->cdev, "can't enable %s, result %d\n",
dev->out->name, rc);
usb_ep_disable(dev->in);
+ dev->in->driver_data = NULL;
+ dev->out->driver_data = NULL;
return rc;
}
schedule_work(&dev->config_work);
diff --git a/drivers/usb/gadget/f_rmnet.c b/drivers/usb/gadget/f_rmnet.c
index cbcf5ac..177176e 100644
--- a/drivers/usb/gadget/f_rmnet.c
+++ b/drivers/usb/gadget/f_rmnet.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -435,6 +435,7 @@
pr_debug("%s: port#%d\n", __func__, dev->port_num);
usb_ep_disable(dev->notify);
+ dev->notify->driver_data = NULL;
atomic_set(&dev->online, 0);
diff --git a/drivers/usb/gadget/f_serial.c b/drivers/usb/gadget/f_serial.c
index de8c8ed..d9a901b 100644
--- a/drivers/usb/gadget/f_serial.c
+++ b/drivers/usb/gadget/f_serial.c
@@ -477,6 +477,7 @@
if (gser->notify->driver_data) {
DBG(cdev, "reset generic ctl ttyGS%d\n", gser->port_num);
usb_ep_disable(gser->notify);
+ gser->notify->driver_data = NULL;
}
gser->notify_desc = ep_choose(cdev->gadget,
gser->hs.notify,
@@ -519,6 +520,7 @@
#ifdef CONFIG_MODEM_SUPPORT
usb_ep_fifo_flush(gser->notify);
usb_ep_disable(gser->notify);
+ gser->notify->driver_data = NULL;
#endif
gser->online = 0;
}
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 0360f56..ca298cd 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -2766,14 +2766,17 @@
if (fsg->bulk_in_enabled) {
usb_ep_disable(fsg->bulk_in);
fsg->bulk_in_enabled = 0;
+ fsg_bulk_in->driver_data = NULL;
}
if (fsg->bulk_out_enabled) {
usb_ep_disable(fsg->bulk_out);
fsg->bulk_out_enabled = 0;
+ fsg_bulk_out->driver_data = NULL;
}
if (fsg->intr_in_enabled) {
usb_ep_disable(fsg->intr_in);
fsg->intr_in_enabled = 0;
+ fsg_intr_in->driver_data = NULL;
}
fsg->running = 0;
diff --git a/drivers/usb/gadget/u_bam.c b/drivers/usb/gadget/u_bam.c
index 13965de..1369f4f 100644
--- a/drivers/usb/gadget/u_bam.c
+++ b/drivers/usb/gadget/u_bam.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -652,6 +652,8 @@
usb_ep_disable(port->gr->out);
usb_ep_disable(port->gr->in);
+ port->gr->in->driver_data = NULL;
+ port->gr->out->driver_data = NULL;
}
static void gbam_connect_work(struct work_struct *w)
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index 7c7ece2..db60546 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -1642,8 +1642,8 @@
if (mdp_version < 0x04030303) {
pr_err("%s: writeback panel not supprted\n",
__func__);
- rc = -ENODEV;
- goto mdp_probe_err;
+ platform_device_put(msm_fb_dev);
+ return -ENODEV;
}
pdata->on = mdp4_overlay_writeback_on;
pdata->off = mdp4_overlay_writeback_off;
diff --git a/drivers/video/msm/mdp4_overlay.c b/drivers/video/msm/mdp4_overlay.c
index 645a0c3..ecb0a24 100644
--- a/drivers/video/msm/mdp4_overlay.c
+++ b/drivers/video/msm/mdp4_overlay.c
@@ -418,6 +418,7 @@
char *rgb_base;
uint32 src_size, src_xy, dst_size, dst_xy;
uint32 format, pattern;
+ uint32 offset = 0;
rgb_base = MDP_BASE + MDP4_RGB_BASE;
rgb_base += (MDP4_RGB_OFF * pipe->pipe_num);
@@ -427,6 +428,16 @@
dst_size = ((pipe->dst_h << 16) | pipe->dst_w);
dst_xy = ((pipe->dst_y << 16) | pipe->dst_x);
+ if ((pipe->src_x + pipe->src_w) > 0x7FF) {
+ offset += pipe->src_x * pipe->bpp;
+ src_xy &= 0xFFFF0000;
+ }
+
+ if ((pipe->src_y + pipe->src_h) > 0x7FF) {
+ offset += pipe->src_y * pipe->src_width * pipe->bpp;
+ src_xy &= 0x0000FFFF;
+ }
+
format = mdp4_overlay_format(pipe);
pattern = mdp4_overlay_unpack_pattern(pipe);
@@ -443,7 +454,7 @@
outpdw(rgb_base + 0x0008, dst_size); /* MDP_RGB_DST_SIZE */
outpdw(rgb_base + 0x000c, dst_xy); /* MDP_RGB_DST_XY */
- outpdw(rgb_base + 0x0010, pipe->srcp0_addr);
+ outpdw(rgb_base + 0x0010, pipe->srcp0_addr + offset);
outpdw(rgb_base + 0x0040, pipe->srcp0_ystride);
outpdw(rgb_base + 0x0050, format);/* MDP_RGB_SRC_FORMAT */
@@ -548,6 +559,21 @@
mdp4_scale_setup(pipe);
+ luma_offset = 0;
+ chroma_offset = 0;
+
+ if (ptype == OVERLAY_TYPE_RGB) {
+ if ((pipe->src_y + pipe->src_h) > 0x7FF) {
+ luma_offset = pipe->src_y * pipe->src_width * pipe->bpp;
+ src_xy &= 0x0000FFFF;
+ }
+
+ if ((pipe->src_x + pipe->src_w) > 0x7FF) {
+ luma_offset += pipe->src_x * pipe->bpp;
+ src_xy &= 0xFFFF0000;
+ }
+ }
+
mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
outpdw(vg_base + 0x0000, src_size); /* MDP_RGB_SRC_SIZE */
@@ -567,9 +593,6 @@
if (ptype != OVERLAY_TYPE_RGB) {
mdp4_overlay_vg_get_src_offset(pipe, vg_base, &luma_offset,
&chroma_offset);
- } else {
- luma_offset = 0;
- chroma_offset = 0;
}
/* luma component plane */
@@ -1804,8 +1827,8 @@
}
- pipe->src_width = req->src.width & 0x07ff; /* source img width */
- pipe->src_height = req->src.height & 0x07ff; /* source img height */
+ pipe->src_width = req->src.width & 0x1fff; /* source img width */
+ pipe->src_height = req->src.height & 0x1fff; /* source img height */
pipe->src_h = req->src_rect.h & 0x07ff;
pipe->src_w = req->src_rect.w & 0x07ff;
pipe->src_y = req->src_rect.y & 0x07ff;
diff --git a/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.c b/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.c
index f69a471..c1941ae 100644
--- a/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.c
+++ b/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -24,8 +24,6 @@
static struct time_data proc_time[MAX_TIME_DATA];
#define DDL_MSG_TIME(x...) printk(KERN_DEBUG x)
-#define DDL_FW_CHANGE_ENDIAN
-
static unsigned int vidc_mmu_subsystem[] = {
MSM_SUBSYSTEM_VIDEO, MSM_SUBSYSTEM_VIDEO_FWARE};
@@ -289,23 +287,6 @@
}
#endif
-#ifdef DDL_FW_CHANGE_ENDIAN
-static void ddl_fw_change_endian(u8 *fw, u32 fw_size)
-{
- u32 i = 0;
- u8 temp;
- for (i = 0; i < fw_size; i = i + 4) {
- temp = fw[i];
- fw[i] = fw[i+3];
- fw[i+3] = temp;
- temp = fw[i+1];
- fw[i+1] = fw[i+2];
- fw[i+2] = temp;
- }
- return;
-}
-#endif
-
u32 ddl_fw_init(struct ddl_buf_addr *dram_base)
{
@@ -319,9 +300,6 @@
vidc_video_codec_fw_size);
memcpy(dest_addr, vidc_video_codec_fw,
vidc_video_codec_fw_size);
-#ifdef DDL_FW_CHANGE_ENDIAN
- ddl_fw_change_endian(dest_addr, vidc_video_codec_fw_size);
-#endif
return true;
}
diff --git a/drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.c b/drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.c
index 9c2e5d1..868df6f 100644
--- a/drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.c
+++ b/drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.c
@@ -33,6 +33,17 @@
#define VIDC_FW "vidc_1080p.fw"
#define VIDC_FW_SIZE SZ_1M
+struct res_trk_vidc_mmu_clk {
+ char *mmu_clk_name;
+ struct clk *mmu_clk;
+};
+
+static struct res_trk_vidc_mmu_clk vidc_mmu_clks[] = {
+ {"mdp_iommu_clk"}, {"rot_iommu_clk"},
+ {"vcodec_iommu0_clk"}, {"vcodec_iommu1_clk"},
+ {"smmu_iface_clk"}
+};
+
unsigned char *vidc_video_codec_fw;
u32 vidc_video_codec_fw_size;
static u32 res_trk_get_clk(void);
@@ -520,3 +531,56 @@
{
return resource_context.disable_fullhd;
}
+
+int res_trk_enable_iommu_clocks(void)
+{
+ int ret = 0, i;
+ if (resource_context.mmu_clks_on) {
+ pr_err(" %s: Clocks are already on", __func__);
+ return -EINVAL;
+ }
+ resource_context.mmu_clks_on = 1;
+ for (i = 0; i < ARRAY_SIZE(vidc_mmu_clks); i++) {
+ vidc_mmu_clks[i].mmu_clk = clk_get(resource_context.device,
+ vidc_mmu_clks[i].mmu_clk_name);
+ if (IS_ERR(vidc_mmu_clks[i].mmu_clk)) {
+ pr_err(" %s: Get failed for clk %s", __func__,
+ vidc_mmu_clks[i].mmu_clk_name);
+ ret = PTR_ERR(vidc_mmu_clks[i].mmu_clk);
+ }
+ if (!ret) {
+ ret = clk_enable(vidc_mmu_clks[i].mmu_clk);
+ if (ret) {
+ clk_put(vidc_mmu_clks[i].mmu_clk);
+ vidc_mmu_clks[i].mmu_clk = NULL;
+ }
+ }
+ if (ret) {
+ for (i--; i >= 0; i--) {
+ clk_disable(vidc_mmu_clks[i].mmu_clk);
+ clk_put(vidc_mmu_clks[i].mmu_clk);
+ vidc_mmu_clks[i].mmu_clk = NULL;
+ }
+ resource_context.mmu_clks_on = 0;
+ pr_err("%s() clocks enable failed", __func__);
+ break;
+ }
+ }
+ return ret;
+}
+
+int res_trk_disable_iommu_clocks(void)
+{
+ int i;
+ if (!resource_context.mmu_clks_on) {
+ pr_err(" %s: clks are already off", __func__);
+ return -EINVAL;
+ }
+ resource_context.mmu_clks_on = 0;
+ for (i = 0; i < ARRAY_SIZE(vidc_mmu_clks); i++) {
+ clk_disable(vidc_mmu_clks[i].mmu_clk);
+ clk_put(vidc_mmu_clks[i].mmu_clk);
+ vidc_mmu_clks[i].mmu_clk = NULL;
+ }
+ return 0;
+}
diff --git a/drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.h b/drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.h
index be5045f..bba0868 100644
--- a/drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.h
+++ b/drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.h
@@ -28,6 +28,7 @@
#define RESTRK_1080P_MIN_PERF_LEVEL RESTRK_1080P_VGA_PERF_LEVEL
#define RESTRK_1080P_MAX_PERF_LEVEL RESTRK_1080P_1080P_PERF_LEVEL
+
struct res_trk_context {
struct device *device;
u32 irq_num;
@@ -52,6 +53,7 @@
u32 disable_dmx;
u32 disable_fullhd;
enum ddl_mem_area res_mem_type;
+ u32 mmu_clks_on;
};
#if DEBUG
diff --git a/drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker_api.h b/drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker_api.h
index fd4ca3e..d5e53f5 100644
--- a/drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker_api.h
+++ b/drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker_api.h
@@ -35,4 +35,6 @@
struct ion_client *res_trk_get_ion_client(void);
u32 res_trk_get_disable_dmx(void);
void res_trk_set_mem_type(enum ddl_mem_area mem_type);
+int res_trk_enable_iommu_clocks(void);
+int res_trk_disable_iommu_clocks(void);
#endif
diff --git a/drivers/video/msm/vidc/common/init/vidc_init.c b/drivers/video/msm/vidc/common/init/vidc_init.c
index e4bd50d..1709cc2 100644
--- a/drivers/video/msm/vidc/common/init/vidc_init.c
+++ b/drivers/video/msm/vidc/common/init/vidc_init.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -502,7 +502,7 @@
} else {
buff_ion_handle = ion_import_fd(
client_ctx->user_ion_client, pmem_fd);
- if (!buff_ion_handle) {
+ if (IS_ERR_OR_NULL(buff_ion_handle)) {
ERR("%s(): get_ION_handle failed\n",
__func__);
goto ion_error;
@@ -558,7 +558,7 @@
ion_error:
if (*kernel_vaddr)
ion_unmap_kernel(client_ctx->user_ion_client, buff_ion_handle);
- if (buff_ion_handle)
+ if (!IS_ERR_OR_NULL(buff_ion_handle))
ion_free(client_ctx->user_ion_client, buff_ion_handle);
bail_out_add:
mutex_unlock(&client_ctx->enrty_queue_lock);
diff --git a/include/linux/ion.h b/include/linux/ion.h
index fa5017a..f46d478 100644
--- a/include/linux/ion.h
+++ b/include/linux/ion.h
@@ -63,6 +63,7 @@
*/
enum ion_heap_ids {
+ INVALID_HEAP_ID = -1,
ION_IOMMU_HEAP_ID = 4,
ION_CP_MM_HEAP_ID = 8,
ION_CP_MFC_HEAP_ID = 12,
@@ -71,6 +72,7 @@
ION_SF_HEAP_ID = 24,
ION_AUDIO_HEAP_ID = 28,
+ ION_MM_FIRMWARE_HEAP_ID = 29,
ION_SYSTEM_HEAP_ID = 30,
ION_HEAP_ID_RESERVED = 31 /** Bit reserved for ION_SECURE flag */
@@ -94,6 +96,7 @@
#define ION_IOMMU_HEAP_NAME "iommu"
#define ION_MFC_HEAP_NAME "mfc"
#define ION_WB_HEAP_NAME "wb"
+#define ION_MM_FIRMWARE_HEAP_NAME "mm_fw"
#define CACHED 1
#define UNCACHED 0
@@ -149,12 +152,17 @@
struct ion_cp_heap_pdata {
enum ion_permission_type permission_type;
+ unsigned int align;
+ ion_phys_addr_t secure_base; /* Base addr used when heap is shared */
+ size_t secure_size; /* Size used for securing heap when heap is shared*/
int (*request_region)(void *);
int (*release_region)(void *);
void *(*setup_region)(void);
};
struct ion_co_heap_pdata {
+ int adjacent_mem_id;
+ unsigned int align;
int (*request_region)(void *);
int (*release_region)(void *);
void *(*setup_region)(void);
diff --git a/include/linux/mfd/pm8xxx/pm8038.h b/include/linux/mfd/pm8xxx/pm8038.h
index e733842..203095a 100644
--- a/include/linux/mfd/pm8xxx/pm8038.h
+++ b/include/linux/mfd/pm8xxx/pm8038.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -28,6 +28,9 @@
#include <linux/mfd/pm8xxx/misc.h>
#include <linux/regulator/pm8xxx-regulator.h>
#include <linux/mfd/pm8xxx/pm8xxx-adc.h>
+#include <linux/mfd/pm8xxx/pm8921-charger.h>
+#include <linux/mfd/pm8xxx/pm8921-bms.h>
+#include <linux/mfd/pm8xxx/ccadc.h>
#define PM8038_CORE_DEV_NAME "pm8038-core"
@@ -69,7 +72,10 @@
struct pm8xxx_misc_platform_data *misc_pdata;
struct pm8xxx_regulator_platform_data *regulator_pdatas;
int num_regulators;
+ struct pm8921_charger_platform_data *charger_pdata;
+ struct pm8921_bms_platform_data *bms_pdata;
struct pm8xxx_adc_platform_data *adc_pdata;
+ struct pm8xxx_ccadc_platform_data *ccadc_pdata;
};
#endif
diff --git a/include/linux/tzcom.h b/include/linux/tzcom.h
index a1b3dfc..448ab2a 100644
--- a/include/linux/tzcom.h
+++ b/include/linux/tzcom.h
@@ -6,6 +6,7 @@
#include <linux/types.h>
#include <linux/ioctl.h>
+#define MAX_ION_FD 4
/**
* struct tzcom_register_svc_op_req - for register service ioctl request
* @svc_id - service id (shared between userspace and TZ)
@@ -49,6 +50,8 @@
/**
* struct tzcom_send_cmd_op_req - for send command ioctl request
* @cmd_id - command to execute on TZBSP side
+ * @ifd_data_fd - ion handle to some memory allocated in user space
+ * @cmd_buf_offset - command buffer offset
* @cmd_len - command buffer length
* @cmd_buf - command buffer
* @resp_len - response buffer length
@@ -63,6 +66,34 @@
};
/**
+ * struct tzcom_ion_fd_info - ion fd handle data information
+ * @fd - ion handle to some memory allocated in user space
+ * @cmd_buf_offset - command buffer offset
+ */
+struct tzcom_ion_fd_info {
+ int32_t fd;
+ uint32_t cmd_buf_offset;
+};
+
+/**
+ * struct tzcom_send_cmd_op_req - for send command ioctl request
+ * @cmd_id - command to execute on TZBSP side
+ * @ifd_data_fd - ion handle to some memory allocated in user space
+ * @cmd_buf_offset - command buffer offset
+ * @cmd_len - command buffer length
+ * @cmd_buf - command buffer
+ * @resp_len - response buffer length
+ * @resp_buf - response buffer
+ */
+struct tzcom_send_cmd_fd_op_req {
+ uint32_t cmd_id; /* in */
+ struct tzcom_ion_fd_info ifd_data[MAX_ION_FD];
+ unsigned int cmd_len; /* in */
+ void *cmd_buf; /* in */
+ unsigned int resp_len; /* in/out */
+ void *resp_buf; /* in/out */
+};
+/**
* struct tzcom_cont_cmd_op_req - for continue command ioctl request. used
* as a trigger from HLOS service to notify TZCOM that it's done with its
* operation and provide the response for TZCOM can continue the incomplete
@@ -99,5 +130,7 @@
_IOWR(TZCOM_IOC_MAGIC, 5, struct tzcom_cont_cmd_op_req)
#define TZCOM_IOCTL_ABORT_REQ _IO(TZCOM_IOC_MAGIC, 6)
-
+/* For TZ service */
+#define TZCOM_IOCTL_SEND_CMD_FD_REQ \
+ _IOWR(TZCOM_IOC_MAGIC, 7, struct tzcom_send_cmd_fd_op_req)
#endif /* __TZCOM_H_ */