require both SW and HW PAN
CONFIG_ARM64_SW_TTBR0_PAN is a no-op if CONFIG_ARM64_PAN is supported in hardware. And CONFIG_ARM64_PAN does nothing if hardware support is not present. So require both options to be enabled to ensure PAN support is enabled. Bug: 138969141 Change-Id: I7a873e8534518483f0a6648c027ccb914105a35d Signed-off-by: Steve Muckle <smuckle@google.com>
This commit is contained in:
parent
8317c32456
commit
003f37aea9
3 changed files with 20 additions and 68 deletions
|
@ -35,6 +35,14 @@
|
|||
<value type="bool">y</value>
|
||||
</config>
|
||||
</conditions>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_PAN</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
<config>
|
||||
<key>CONFIG_ARMV8_DEPRECATED</key>
|
||||
<value type="bool">y</value>
|
||||
|
@ -57,40 +65,6 @@
|
|||
</config>
|
||||
</group>
|
||||
|
||||
<!-- For ARM64, CONFIG_ARM64_SW_TTBR0_PAN || CONFIG_ARM64_PAN -->
|
||||
<group>
|
||||
<conditions>
|
||||
<config>
|
||||
<key>CONFIG_ARM64</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
|
||||
<value type="bool">n</value>
|
||||
</config>
|
||||
</conditions>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_PAN</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
</group>
|
||||
<group>
|
||||
<conditions>
|
||||
<config>
|
||||
<key>CONFIG_ARM64</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_PAN</key>
|
||||
<value type="bool">n</value>
|
||||
</config>
|
||||
</conditions>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
</group>
|
||||
|
||||
<!-- x86 base requirements -->
|
||||
<group>
|
||||
<conditions>
|
||||
|
|
|
@ -35,6 +35,14 @@
|
|||
<value type="bool">y</value>
|
||||
</config>
|
||||
</conditions>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_PAN</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
<config>
|
||||
<key>CONFIG_ARMV8_DEPRECATED</key>
|
||||
<value type="bool">y</value>
|
||||
|
@ -57,40 +65,6 @@
|
|||
</config>
|
||||
</group>
|
||||
|
||||
<!-- For ARM64, CONFIG_ARM64_SW_TTBR0_PAN || CONFIG_ARM64_PAN -->
|
||||
<group>
|
||||
<conditions>
|
||||
<config>
|
||||
<key>CONFIG_ARM64</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
|
||||
<value type="bool">n</value>
|
||||
</config>
|
||||
</conditions>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_PAN</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
</group>
|
||||
<group>
|
||||
<conditions>
|
||||
<config>
|
||||
<key>CONFIG_ARM64</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_PAN</key>
|
||||
<value type="bool">n</value>
|
||||
</config>
|
||||
</conditions>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
</group>
|
||||
|
||||
<!-- x86 base requirements -->
|
||||
<group>
|
||||
<conditions>
|
||||
|
|
|
@ -31,6 +31,10 @@
|
|||
<value type="bool">y</value>
|
||||
</config>
|
||||
</conditions>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_PAN</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
<config>
|
||||
<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
|
||||
<value type="bool">y</value>
|
||||
|
|
Loading…
Reference in a new issue