PCI/switchtec: Read all 64 bits of part_event_bitmap
Subsystems (3)
Logan Gunthorpe
maintainerPATCH 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")
Reported-by Doug Meyer <[email protected]>
Signed-off-by Logan Gunthorpe <[email protected]>
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
@@ -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
Greg Kroah-Hartman
maintainerQuoted 13 lines · Logan Gunthorpe
commit
6acdf7e19b37cb3a9258603d0eab315079c19c5eupstream.The
part_event_bitmapregister is 64 bits wide, so read it withioread64()instead of the 32-bitioread32().Fixes 52eabba5bcdb ("switchtec: Add IOCTLs to the Switchtec driver")Reported-by Doug Meyer <[email protected]>Signed-off-by Logan Gunthorpe <[email protected]>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