Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63cc5eb9 authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman
Browse files

parisc/firmware: Fix F-extend for PDC addresses 



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: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 229ce47c

arch/parisc/kernel/firmware.c

+2 −2
Original line number Diff line number Diff line
@@ -127,10 +127,10 @@ static unsigned long f_extend(unsigned long address) 
#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;