Commit 4e963779 authored by Allen Pais's avatar Allen Pais Committed by David S. Miller
Browse files

cpu hw caps support for sparc64x 



Signed-off-by: default avatarAllen Pais <allen.pais@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64ccccf8

arch/sparc/kernel/setup_64.c

+8 −4
Original line number Diff line number Diff line
@@ -499,12 +499,14 @@ static void __init init_sparc64_elf_hwcap(void) 
		    sun4v_chip_type == SUN4V_CHIP_NIAGARA2 ||

		    sun4v_chip_type == SUN4V_CHIP_NIAGARA3 ||

		    sun4v_chip_type == SUN4V_CHIP_NIAGARA4 ||

		    sun4v_chip_type == SUN4V_CHIP_NIAGARA5)

		    sun4v_chip_type == SUN4V_CHIP_NIAGARA5 ||

		    sun4v_chip_type == SUN4V_CHIP_SPARC64X)

			cap |= HWCAP_SPARC_BLKINIT;

		if (sun4v_chip_type == SUN4V_CHIP_NIAGARA2 ||

		    sun4v_chip_type == SUN4V_CHIP_NIAGARA3 ||

		    sun4v_chip_type == SUN4V_CHIP_NIAGARA4 ||

		    sun4v_chip_type == SUN4V_CHIP_NIAGARA5)

		    sun4v_chip_type == SUN4V_CHIP_NIAGARA5 ||

		    sun4v_chip_type == SUN4V_CHIP_SPARC64X)

			cap |= HWCAP_SPARC_N2;

	}
@@ -530,13 +532,15 @@ static void __init init_sparc64_elf_hwcap(void) 
			if (sun4v_chip_type == SUN4V_CHIP_NIAGARA2 ||

			    sun4v_chip_type == SUN4V_CHIP_NIAGARA3 ||

			    sun4v_chip_type == SUN4V_CHIP_NIAGARA4 ||

			    sun4v_chip_type == SUN4V_CHIP_NIAGARA5)

			    sun4v_chip_type == SUN4V_CHIP_NIAGARA5 ||

			    sun4v_chip_type == SUN4V_CHIP_SPARC64X)

				cap |= (AV_SPARC_VIS | AV_SPARC_VIS2 |

					AV_SPARC_ASI_BLK_INIT |

					AV_SPARC_POPC);

			if (sun4v_chip_type == SUN4V_CHIP_NIAGARA3 ||

			    sun4v_chip_type == SUN4V_CHIP_NIAGARA4 ||

			    sun4v_chip_type == SUN4V_CHIP_NIAGARA5)

			    sun4v_chip_type == SUN4V_CHIP_NIAGARA5 ||

			    sun4v_chip_type == SUN4V_CHIP_SPARC64X)

				cap |= (AV_SPARC_VIS3 | AV_SPARC_HPC |

					AV_SPARC_FMAF);

		}