arm64: capabilities: Merge duplicate entries for Qualcomm erratum 1003

mainline inclusion
from mainline-v5.0-rc1
commit a3dcea2c
category: bugfix
bugzilla: 46773
CVE: NA
References: https://gitee.com/src-openeuler/kernel/issues/I235Y8



---------------------------

Remove duplicate entries for Qualcomm erratum 1003. Since the entries
are not purely based on generic MIDR checks, use the multi_cap_entry
type to merge the entries.

Cc: Christopher Covington <cov@codeaurora.org>
Cc: Will Deacon <will.deacon@arm.com>
Reviewed-by: Vladimir Murzin <vladimir.murzin@arm.com>
Tested-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

Conflicts:
	arch/arm64/kernel/cpu_errata.c
[Zheng Zengkai: replace multi_entry_cap_matches with
cpucap_multi_entry_cap_matches skipped in the following commit:
arm64: cpufeature: Rework ptr auth hwcaps using multi_entry_cap_matches
]

Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>