On Sat, Oct 24, 2020 at 10:35:15PM +0100, David Woodhouse wrote: > From: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > > Use the x86 shadow structs in msi_msg instead of the macros. > > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Signed-off-by: David Woodhouse <dwmw@xxxxxxxxxxxx> > --- > drivers/pci/controller/vmd.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c > index aa1b12bac9a1..72de3c6f644e 100644 > --- a/drivers/pci/controller/vmd.c > +++ b/drivers/pci/controller/vmd.c > @@ -18,7 +18,6 @@ > #include <asm/irqdomain.h> > #include <asm/device.h> > #include <asm/msi.h> > -#include <asm/msidef.h> > > #define VMD_CFGBAR 0 > #define VMD_MEMBAR1 2 > @@ -131,10 +130,10 @@ static void vmd_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) > struct vmd_irq_list *irq = vmdirq->irq; > struct vmd_dev *vmd = irq_data_get_irq_handler_data(data); > > - msg->address_hi = MSI_ADDR_BASE_HI; > - msg->address_lo = MSI_ADDR_BASE_LO | > - MSI_ADDR_DEST_ID(index_from_irqs(vmd, irq)); > - msg->data = 0; > + memset(&msg, 0, sizeof(*msg); This should be: + memset(msg, 0, sizeof(*msg); https://groups.google.com/g/clang-built-linux/c/N-DfCPz3alg > + msg->address_hi = X86_MSI_BASE_ADDRESS_HIGH; > + msg->arch_addr_lo.base_address = X86_MSI_BASE_ADDRESS_LOW; > + msg->arch_addr_lo.destid_0_7 = index_from_irqs(vmd, irq); > } > > /* > -- > 2.26.2 > -- Kees Cook
