From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE0FA159577; Mon, 29 Jan 2024 17:07:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706548047; cv=none; b=aDL4rmt5O+VrHKeNLwJOfWUWDacqFEKdaYNuyDoHy0Wz949uEXm/0D2IfMXZwUubjvW+Jh7y8VYv2rrbC8HTY8+DvSFpd4pWPkNg0spSiUbkPu3RCz5+u+q2Y7bw3DWrhKrRqukZZXFt8vXH7r5nS19zU9MESdmw18+4lPsRzg8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706548047; c=relaxed/simple; bh=e6PT/FroryESztMATKRH3R6+1NJFb+ZPTZNOVLFUNQY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=clFyn0G9Ad5UuOrD5ViuGm/7xrZ/cltr/vE4ywlrOwZbUeew8KiCawsdkogUZ4V9p50GxgG6lFL3b/o3ZpCTmYAxwnRhdL5zoxpmUnetIoDOHOMpo4jYvkPJjkP05vtaQgn9su1s4sqhZCTnwFjJ4sBfF45JL/tppf2yQFON2pc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mzGv843e; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mzGv843e" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7C623C43390; Mon, 29 Jan 2024 17:07:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706548047; bh=e6PT/FroryESztMATKRH3R6+1NJFb+ZPTZNOVLFUNQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mzGv843egzZ2VFoMksmO744TftMZBeyGkYtdBB/RtRjmfpwmzzYP9/MWtQ26Vv3/v CBbPzzk59r19Cwk4ccKchKYSnhjjtYTwz+gbCQ0ggEyJEx7aACOKKOa/5Hj2u5x8n1 yWjnwsdctahy/QReAuhUjng0IzJ7xjt1Y3OFkJsI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Helge Deller Subject: [PATCH 6.7 048/346] parisc/firmware: Fix F-extend for PDC addresses Date: Mon, 29 Jan 2024 09:01:19 -0800 Message-ID: <20240129170017.799050555@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129170016.356158639@linuxfoundation.org> References: <20240129170016.356158639@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Helge Deller commit 735ae74f73e55c191d48689bd11ff4a06ea0508f upstream. When running with narrow firmware (64-bit kernel using a 32-bit firmware), extend PDC addresses into the 0xfffffff0.00000000 region instead of the 0xf0f0f0f0.00000000 region. This fixes the power button on the C3700 machine in qemu (64-bit CPU with 32-bit firmware), and my assumption is that the previous code was really never used (because most 64-bit machines have a 64-bit firmware), or it just worked on very old machines because they may only decode 40-bit of virtual addresses. Cc: stable@vger.kernel.org Signed-off-by: Helge Deller Signed-off-by: Greg Kroah-Hartman --- arch/parisc/kernel/firmware.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/parisc/kernel/firmware.c +++ b/arch/parisc/kernel/firmware.c @@ -123,10 +123,10 @@ static unsigned long f_extend(unsigned l #ifdef CONFIG_64BIT if(unlikely(parisc_narrow_firmware)) { if((address & 0xff000000) == 0xf0000000) - return 0xf0f0f0f000000000UL | (u32)address; + return (0xfffffff0UL << 32) | (u32)address; if((address & 0xf0000000) == 0xf0000000) - return 0xffffffff00000000UL | (u32)address; + return (0xffffffffUL << 32) | (u32)address; } #endif return address;