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

Commit c30a4df3 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[POWERPC] Use ppc_md.hpte_insert() in htab_bolt_mapping() 



With the ppc_md htab pointers setup earlier, we can use ppc_md.hpte_insert
in htab_bolt_mapping(), rather than deciding which version to call by hand.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 7d0daae4

arch/powerpc/mm/hash_utils_64.c

+6 −28
Original line number Diff line number Diff line
@@ -167,34 +167,12 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, 
		hash = hpt_hash(va, shift);

		hpteg = ((hash & htab_hash_mask) * HPTES_PER_GROUP);



		/* The crap below can be cleaned once ppd_md.probe() can

		 * set up the hash callbacks, thus we can just used the

		 * normal insert callback here.

		 */

#ifdef CONFIG_PPC_ISERIES

		if (machine_is(iseries))

			ret = iSeries_hpte_insert(hpteg, va,

						  paddr,

						  tmp_mode,

						  HPTE_V_BOLTED,

						  psize);

		else

#endif

#ifdef CONFIG_PPC_PSERIES

		if (machine_is(pseries) && firmware_has_feature(FW_FEATURE_LPAR))

			ret = pSeries_lpar_hpte_insert(hpteg, va,

						       paddr,

						       tmp_mode,

						       HPTE_V_BOLTED,

						       psize);

		else

#endif

#ifdef CONFIG_PPC_MULTIPLATFORM

			ret = native_hpte_insert(hpteg, va,

						 paddr,

						 tmp_mode, HPTE_V_BOLTED,

						 psize);

#endif

		DBG("htab_bolt_mapping: calling %p\n", ppc_md.hpte_insert);



		BUG_ON(!ppc_md.hpte_insert);

		ret = ppc_md.hpte_insert(hpteg, va, paddr,

				tmp_mode, HPTE_V_BOLTED, psize);



		if (ret < 0)

			break;

	}