Jump to content

Clover General discussion

ErmaC

By ErmaC,
in Clover

 Share
30960 posts in this topic

Recommended Posts

MacNB
MacNB
Posted
Posted (edited)
On 6/24/2019 at 12:34 AM, vector sigma said:

To be clear I've already checked the kernel and the below code seems to at least patch all occurrences as it is programmed for: 


BOOLEAN KernelIvyBridgeXCPM(VOID *kernelData, LOADER_ENTRY *Entry, BOOLEAN use_xcpm_idle)
{
  UINT8       *kern = (UINT8*)kernelData;
  CHAR8       *comment;
  UINT32      i;
  UINT32      patchLocation;
  UINT64      os_version = AsciiOSVersionToUint64(Entry->OSVersion);

  // check whether Ivy Bridge
  if (gCPUStructure.Model != CPU_MODEL_IVY_BRIDGE) {
    DBG("Unsupported platform.\nRequires Ivy Bridge, aborted\n");
    DBG("KernelIvyBridgeXCPM() <===FALSE\n");
    return FALSE;
  }

  // check OS version suit for patches
  // PMheart: attempt to add 10.14 compatibility
  if (os_version < AsciiOSVersionToUint64("10.8.5") || os_version >= AsciiOSVersionToUint64("10.15")) {
    DBG("Unsupported macOS.\nIvy Bridge XCPM requires macOS 10.8.5 - 10.13.x, aborted\n");
    DBG("KernelIvyBridgeXCPM() <===FALSE\n");
    return FALSE;
  } else if (os_version >= AsciiOSVersionToUint64("10.8.5") && os_version < AsciiOSVersionToUint64("10.12")) {
    // 10.8.5 - 10.11.x no need the following kernel patches on Ivy Bridge - we just use -xcpm boot-args
    DBG("KernelIvyBridgeXCPM() <===\n");
    return TRUE;
  }

  DBG("Searching _xcpm_pkg_scope_msr ...\n");
  if (os_version >= AsciiOSVersionToUint64("10.12")) {
    // 10.12+
    patchLocation = 0; // clean out the value just in case
    for (i = 0; i < 0x1000000; i++) {
      if (kern[i+0] == 0xBE && kern[i+1] == 0x07 && kern[i+2] == 0x00 && kern[i+3] == 0x00 &&
          kern[i+4] == 0x00 && kern[i+5] == 0x31 && kern[i+6] == 0xD2 && kern[i+7] == 0xE8) {
        patchLocation = i+7;
        DBG("Found _xcpm_pkg_scope_msr\n");
        break;
      }
    }

    if (patchLocation) {
      for (i = 0; i < 5; i++) {
        kern[patchLocation+i] = 0x90;
      }
      DBG("Applied _xcpm_pkg_scope_msr patch\n");
    } else {
      DBG("_xcpm_pkg_scope_msr not found, patch aborted\n");
      DBG("KernelIvyBridgeXCPM() <===FALSE\n");
      return FALSE;
    }
  }

  comment = "_xcpm_bootstrap";
  if (os_version <= AsciiOSVersionToUint64("10.12.5")) {
    // 10.12 - 10.12.5
    STATIC UINT8 find[] = { 0x83, 0xC3, 0xC4, 0x83, 0xFB, 0x22 };
    STATIC UINT8 repl[] = { 0x83, 0xC3, 0xC6, 0x83, 0xFB, 0x22 };
    applyKernPatch(kern, find, sizeof(find), repl, comment);
  } else if (os_version < AsciiOSVersionToUint64("10.13")) {
    // 10.12.6
    STATIC UINT8 find[] = { 0x8D, 0x43, 0xC4, 0x83, 0xF8, 0x22 };
    STATIC UINT8 repl[] = { 0x8D, 0x43, 0xC6, 0x83, 0xF8, 0x22 };
    applyKernPatch(kern, find, sizeof(find), repl, comment);
    // PMheart: attempt to add 10.14 compatibility
  } else if (os_version < AsciiOSVersionToUint64("10.15")) {
    // 10.13/10.14
    STATIC UINT8 find[] = { 0x89, 0xD8, 0x04, 0xC4, 0x3C, 0x22 };
    STATIC UINT8 repl[] = { 0x89, 0xD8, 0x04, 0xC6, 0x3C, 0x22 };
    applyKernPatch(kern, find, sizeof(find), repl, comment);
    // PMheart: attempt to add 10.15 compatibility
  } else if (os_version < AsciiOSVersionToUint64("10.16")) {
    STATIC UINT8 find[] = { 0x8D, 0x43, 0xC4, 0x3C, 0x22 };
    STATIC UINT8 repl[] = { 0x8D, 0x43, 0xC6, 0x3C, 0x22 };
    applyKernPatch(kern, find, sizeof(find), repl, comment);
  }

uless my cpu isn't involved, but should since is it a Core i5 3210M if I correctly understood the code.

 

Can anyone confirm that this (actually the latest code) works with 10.15.4 ?

I set KernelXCPM=Yes and for 10.14.6, XCPM mode is enabled.

If I now boot 10.15.4, with the same config.plist file, XCPM mode is not enabled.

 

Is this patch still valid: 

.
.
.
else if (os_version < AsciiOSVersionToUint64("10.16")) {
    STATIC UINT8 find[] = { 0x8D, 0x43, 0xC4, 0x3C, 0x22 };
    STATIC UINT8 repl[] = { 0x8D, 0x43, 0xC6, 0x3C, 0x22 };
    applyKernPatch(kern, find, sizeof(find), repl, comment);
.
.
.

 

Edited by MacNB
MacNB
MacNB
Posted
Posted
7 minutes ago, vector sigma said:

Sorry I'm still with 10.15.3

 

10.15.3 is > 10.15 which means it is < 10.16 which means that patch must be getting applied for you.

If you run this check from terminal:  

sysctl -n machdep.xcpm.mode

does it return 1 or 0 ?

thx

vector sigma
vector sigma
Posted
Posted
8 minutes ago, MacNB said:

 

10.15.3 is > 10.15 which means it is < 10.16 which means that patch must be getting applied for you.

If you run this check from terminal:  


sysctl -n machdep.xcpm.mode

does it return 1 or 0 ?

thx

Of course that is working, but you ask something else

MacNB
MacNB
Posted
Posted
12 minutes ago, vector sigma said:

if work in 10.15.4 and I answered I'm still in 10.15.3 which works fine but sorry I'm not sure what you miss.

 

What I missed was that I was looking at the code above (posted back in June 2019) and according to that logic it should not work for 10.15.3.

 

But I just checked the latest patch code and now I understand why it works for you: 

else if (os_version < AsciiOSVersionToUint64("10.15")) {
    // 10.13/10.14
    STATIC UINT8 find[] = { 0x89, 0xD8, 0x04, 0xC4, 0x3C, 0x22 };
    STATIC UINT8 repl[] = { 0x89, 0xD8, 0x04, 0xC6, 0x3C, 0x22 };
    applyKernPatch(kern, find, sizeof(find), repl, comment);
    // PMheart: attempt to add 10.15 compatibility
  } else if (os_version < AsciiOSVersionToUint64("10.15.4")) {
    STATIC UINT8 find[] = { 0x8D, 0x43, 0xC4, 0x3C, 0x22 };
    STATIC UINT8 repl[] = { 0x8D, 0x43, 0xC6, 0x3C, 0x22 };
    applyKernPatch(kern, find, sizeof(find), repl, comment);
  } else if (os_version < AsciiOSVersionToUint64("10.16")) {
    STATIC UINT8 find[] = { 0x80, 0xC3, 0xC4, 0x80, 0xFB, 0x42 };
    STATIC UINT8 repl[] = { 0x80, 0xC3, 0xC6, 0x80, 0xFB, 0x42 };
    applyKernPatch(kern, find, sizeof(find), repl, comment);

For 10.15.4+, that patch does not work. I think I need to raise a bug.

Thx for bearing with me.

vector sigma
vector sigma
Posted
Posted (edited)

You have to look at your kernel for find bytes if still exist

else if (os_version < AsciiOSVersionToUint64("10.16")) {

    STATIC UINT8 find[] = { 0x80, 0xC3, 0xC4, 0x80, 0xFB, 0x42 };

    STATIC UINT8 repl[] = { 0x80, 0xC3, 0xC1, 0x80, 0xFB, 0x42 };

    applyKernPatch(kern, find, sizeof(find), repl, comment);

  }

Edited by vector sigma
MacNB
MacNB
Posted
Posted
20 minutes ago, vector sigma said:

You have to look at your kernel for find bytes if still exist

else if (os_version < AsciiOSVersionToUint64("10.16")) {

    STATIC UINT8 find[] = { 0x80, 0xC3, 0xC4, 0x80, 0xFB, 0x42 };

    STATIC UINT8 repl[] = { 0x80, 0xC3, 0xC1, 0x80, 0xFB, 0x42 };

    applyKernPatch(kern, find, sizeof(find), repl, comment);

  }

 

Bites 0x80, 0xC3, 0xC4, 0x80, 0xFB, 0x42 exists and gets patched I think but that does not enable XCPM.

 

BTW, in the replace bytes you quoted above ( 0x80, 0xC3, 0xC1, 0x80, 0xFB, 0x42) there's one byte different from the sources. The 0xC1 should be 0xC6 for Ivy Bridge ?.

 

vector sigma
vector sigma
Posted
Posted (edited)
3 hours ago, MacNB said:

 

Bites 0x80, 0xC3, 0xC4, 0x80, 0xFB, 0x42 exists and gets patched I think but that does not enable XCPM.

 

BTW, in the replace bytes you quoted above ( 0x80, 0xC3, 0xC1, 0x80, 0xFB, 0x42) there's one byte different from the sources. The 0xC1 should be 0xC6 for Ivy Bridge ?.

 

not for Ivy bridge, yuo mean as 'mov' in assembly?..could be. Tried?  edit, yes you're right

Edited by vector sigma
stinga11
stinga11
Posted
Posted

Greetings, I spent a while without using clover trying other bootloaders but in the end I decided to go back to clover and noticed that one of the functions I used before now doesn't work. In my drivers folder I have the NTFS.efi driver and in (boot/default Boot Volume) I wrote "System Reserved" and it does not work instead of showing that partition by default the one of Mac continues to appear.

MacNB
MacNB
Posted
Posted (edited)
2 hours ago, vector sigma said:

Just updated to 10.15.5 Beta 2 (19F62f) and the xcpm patch doesn't work

Thanks for updating your system and testing.

You're probably in a better influencing position than me to report it :P ?

Edited by MacNB
  • Like 1
 Share
Go to topic listing
×
×
  • Create New...