diff options
-rwxr-xr-x | arch/arm/cpu/armv7/omap-common/emif-common.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/emif-common.c b/arch/arm/cpu/armv7/omap-common/emif-common.c index 44000df879..89945888f6 100755 --- a/arch/arm/cpu/armv7/omap-common/emif-common.c +++ b/arch/arm/cpu/armv7/omap-common/emif-common.c | |||
@@ -1562,8 +1562,8 @@ int emif_fw_config(void) | |||
1562 | accessPerm, initiatorPerm)) | 1562 | accessPerm, initiatorPerm)) |
1563 | printf("SDRAM Firewall: EMIF_FW Region 1 setting failed!\n"); | 1563 | printf("SDRAM Firewall: EMIF_FW Region 1 setting failed!\n"); |
1564 | 1564 | ||
1565 | /* Region 2: (DSP2 Code/Data reserved memory) Allow access to DSP2 only | 1565 | /* Region 2: (DSP1 Code/Data reserved memory) Allow access to DSP1 only |
1566 | * Address range for DSP2 CMA Pool 0x9f000000 for size 0x01000000 | 1566 | * Address range for DSP1 CMA Pool 0x99000000 for size 0x4000000 |
1567 | */ | 1567 | */ |
1568 | 1568 | ||
1569 | accessPerm = L3_ALL_PERMISSIONS | 1569 | accessPerm = L3_ALL_PERMISSIONS |
@@ -1573,11 +1573,11 @@ int emif_fw_config(void) | |||
1573 | | FW_INITIATOR_DSP | 1573 | | FW_INITIATOR_DSP |
1574 | | FW_INITIATOR_IVA1; | 1574 | | FW_INITIATOR_IVA1; |
1575 | 1575 | ||
1576 | if (0 != secure_emif_firewall_setup(2, 0x1, 0x9f000000, 0x01000000, | 1576 | if (0 != secure_emif_firewall_setup(2, 0x1, 0x99000000, 0x4000000, |
1577 | accessPerm, initiatorPerm)) | 1577 | accessPerm, initiatorPerm)) |
1578 | printf("SDRAM Firewall: EMIF_FW Region 2 setting failed!\n"); | 1578 | printf("SDRAM Firewall: EMIF_FW Region 2 setting failed!\n"); |
1579 | 1579 | ||
1580 | /* Region 3: (SR1 FRAME BUFFER MEM RVC pool1) Allow access to IPU2/DSP2, VIP/VPE & DSS Read only for EMIF FW | 1580 | /* Region 3: (SR1 FRAME BUFFER MEM RVC pool1) Allow access to IPU2/DSP1, VIP/VPE & DSS for EMIF FW |
1581 | * Address for RVC Pool1 0x84000000 for size 0x10000000 | 1581 | * Address for RVC Pool1 0x84000000 for size 0x10000000 |
1582 | */ | 1582 | */ |
1583 | 1583 | ||
@@ -1594,13 +1594,14 @@ int emif_fw_config(void) | |||
1594 | | FW_INITIATOR_IVA1 | 1594 | | FW_INITIATOR_IVA1 |
1595 | | FW_INITIATOR_DMA_IPU | 1595 | | FW_INITIATOR_DMA_IPU |
1596 | | FW_INITIATOR_DSS | 1596 | | FW_INITIATOR_DSS |
1597 | | FW_INITIATOR_VIP; | 1597 | | FW_INITIATOR_VIP |
1598 | | FW_INITIATOR_DSP; | ||
1598 | 1599 | ||
1599 | if (0 != secure_emif_firewall_setup(3, 0x1, 0x84000000, 0x10000000, | 1600 | if (0 != secure_emif_firewall_setup(3, 0x1, 0x84000000, 0x10000000, |
1600 | accessPerm, initiatorPerm)) | 1601 | accessPerm, initiatorPerm)) |
1601 | printf("SDRAM Firewall: EMIF_FW Region 3 setting failed!\n"); | 1602 | printf("SDRAM Firewall: EMIF_FW Region 3 setting failed!\n"); |
1602 | 1603 | ||
1603 | /* Region 4: (MEM RVC pool2) Allow access to IPU2/DSP2, VIP/VPE & DSS Read only for EMIF FW | 1604 | /* Region 4: (MEM RVC pool2) Allow access to IPU2/DSP1, VIP/VPE & DSS for EMIF FW |
1604 | * Address for RVC Pool2 0xA0000000 for size 0x02000000 | 1605 | * Address for RVC Pool2 0xA0000000 for size 0x02000000 |
1605 | */ | 1606 | */ |
1606 | accessPerm = L3_ALL_PERMISSIONS | 1607 | accessPerm = L3_ALL_PERMISSIONS |
@@ -1616,7 +1617,8 @@ int emif_fw_config(void) | |||
1616 | | FW_INITIATOR_IVA1 | 1617 | | FW_INITIATOR_IVA1 |
1617 | | FW_INITIATOR_DMA_IPU | 1618 | | FW_INITIATOR_DMA_IPU |
1618 | | FW_INITIATOR_DSS | 1619 | | FW_INITIATOR_DSS |
1619 | | FW_INITIATOR_VIP; | 1620 | | FW_INITIATOR_VIP |
1621 | | FW_INITIATOR_DSP; | ||
1620 | 1622 | ||
1621 | if (0 != secure_emif_firewall_setup(4, 0x1, 0xA0000000, 0x02000000, | 1623 | if (0 != secure_emif_firewall_setup(4, 0x1, 0xA0000000, 0x02000000, |
1622 | accessPerm, initiatorPerm)) | 1624 | accessPerm, initiatorPerm)) |