Commit 9f5989d7 authored by Helge Deller's avatar Helge Deller

parisc/firmware: Use PDC constants for narrow/wide firmware

PDC uses the PDC_MODEL_OS64 and PDC_MODEL_OS32 constants, so use
those constants for the internal WIDE_FIRMWARE/NARROW_FIRMWARE too.
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 06a2e499
...@@ -78,12 +78,12 @@ static unsigned long pdc_result[NUM_PDC_RESULT] __aligned(8); ...@@ -78,12 +78,12 @@ static unsigned long pdc_result[NUM_PDC_RESULT] __aligned(8);
static unsigned long pdc_result2[NUM_PDC_RESULT] __aligned(8); static unsigned long pdc_result2[NUM_PDC_RESULT] __aligned(8);
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
#define WIDE_FIRMWARE 0x1 #define WIDE_FIRMWARE PDC_MODEL_OS64
#define NARROW_FIRMWARE 0x2 #define NARROW_FIRMWARE PDC_MODEL_OS32
/* Firmware needs to be initially set to narrow to determine the /* Firmware needs to be initially set to narrow to determine the
* actual firmware width. */ * actual firmware width. */
int parisc_narrow_firmware __ro_after_init = 2; int parisc_narrow_firmware __ro_after_init = NARROW_FIRMWARE;
#endif #endif
/* On most currently-supported platforms, IODC I/O calls are 32-bit calls /* On most currently-supported platforms, IODC I/O calls are 32-bit calls
...@@ -166,10 +166,10 @@ void set_firmware_width_unlocked(void) ...@@ -166,10 +166,10 @@ void set_firmware_width_unlocked(void)
if (pdc_result[0] != NARROW_FIRMWARE) if (pdc_result[0] != NARROW_FIRMWARE)
parisc_narrow_firmware = 0; parisc_narrow_firmware = 0;
} }
/** /**
* set_firmware_width - Determine if the firmware is wide or narrow. * set_firmware_width - Determine if the firmware is wide or narrow.
* *
* This function must be called before any pdc_* function that uses the * This function must be called before any pdc_* function that uses the
* convert_to_wide function. * convert_to_wide function.
*/ */
...@@ -178,7 +178,7 @@ void set_firmware_width(void) ...@@ -178,7 +178,7 @@ void set_firmware_width(void)
unsigned long flags; unsigned long flags;
/* already initialized? */ /* already initialized? */
if (parisc_narrow_firmware != 2) if (parisc_narrow_firmware != NARROW_FIRMWARE)
return; return;
spin_lock_irqsave(&pdc_lock, flags); spin_lock_irqsave(&pdc_lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment