@@ -540,10 +540,10 @@ static void amd_iommu_report_page_fault(u16 devid, u16 domain_id,
540
540
dev_data = get_dev_data (& pdev -> dev );
541
541
542
542
if (dev_data && __ratelimit (& dev_data -> rs )) {
543
- dev_err (& pdev -> dev , "Event logged [IO_PAGE_FAULT domain=0x%04x address=0x%016llx flags=0x%04x]\n" ,
543
+ dev_err (& pdev -> dev , "Event logged [IO_PAGE_FAULT domain=0x%04x address=0x%llx flags=0x%04x]\n" ,
544
544
domain_id , address , flags );
545
545
} else if (printk_ratelimit ()) {
546
- pr_err ("Event logged [IO_PAGE_FAULT device=%02x:%02x.%x domain=0x%04x address=0x%016llx flags=0x%04x]\n" ,
546
+ pr_err ("Event logged [IO_PAGE_FAULT device=%02x:%02x.%x domain=0x%04x address=0x%llx flags=0x%04x]\n" ,
547
547
PCI_BUS_NUM (devid ), PCI_SLOT (devid ), PCI_FUNC (devid ),
548
548
domain_id , address , flags );
549
549
}
@@ -584,45 +584,45 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt)
584
584
585
585
switch (type ) {
586
586
case EVENT_TYPE_ILL_DEV :
587
- dev_err (dev , "Event logged [ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x pasid=0x%05x address=0x%016llx flags=0x%04x]\n" ,
587
+ dev_err (dev , "Event logged [ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n" ,
588
588
PCI_BUS_NUM (devid ), PCI_SLOT (devid ), PCI_FUNC (devid ),
589
589
pasid , address , flags );
590
590
dump_dte_entry (devid );
591
591
break ;
592
592
case EVENT_TYPE_DEV_TAB_ERR :
593
593
dev_err (dev , "Event logged [DEV_TAB_HARDWARE_ERROR device=%02x:%02x.%x "
594
- "address=0x%016llx flags=0x%04x]\n" ,
594
+ "address=0x%llx flags=0x%04x]\n" ,
595
595
PCI_BUS_NUM (devid ), PCI_SLOT (devid ), PCI_FUNC (devid ),
596
596
address , flags );
597
597
break ;
598
598
case EVENT_TYPE_PAGE_TAB_ERR :
599
- dev_err (dev , "Event logged [PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x domain=0x%04x address=0x%016llx flags=0x%04x]\n" ,
599
+ dev_err (dev , "Event logged [PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x domain=0x%04x address=0x%llx flags=0x%04x]\n" ,
600
600
PCI_BUS_NUM (devid ), PCI_SLOT (devid ), PCI_FUNC (devid ),
601
601
pasid , address , flags );
602
602
break ;
603
603
case EVENT_TYPE_ILL_CMD :
604
- dev_err (dev , "Event logged [ILLEGAL_COMMAND_ERROR address=0x%016llx ]\n" , address );
604
+ dev_err (dev , "Event logged [ILLEGAL_COMMAND_ERROR address=0x%llx ]\n" , address );
605
605
dump_command (address );
606
606
break ;
607
607
case EVENT_TYPE_CMD_HARD_ERR :
608
- dev_err (dev , "Event logged [COMMAND_HARDWARE_ERROR address=0x%016llx flags=0x%04x]\n" ,
608
+ dev_err (dev , "Event logged [COMMAND_HARDWARE_ERROR address=0x%llx flags=0x%04x]\n" ,
609
609
address , flags );
610
610
break ;
611
611
case EVENT_TYPE_IOTLB_INV_TO :
612
- dev_err (dev , "Event logged [IOTLB_INV_TIMEOUT device=%02x:%02x.%x address=0x%016llx ]\n" ,
612
+ dev_err (dev , "Event logged [IOTLB_INV_TIMEOUT device=%02x:%02x.%x address=0x%llx ]\n" ,
613
613
PCI_BUS_NUM (devid ), PCI_SLOT (devid ), PCI_FUNC (devid ),
614
614
address );
615
615
break ;
616
616
case EVENT_TYPE_INV_DEV_REQ :
617
- dev_err (dev , "Event logged [INVALID_DEVICE_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%016llx flags=0x%04x]\n" ,
617
+ dev_err (dev , "Event logged [INVALID_DEVICE_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n" ,
618
618
PCI_BUS_NUM (devid ), PCI_SLOT (devid ), PCI_FUNC (devid ),
619
619
pasid , address , flags );
620
620
break ;
621
621
case EVENT_TYPE_INV_PPR_REQ :
622
622
pasid = ((event [0 ] >> 16 ) & 0xFFFF )
623
623
| ((event [1 ] << 6 ) & 0xF0000 );
624
624
tag = event [1 ] & 0x03FF ;
625
- dev_err (dev , "Event logged [INVALID_PPR_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%016llx flags=0x%04x]\n" ,
625
+ dev_err (dev , "Event logged [INVALID_PPR_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n" ,
626
626
PCI_BUS_NUM (devid ), PCI_SLOT (devid ), PCI_FUNC (devid ),
627
627
pasid , address , flags );
628
628
break ;
0 commit comments