Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13d9f98e authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Greg Kroah-Hartman
Browse files

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: 52eabba5 ("switchtec: Add IOCTLs to the Switchtec driver")
Link: https://lore.kernel.org/r/20190910195833.3891-1-logang@deltatee.com


Reported-by: default avatarDoug Meyer <dmeyer@gigaio.com>
Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org	# v4.12+
Cc: Kelvin Cao <Kelvin.Cao@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 40b049d0

drivers/pci/switch/switchtec.c

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/uaccess.h>

#include <linux/poll.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");
@@ -633,7 +633,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++) {