diff options
Diffstat (limited to 'arch/sparc/kernel/setup_64.c')
| -rw-r--r-- | arch/sparc/kernel/setup_64.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 3c5bb784214f..c965595aa7e9 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c | |||
| @@ -106,7 +106,7 @@ static void __init process_switch(char c) | |||
| 106 | prom_halt(); | 106 | prom_halt(); |
| 107 | break; | 107 | break; |
| 108 | case 'p': | 108 | case 'p': |
| 109 | /* Just ignore, this behavior is now the default. */ | 109 | prom_early_console.flags &= ~CON_BOOT; |
| 110 | break; | 110 | break; |
| 111 | case 'P': | 111 | case 'P': |
| 112 | /* Force UltraSPARC-III P-Cache on. */ | 112 | /* Force UltraSPARC-III P-Cache on. */ |
| @@ -425,10 +425,14 @@ static void __init init_sparc64_elf_hwcap(void) | |||
| 425 | else if (tlb_type == hypervisor) { | 425 | else if (tlb_type == hypervisor) { |
| 426 | if (sun4v_chip_type == SUN4V_CHIP_NIAGARA1 || | 426 | if (sun4v_chip_type == SUN4V_CHIP_NIAGARA1 || |
| 427 | sun4v_chip_type == SUN4V_CHIP_NIAGARA2 || | 427 | sun4v_chip_type == SUN4V_CHIP_NIAGARA2 || |
| 428 | sun4v_chip_type == SUN4V_CHIP_NIAGARA3) | 428 | sun4v_chip_type == SUN4V_CHIP_NIAGARA3 || |
| 429 | sun4v_chip_type == SUN4V_CHIP_NIAGARA4 || | ||
| 430 | sun4v_chip_type == SUN4V_CHIP_NIAGARA5) | ||
| 429 | cap |= HWCAP_SPARC_BLKINIT; | 431 | cap |= HWCAP_SPARC_BLKINIT; |
| 430 | if (sun4v_chip_type == SUN4V_CHIP_NIAGARA2 || | 432 | if (sun4v_chip_type == SUN4V_CHIP_NIAGARA2 || |
| 431 | sun4v_chip_type == SUN4V_CHIP_NIAGARA3) | 433 | sun4v_chip_type == SUN4V_CHIP_NIAGARA3 || |
| 434 | sun4v_chip_type == SUN4V_CHIP_NIAGARA4 || | ||
| 435 | sun4v_chip_type == SUN4V_CHIP_NIAGARA5) | ||
| 432 | cap |= HWCAP_SPARC_N2; | 436 | cap |= HWCAP_SPARC_N2; |
| 433 | } | 437 | } |
| 434 | 438 | ||
| @@ -452,11 +456,15 @@ static void __init init_sparc64_elf_hwcap(void) | |||
| 452 | if (sun4v_chip_type == SUN4V_CHIP_NIAGARA1) | 456 | if (sun4v_chip_type == SUN4V_CHIP_NIAGARA1) |
| 453 | cap |= AV_SPARC_ASI_BLK_INIT; | 457 | cap |= AV_SPARC_ASI_BLK_INIT; |
| 454 | if (sun4v_chip_type == SUN4V_CHIP_NIAGARA2 || | 458 | if (sun4v_chip_type == SUN4V_CHIP_NIAGARA2 || |
| 455 | sun4v_chip_type == SUN4V_CHIP_NIAGARA3) | 459 | sun4v_chip_type == SUN4V_CHIP_NIAGARA3 || |
| 460 | sun4v_chip_type == SUN4V_CHIP_NIAGARA4 || | ||
| 461 | sun4v_chip_type == SUN4V_CHIP_NIAGARA5) | ||
| 456 | cap |= (AV_SPARC_VIS | AV_SPARC_VIS2 | | 462 | cap |= (AV_SPARC_VIS | AV_SPARC_VIS2 | |
| 457 | AV_SPARC_ASI_BLK_INIT | | 463 | AV_SPARC_ASI_BLK_INIT | |
| 458 | AV_SPARC_POPC); | 464 | AV_SPARC_POPC); |
| 459 | if (sun4v_chip_type == SUN4V_CHIP_NIAGARA3) | 465 | if (sun4v_chip_type == SUN4V_CHIP_NIAGARA3 || |
| 466 | sun4v_chip_type == SUN4V_CHIP_NIAGARA4 || | ||
| 467 | sun4v_chip_type == SUN4V_CHIP_NIAGARA5) | ||
| 460 | cap |= (AV_SPARC_VIS3 | AV_SPARC_HPC | | 468 | cap |= (AV_SPARC_VIS3 | AV_SPARC_HPC | |
| 461 | AV_SPARC_FMAF); | 469 | AV_SPARC_FMAF); |
| 462 | } | 470 | } |