From: Sasha Levin <Alexander.Levin@microsoft.com>
To: "stable@vger.kernel.org" <stable@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Paul Burton <paul.burton@mips.com>,
Huacai Chen <chenhc@lemote.com>, James Hogan <jhogan@kernel.org>,
Ralf Baechle <ralf@linux-mips.org>,
"linux-mips@linux-mips.org" <linux-mips@linux-mips.org>,
Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL 4.9 07/34] MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads
Date: Sat, 15 Sep 2018 01:34:29 +0000 [thread overview]
Message-ID: <20180915013422.180023-7-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20180915013422.180023-1-alexander.levin@microsoft.com>
From: Paul Burton <paul.burton@mips.com>
[ Upstream commit cd87668d601f622e0ebcfea4f78d116d5f572f4d ]
The PCI_OHCI_INT_REG case in pci_ohci_read_reg() contains the following
if statement:
if ((lo & 0x00000f00) == CS5536_USB_INTR)
CS5536_USB_INTR expands to the constant 11, which gives us the following
condition which can never evaluate true:
if ((lo & 0xf00) == 11)
At least when using GCC 8.1.0 this falls foul of the tautoligcal-compare
warning, and since the code is built with the -Werror flag the build
fails.
Fix this by shifting lo right by 8 bits in order to match the
corresponding PCI_OHCI_INT_REG case in pci_ohci_write_reg().
Signed-off-by: Paul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/19861/
Cc: Huacai Chen <chenhc@lemote.com>
Cc: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
arch/mips/loongson64/common/cs5536/cs5536_ohci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_ohci.c b/arch/mips/loongson64/common/cs5536/cs5536_ohci.c
index f7c905e50dc4..92dc6bafc127 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_ohci.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_ohci.c
@@ -138,7 +138,7 @@ u32 pci_ohci_read_reg(int reg)
break;
case PCI_OHCI_INT_REG:
_rdmsr(DIVIL_MSR_REG(PIC_YSEL_LOW), &hi, &lo);
- if ((lo & 0x00000f00) == CS5536_USB_INTR)
+ if (((lo >> PIC_YSEL_LOW_USB_SHIFT) & 0xf) == CS5536_USB_INTR)
conf_data = 1;
break;
default:
--
2.17.1
next prev parent reply other threads:[~2018-09-15 1:40 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-15 1:34 [PATCH AUTOSEL 4.9 01/34] binfmt_elf: Respect error return from `regset->active' Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 02/34] audit: fix use-after-free in audit_add_watch Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 03/34] mtdchar: fix overflows in adjustment of `count` Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 04/34] mtd: rawnand: sunxi: Add an U suffix to NFC_PAGE_OP definition Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 05/34] evm: Don't deadlock if a crypto algorithm is unavailable Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 06/34] PM / devfreq: use put_device() instead of kfree() Sasha Levin
2018-09-15 1:34 ` Sasha Levin [this message]
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 08/34] configfs: fix registered group removal Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 09/34] efi/esrt: Only call efi_mem_reserve() for boot services memory Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 10/34] ARM: hisi: handle of_iomap and fix missing of_node_put Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 11/34] ARM: hisi: fix error handling and " Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 13/34] gpu: ipu-v3: csi: pass back mbus_code_to_bus_cfg error codes Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 12/34] ARM: hisi: check of_iomap and fix missing of_node_put Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 14/34] mmc: tegra: prevent HS200 on Tegra 3 Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 15/34] mmc: sdhci: do not try to use 3.3V signaling if not supported Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 16/34] drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 18/34] coresight: Handle errors in finding input/output ports Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 17/34] parport: sunbpp: fix error return code Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 19/34] coresight: tpiu: Fix disabling timeouts Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 21/34] gpiolib: Mark gpio_suffixes array with __maybe_unused Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 20/34] gpio: pxa: Fix potential NULL dereference Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 22/34] mfd: 88pm860x-i2c: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 23/34] input: rohm_bu21023: " Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 24/34] rcu: Fix grace-period hangs due to race with CPU offline Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 25/34] drm/amdkfd: Fix error codes in kfd_get_process Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 26/34] rtc: bq4802: add error handling for devm_ioremap Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 27/34] ALSA: pcm: Fix snd_interval_refine first/last with open min/max Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 28/34] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 29/34] drm/panel: type promotion bug in s6e8aa0_read_mtp_id() Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 30/34] dmaengine: hsu: Support dmaengine_terminate_sync() Sasha Levin
2018-09-20 0:38 ` Vinod
2018-09-24 0:55 ` Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 31/34] dmaengine: idma64: " Sasha Levin
2018-09-20 0:40 ` Vinod
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 32/34] IB/nes: Fix a compiler warning Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 34/34] pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant Sasha Levin
2018-09-15 1:34 ` [PATCH AUTOSEL 4.9 33/34] gpiolib: Respect error code of ->get_direction() Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180915013422.180023-7-alexander.levin@microsoft.com \
--to=alexander.levin@microsoft.com \
--cc=chenhc@lemote.com \
--cc=jhogan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox