From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=BAYES_00,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=unavailable 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 DADBAC433DF for ; Mon, 17 Aug 2020 17:35:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A93E72063A for ; Mon, 17 Aug 2020 17:35:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597685746; bh=nxbijIe3mjlBYbtASARKH08UZo8+8GTitovu0fEMvmo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K+0x7oPFLiwnGSpRT1LZAYD0voCsL5zXDsjWLKUK+Xh2Nw2gEbDNSDECbOU/vp3Sd XQ+iTZGqtjoi66hi26U/TbZAPFPldgi59MKj0LZ2PvLwJ70UzdIs34aLqFhr4hEAqB WZJ4nBDbl90eQUTMZmul5CtYreQNtpBF1DBJH9xY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729448AbgHQRfm (ORCPT ); Mon, 17 Aug 2020 13:35:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:33222 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730062AbgHQQRp (ORCPT ); Mon, 17 Aug 2020 12:17:45 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 E88582065C; Mon, 17 Aug 2020 16:17:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597681058; bh=nxbijIe3mjlBYbtASARKH08UZo8+8GTitovu0fEMvmo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dZrKhEs50G4i60vSw/3+IaMqo3WBFGz7Bwyv4ixUq5qkE4pkHnqJ7hyleV4xCz2La lEUosh4CaRY9eq3acCqf6QxKBbZilbIeYdgr0wZ0vPtr3fLfzhzwVVjA1awVBQJJ8g prJe3XCtu7MdDgqdw0NOANcw+UK1s/hfv2GGVHaQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sven Schnelle , Helge Deller Subject: [PATCH 4.19 163/168] parisc: mask out enable and reserved bits from sba imask Date: Mon, 17 Aug 2020 17:18:14 +0200 Message-Id: <20200817143741.804331328@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143733.692105228@linuxfoundation.org> References: <20200817143733.692105228@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sven Schnelle commit 5b24993c21cbf2de11aff077a48c5cb0505a0450 upstream. When using kexec the SBA IOMMU IBASE might still have the RE bit set. This triggers a WARN_ON when trying to write back the IBASE register later, and it also makes some mask calculations fail. Cc: Signed-off-by: Sven Schnelle Signed-off-by: Helge Deller Signed-off-by: Greg Kroah-Hartman --- drivers/parisc/sba_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c @@ -1291,7 +1291,7 @@ sba_ioc_init_pluto(struct parisc_device ** (one that doesn't overlap memory or LMMIO space) in the ** IBASE and IMASK registers. */ - ioc->ibase = READ_REG(ioc->ioc_hpa + IOC_IBASE); + ioc->ibase = READ_REG(ioc->ioc_hpa + IOC_IBASE) & ~0x1fffffULL; iova_space_size = ~(READ_REG(ioc->ioc_hpa + IOC_IMASK) & 0xFFFFFFFFUL) + 1; if ((ioc->ibase < 0xfed00000UL) && ((ioc->ibase + iova_space_size) > 0xfee00000UL)) {