diff options
| author | Koan-Sin Tan <koansin.tan@gmail.com> | 2016-04-18 17:20:05 +0800 |
|---|---|---|
| committer | Koan-Sin Tan <koansin.tan@gmail.com> | 2017-01-24 10:50:14 +0800 |
| commit | 201d535ff65ceefcb35840a53f8048992dcffdaf (patch) | |
| tree | 7140e5b681d054d752dff4eed794af359ce06eac /plat/mediatek | |
| parent | 8bc20038afc4ac87a35b507bfdf1e5d2301bcfcf (diff) | |
Remove use of all deprecated APIs
Now it's possbile to build BL31 for MT8173 with ERROR_DEPRECATED=1.
Signed-off-by: Koan-Sin Tan <koansin.tan@gmail.com>
Diffstat (limited to 'plat/mediatek')
| -rw-r--r-- | plat/mediatek/mt8173/drivers/spm/spm_hotplug.c | 9 | ||||
| -rw-r--r-- | plat/mediatek/mt8173/drivers/spm/spm_mcdi.c | 5 | ||||
| -rw-r--r-- | plat/mediatek/mt8173/include/platform_def.h | 3 |
3 files changed, 13 insertions, 4 deletions
diff --git a/plat/mediatek/mt8173/drivers/spm/spm_hotplug.c b/plat/mediatek/mt8173/drivers/spm/spm_hotplug.c index b89cd976..4cafd29e 100644 --- a/plat/mediatek/mt8173/drivers/spm/spm_hotplug.c +++ b/plat/mediatek/mt8173/drivers/spm/spm_hotplug.c @@ -27,6 +27,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include <arch.h> #include <mmio.h> #include <mt8173_def.h> #include <platform.h> @@ -258,7 +259,9 @@ void spm_hotplug_on(unsigned long mpidr) { unsigned long linear_id; - linear_id = platform_get_core_pos(mpidr); + linear_id = ((mpidr & MPIDR_CLUSTER_MASK) >> 6) | + (mpidr & MPIDR_CPU_MASK); + spm_lock_get(); if (is_hotplug_ready() == 0) { spm_mcdi_wakeup_all_cores(); @@ -277,7 +280,9 @@ void spm_hotplug_off(unsigned long mpidr) { unsigned long linear_id; - linear_id = platform_get_core_pos(mpidr); + linear_id = ((mpidr & MPIDR_CLUSTER_MASK) >> 6) | + (mpidr & MPIDR_CPU_MASK); + spm_lock_get(); if (is_hotplug_ready() == 0) { spm_mcdi_wakeup_all_cores(); diff --git a/plat/mediatek/mt8173/drivers/spm/spm_mcdi.c b/plat/mediatek/mt8173/drivers/spm/spm_mcdi.c index d715735d..4d8422fc 100644 --- a/plat/mediatek/mt8173/drivers/spm/spm_mcdi.c +++ b/plat/mediatek/mt8173/drivers/spm/spm_mcdi.c @@ -511,7 +511,10 @@ void spm_mcdi_prepare_for_off_state(unsigned long mpidr, unsigned int afflvl) void spm_mcdi_finish_for_on_state(unsigned long mpidr, unsigned int afflvl) { - unsigned long linear_id = platform_get_core_pos(mpidr); + unsigned long linear_id; + + linear_id = ((mpidr & MPIDR_CLUSTER_MASK) >> 6) | + (mpidr & MPIDR_CPU_MASK); spm_lock_get(); spm_mcdi_clear_cputop_pwrctrl_for_cluster_on(mpidr); diff --git a/plat/mediatek/mt8173/include/platform_def.h b/plat/mediatek/mt8173/include/platform_def.h index 4422e4f3..bb69920f 100644 --- a/plat/mediatek/mt8173/include/platform_def.h +++ b/plat/mediatek/mt8173/include/platform_def.h @@ -118,7 +118,8 @@ /******************************************************************************* * Platform specific page table and MMU setup constants ******************************************************************************/ -#define ADDR_SPACE_SIZE (1ull << 32) +#define PLAT_PHY_ADDR_SPACE_SIZE (1ull << 32) +#define PLAT_VIRT_ADDR_SPACE_SIZE (1ull << 32) #define MAX_XLAT_TABLES 4 #define MAX_MMAP_REGIONS 16 |