osy / thunderboltreset Goto Github PK

View Code? Open in Web Editor NEW

37.0 37.0 11.0 53 KB

Reset and disable Thunderbolt ICM

License: Apache License 2.0

C++ 90.37% Makefile 9.63%

thunderboltreset's People

Contributors

Stargazers

Watchers

Forkers

dhinakg maleorderbride andreszerocross tonyarnold sqrdevl bjy1991 northamtrans midi1996 tsingui chatbox1024 benbender

thunderboltreset's Issues

IOKitPersonalities of Info.plist in release-package are b0rked

Hey, no clue how that happened, but the Info.plist of the release-download is broken. It has the following under IOKitPersonalities:

	<key>Polaris22Fixup</key>
	<dict>
		<key>CFBundleIdentifier</key>
		<string>com.osy86.ThunderboltReset</string>
		<key>IOClass</key>
		<string>ThunderboltReset</string>
		<key>IOMatchCategory</key>
		<string>ThunderboltReset</string>
		<key>IOProviderClass</key>
		<string>IOResources</string>
		<key>IOResourceMatch</key>
		<string>IOKit</string>
	</dict>

Therefor the prebuilt Kext cannot work. I rebuilded the kext from source and it worked flawlessly. Thank you!

In the meantime, here is my build for those in need:
ThunderboltReset.kext.zip

Hit "AppleThunderboltNHI::resetNHI: ARC already disabled" all the time

Hi,

I‘m on 10.15.6 (19G73)

I found __ZN27AppleThunderboltIntelPCIHAL15registerWrite32Ejj and __ZN27AppleThunderboltIntelPCIHAL14registerRead32Ej are actually doing the job but not
__ZN26AppleThunderboltGenericHAL15registerWrite32Ejj and __ZN26AppleThunderboltGenericHAL14registerRead32Ej

The latter two seems to be place holders (disassembled and found empty or just return 0xffffffff)

After changing to the former two functions, I still can't get it work. Because of having no knowledge of ICM, I began blind combination trying for REG_FW_STS_ICM_EN_INVERT, REG_FW_STS_ICM_EN and REG_FW_STS_ICM_EN_CPU.

Now my code look like this (symbol already replaced, omitted here for sake of length)

static int PatchedResetHNI(IOService *that) {
    DBGLOG(MODULE_SHORT, "AppleThunderboltNHI::resetNHI called");
    
    IOService *hal = that->getProvider();
    uint32_t reg = HALRegisterRead32(hal, REG_FW_STS);
    DBGLOG(MODULE_SHORT, "AppleThunderboltNHI::resetNHI: REG_FW_STS = 0x%08X", reg);

    if (reg & REG_FW_STS_ICM_EN) {
        DBGLOG(MODULE_SHORT, "ICM is running, disabling");
        
        
//        DBGLOG(MODULE_SHORT, "Put ARC to wait for CIO reset event to happen");
//        reg |= REG_FW_STS_CIO_RESET_REQ;
//        HALRegisterWrite32(hal, REG_FW_STS, reg);
//        IODelay(1000000);
//        reg = HALRegisterRead32(hal, REG_FW_STS);
//        DBGLOG(MODULE_SHORT, "current REG_FW_STS = 0x%08X", reg);
        
        
        DBGLOG(MODULE_SHORT, "Force stopping ICM");
        
        reg &= ~REG_FW_STS_CIO_RESET_REQ;
        reg |= REG_FW_STS_ICM_EN_INVERT;
        reg &= ~REG_FW_STS_ICM_EN;
        reg &= ~REG_FW_STS_ICM_EN_CPU;
        
        DBGLOG(MODULE_SHORT, "Writing REG_FW_STS = 0x%08X", reg);
        
        HALRegisterWrite32(hal, REG_FW_STS, reg);
        DBGLOG(MODULE_SHORT, "Sleep 2 seconds");
        IODelay(2000000);
        reg = HALRegisterRead32(hal, REG_FW_STS);
        DBGLOG(MODULE_SHORT, "current REG_FW_STS = 0x%08X", reg);
    DBGLOG(MODULE_SHORT, "ICM Disabled");
    } else {
        DBGLOG(MODULE_SHORT, "AppleThunderboltNHI::resetNHI: ARC already disabled, bypassing", reg);
    }
    
    return reinterpret_cast<ResetNHI_t>(OriginalResetNHI)(that);;
}

In my case, REG_FW_STS is 0x800001A1 in the beginning, and it is 0xC00001A3 in the end.

It seems the flag REG_FW_STS_ICM_EN is still 1, but I got logs like this:

18 21:39:06.994831-0400 0x73       Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset      init: @ (DBG) ThunderboltReset bootstrap DBG-100-2020-08-18
2020-08-18 21:39:06.996560-0400 0x73       Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) start
2020-08-18 21:39:07.540575-0400 0x119      Default     0x0                  0      0    kernel: (ThunderboltReset) ThunderboltWait: patch not ready yet, delaying thread
2020-08-18 21:39:14.210296-0400 0x119      Default     0x0                  0      0    kernel: (ThunderboltReset) ThunderboltWait: patch not ready yet, delaying thread
2020-08-18 21:39:14.475119-0400 0x56d      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) found AppleThunderboltNHI
2020-08-18 21:39:15.228898-0400 0x119      Default     0x0                  0      0    kernel: (ThunderboltReset) ThunderboltWait: patch completed, returning
2020-08-18 21:39:15.254342-0400 0x119      Default     0x0                  0      0    kernel: (AppleThunderboltNHI) AppleThunderboltGenericHAL::probe
2020-08-18 21:39:15.267798-0400 0x119      Default     0x0                  0      0    kernel: (AppleThunderboltNHI) AppleThunderboltGenericHAL::start
2020-08-18 21:39:17.116114-0400 0x755      Default     0x0                  0      0    kernel: (AppleThunderboltNHI) AppleThunderboltNHIType3::setupPowerSavings - notification based runtime power management
2020-08-18 21:39:17.116213-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) AppleThunderboltNHI::resetNHI called
2020-08-18 21:39:17.116556-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) AppleThunderboltNHI::resetNHI: REG_FW_STS = 0xC00001A1
2020-08-18 21:39:17.131110-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) ICM is running, disabling
2020-08-18 21:39:17.131675-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) Put ARC to wait for CIO reset event to happen
2020-08-18 21:39:18.133902-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) Force stopping ICM
2020-08-18 21:39:18.136387-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) Writing REG_FW_STS = 0xC00001A2
2020-08-18 21:39:18.136916-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) Sleep 1 seconds
2020-08-18 21:39:19.137467-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) ICM Disabled
2020-08-18 21:39:19.138088-0400 0x755      Default     0x0                  0      0    kernel: (AppleThunderboltNHI) Thunderbolt 255 PCI - LS=0x7043 LC=0x0040 SS=0x0140 SC=0x0008 PMCSR=0x0000 RT=0xffffffff NLRT=0xffffffff LWRT=0xffffffff PRRT=0xffffffff TRT=0x0000 TNLRT=0x0000 TLWRT=0x0000 TPRRT=0x0000 TLUP=0x0001
2020-08-18 21:39:19.138130-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) AppleThunderboltNHI::resetNHI called
2020-08-18 21:39:19.138147-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) AppleThunderboltNHI::resetNHI: REG_FW_STS = 0xC00001A3
2020-08-18 21:39:19.138151-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) ICM is running, disabling
2020-08-18 21:39:19.138153-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) Put ARC to wait for CIO reset event to happen
2020-08-18 21:39:20.139122-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) Force stopping ICM
2020-08-18 21:39:20.139125-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) Writing REG_FW_STS = 0xC00001A2
2020-08-18 21:39:20.139130-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) Sleep 1 seconds
2020-08-18 21:39:20.820212-0400 0x755      Default     0x0                  0      0    kernel: (Lilu) ThunderboltReset       tbr: @ (DBG) ICM Disabled
2020-08-18 21:39:23.354631-0400 0x9e0      Default     0x0                  0      0    kernel: (IOThunderboltFamily) IOThunderboltEEPROM::getDROM - Error getting DROM from I/O Registry (0xe00002be)
2020-08-18 21:40:05.220885-0400 0x756      Default     0x0                  0      0    kernel: (IOThunderboltFamily) IOThunderboltController::configReadDWord - ERROR: synchronous call on workloop thread.
2020-08-18 21:40:05.220905-0400 0x756      Default     0x0                  0      0    kernel: (IOThunderboltFamily) IOThunderboltController::configReadDWord - ERROR: synchronous call on workloop thread.
2020-08-18 21:40:05.220939-0400 0x756      Default     0x0                  0      0    kernel: (IOThunderboltFamily) IOThunderboltSwitch<0x0>(0x0)::listenerCallback - Thunderbolt HPD packet for route = 0x0 port = 1 unplug = 1
2020-08-18 21:40:09.827204-0400 0x756      Default     0x0                  0      0    kernel: (IOThunderboltFamily) IOThunderboltSwitch<0x0>(0x0)::listenerCallback - Thunderbolt HPD packet for route = 0x0 port = 1 unplug = 0
2020-08-18 21:40:09.832535-0400 0x756      Default     0x0                  0      0    kernel: (IOThunderboltFamily) IOThunderboltSwitch<0x0>(0x0)::listenerCallback - Thunderbolt HPD packet for route = 0x0 port = 2 unplug = 0
2020-08-18 21:40:09.840319-0400 0x756      Default     0x0                  0      0    kernel: (IOThunderboltFamily) IOThunderboltSwitch<0x0>(0x1)::listenerCallback - Thunderbolt HPD packet for route = 0x1 port = 9 unplug = 0
2020-08-18 21:40:09.840409-0400 0x756      Default     0x0                  0      0    kernel: (IOThunderboltFamily) IOThunderboltSwitch<0x0>(0x1)::listenerCallback - Thunderbolt HPD packet for route = 0x1 port = 2 unplug = 0
2020-08-18 21:40:09.840512-0400 0x756      Default     0x0                  0      0    kernel: (IOThunderboltFamily) IOThunderboltSwitch<0x0>(0x1)::listenerCallback - Thunderbolt HPD packet for route = 0x1 port = 10 unplug = 0
2020-08-18 21:40:10.316879-0400 0x756      Default     0x0                  0      0    kernel: (IOThunderboltFamily) IOThunderboltSwitch<0x0>(0x1)::listenerCallback - Thunderbolt HPD packet for route = 0x1 port = 0 unplug = 0

The IOThunderboltFamily logs occurs when I unplug and plug the thunderbolt cable, but I won't get any log from IOThunderboltFamily in other code combinations, and every log except IOThunderboltEEPROM::getDROM - Error getting DROM from I/O Registry (0xe00002be) can be found in my MacBook as well, which is a good sign I suppose.

I tried to patch IOThunderboltEEPROM::getDROM to return without any error, basically just patching this

jz to nop + jmp, and the log changed to

(IOThunderboltFamily) IOThunderboltSwitchType3(0x0)::readEEPROMInternal - No DROM found. Using default Type 2.1 DROM.
(IOThunderboltFamily) IOThunderboltSwitchType3(0x1)::readEEPROMInternal - No DROM found. Using default Type 2.1 DROM.

And in this case, thunderbolt doesn't work even on startup.

I'm running out of clues now, any help would be appreciated!

failed to find AppleThunderboltGenericHAL::registerWrite32

Device : Dell Inspiron 7590 with JHL6540
By using this clover config i can get my external GPU working as an PCIE device before.
https://github.com/tctien342/Dell-Inspiron-7591-Hackintosh/tree/ca2112a33a55feb609679138c528210058dc3833/EFI/CLOVER/ACPI/patched
ioreg.zip

I'm trying to follow your ACPI patching guide, but stuck at step 1. Bootlog shows "failed to find AppleThunderboltGenericHAL::registerWrite32", but AppleThunderboltGenericHAL is already initialized before. So it seems like this kext doesn't work and ICM is still active. I cannot get any log from command "log stream --process 0 | grep ACPI".

Any help would be appreciated, thanks a lot.

After patching the offset using plist that you gave and flash it to my TB controller, my laptop will take 2-3s than usual when booting from cold boot or restart. Is it normal?
Which offset should I replace the value with? I have read your guide, but still confusing which offset from my TB firmware should I replace, so I just tried your patches plist

Thankyou

Titan Ridge support/required?

Thanks for all of your hard work on getting Thunderbolt working.

Do you know if similar patches are required (or would work) on Titan Ridge controllers/cards?

Recommend Projects

React

A declarative, efficient, and flexible JavaScript library for building user interfaces.
Vue.js

🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
Typescript

TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
TensorFlow

An Open Source Machine Learning Framework for Everyone
Django

The Web framework for perfectionists with deadlines.
Laravel

A PHP framework for web artisans
D3

Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

javascript

JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
web

Some thing interesting about web. New door for the world.
server

A server is a program made to process requests and deliver data to clients.
Machine learning

Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Visualization

Some thing interesting about visualization, use data art
Game

Some thing interesting about game, make everyone happy.

Recommend Org

Facebook

We are working to build community through open source technology. NB: members must have two-factor auth.
Microsoft

Open source projects and samples from Microsoft.
Google

Google ❤️ Open Source for everyone.
Alibaba

Alibaba Open Source for everyone
D3

Data-Driven Documents codes.
Tencent

China tencent open source team.

Jobs

Jooble

osy / thunderboltreset Goto Github PK

thunderboltreset's People

Contributors

Stargazers

Watchers

Forkers

thunderboltreset's Issues

IOKitPersonalities of Info.plist in release-package are b0rked

Hit "AppleThunderboltNHI::resetNHI: ARC already disabled" all the time

failed to find AppleThunderboltGenericHAL::registerWrite32

TBT_ROOT define deocumentation

Titan Ridge no driver

Patching NVM Questions

Titan Ridge support/required?

Recommend Projects

React

Vue.js

Typescript

TensorFlow

Django

Laravel

D3

Recommend Topics

javascript

web

server

Machine learning

Visualization

Game

Recommend Org

Facebook

Microsoft

Google

Alibaba

D3

Tencent

Jobs