From patchwork Sat Jan 11 09:50:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 234137 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DBDBC33C9E for ; Sat, 11 Jan 2020 10:11:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1022E2084D for ; Sat, 11 Jan 2020 10:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737465; bh=NDD+sy+WmV6QP2NJs2qYXbzi51oxEoc29qhKVAybGp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QDmqrTXnFx+a1BYFmVwYFUzanRdtmRCSAQjk3/knoXGT+mc5KkUjnx7Tn+3BjTF2G C6Swwt3kFHZ3airpQaU0qO9BGiLkkKL1GRBEWFz235xjllrR3/Vwl3ykebOTVCADPx g3v9liD8K/I/3meYFfTY21kqjADt4xG1C1C7lNO0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729582AbgAKKLE (ORCPT ); Sat, 11 Jan 2020 05:11:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:47994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729229AbgAKKLB (ORCPT ); Sat, 11 Jan 2020 05:11:01 -0500 Received: from localhost (unknown [62.119.166.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 272262077C; Sat, 11 Jan 2020 10:10:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737461; bh=NDD+sy+WmV6QP2NJs2qYXbzi51oxEoc29qhKVAybGp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BUvh1WsqqkYd1xDKflCacTrbPNDHDkqdC+WxdxKjYbKAj2MMKKgST6LsQRd7SzqOr eS7URvrtEBjiHQ66ZNnp/hVFjmAZSwpkIzIA+vq/Y/TZPg4uGbKpY4/Kxh4X7V4zpL seOQfa5f0eIBHTXtfa5xon/XlSTy482tuMNgxpTk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Doug Meyer , Logan Gunthorpe , Bjorn Helgaas , Kelvin Cao Subject: [PATCH 4.14 42/62] PCI/switchtec: Read all 64 bits of part_event_bitmap Date: Sat, 11 Jan 2020 10:50:24 +0100 Message-Id: <20200111094849.188173951@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094837.425430968@linuxfoundation.org> References: <20200111094837.425430968@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: 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 Signed-off-by: Logan Gunthorpe Signed-off-by: Bjorn Helgaas Cc: stable@vger.kernel.org # v4.12+ Cc: Kelvin Cao Signed-off-by: Greg Kroah-Hartman --- drivers/pci/switch/switchtec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -23,7 +23,7 @@ #include #include #include - +#include #include MODULE_DESCRIPTION("Microsemi Switchtec(tm) PCIe Management Driver"); @@ -898,7 +898,7 @@ static int ioctl_event_summary(struct sw 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++) {