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

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

[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")
Link: https://lore.kernel.org/r/20190910195833.3891-1-logang@deltatee.com
Reported-by: Doug Meyer <dmeyer@gigaio.com>
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org	# v4.12+
Cc: Kelvin Cao <Kelvin.Cao@microchip.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 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.

diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
index e3aefdafae89..0941555b84a5 100644
--- a/drivers/pci/switch/switchtec.c
+++ b/drivers/pci/switch/switchtec.c
@@ -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

Re: [PATCH v2] PCI/switchtec: Read all 64 bits of part_event_bitmap

[Greg Kroah-Hartman]

On Fri, Jan 03, 2020 at 10:10:29AM -0700, Logan Gunthorpe wrote:
> 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")
> Link: https://lore.kernel.org/r/20190910195833.3891-1-logang@deltatee.com
> Reported-by: Doug Meyer <dmeyer@gigaio.com>
> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: stable@vger.kernel.org	# v4.12+
> Cc: Kelvin Cao <Kelvin.Cao@microchip.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  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