Commit d63e1040 authored by David Woodhouse's avatar David Woodhouse Committed by PvsNarasimha
Browse files

iommu/amd: Fix union of bitfields in intcapxt support 

mainline inclusion
from mainline-v5.11-rc1
commit 2fb6acf3
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAU6ZD

Reference: https://github.com/torvalds/linux/commit/2fb6acf3edfeb904505f9ba3fd01166866062591



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

commit 2fb6acf3 upstream

All the bitfields in here are overlaid on top of each other since
they're a union. Change the second u64 to be in a struct so it does
the intended thing.

Fixes: b5c3786e ("iommu/amd: Use msi_msg shadow structs")
Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201111144322.1659970-2-dwmw2@infradead.org


Signed-off-by: default avatarPvsNarasimha <PVS.NarasimhaRao@amd.com>
parent db11c0a7

drivers/iommu/amd/init.c

+9 −7
Original line number Diff line number Diff line
@@ -2022,6 +2022,7 @@ static int iommu_setup_msi(struct amd_iommu *iommu) 


union intcapxt {

	u64	capxt;

	struct {

		u64	reserved_0		:  2,

			dest_mode_logical	:  1,

			reserved_1		:  5,
@@ -2029,6 +2030,7 @@ union intcapxt { 
			vector			:  8,

			reserved_2		: 16,

			destid_24_31		:  8;

	};

} __attribute__ ((packed));



/*