Skip to contentSkip to conversation

PCI/switchtec: Read all 64 bits of part_event_bitmap

PATCH In review Logan Gunthorpe 2 participants 2 messages Jan 3, 2020 – Jan 10, 2020

Subsystems (3)
lore
Share & tools
lore

Logan Gunthorpe

author maintainer
#0 lore raw

PATCH v2 1/1 PCI/switchtec: Read all 64 bits of part_event_bitmap

commit 6acdf7e19b37cb3a9258603d0eab315079c19c5e upstream.

The part_event_bitmap register is 64 bits wide, so read it with ioread64() instead of the 32-bit ioread32().

Fixes 52eabba5bcdb ("switchtec: Add IOCTLs to the Switchtec driver")
Cc Bjorn Helgaas <[email protected]>
Cc [email protected] # v4.12+
Cc Kelvin Cao <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
---
 drivers/pci/switch/switchtec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

v2 of this patch adds the missing header that provides readq() on non-64bit architectures.

drivers/pci/switch/switchtec.c +2 -2
index e3aefdafae89..0941555b84a5 100644
@@ -23,7 +23,7 @@
 #include <linux/pci.h>
 #include <linux/cdev.h>
 #include <linux/wait.h>
-
+#include <linux/io-64-nonatomic-lo-hi.h>
 #include <linux/nospec.h>
 
 MODULE_DESCRIPTION("Microsemi Switchtec(tm) PCIe Management Driver");
@@ -898,7 +898,7 @@ static int ioctl_event_summary(struct switchtec_dev *stdev,
 	u32 reg;
 
 	s.global = ioread32(&stdev->mmio_sw_event->global_summary);
-	s.part_bitmap = ioread32(&stdev->mmio_sw_event->part_event_bitmap);
+	s.part_bitmap = readq(&stdev->mmio_sw_event->part_event_bitmap);
 	s.local_part = ioread32(&stdev->mmio_part_cfg->part_event_summary);
 
 	for (i = 0; i < stdev->partition_count; i++) {

--
2.20.1

#1 lore raw
Quoted 13 lines · Logan Gunthorpe

commit 6acdf7e19b37cb3a9258603d0eab315079c19c5e upstream.

The part_event_bitmap register is 64 bits wide, so read it with ioread64() instead of the 32-bit ioread32().

Fixes 52eabba5bcdb ("switchtec: Add IOCTLs to the Switchtec driver")
Cc Bjorn Helgaas <[email protected]>
Cc [email protected] # v4.12+
Cc Kelvin Cao <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Quoted 6 lines
---
 drivers/pci/switch/switchtec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

v2 of this patch adds the missing header that provides readq() on non-64bit architectures.

Thanks for this, now queued up.

greg k-h