jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shared SMBus Access Using Global Mutex on Windows

Browse source
This commit is contained in:
Shady Nawara 2022-10-14 00:58:54 +00:00 • committed by Adam Honse
parent be90ba335e
commit 6f477d6c4c
9 changed files with 252 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

48
i2c_smbus/i2c_smbus_i801.cpp
View file

@ -9,8 +9,9 @@
\*-----------------------------------------*/
#include "i2c_smbus_i801.h"
#include "ResourceManager.h"
#ifdef _WIN32
#include <Windows.h>
#include "OlsApi.h"
#elif _MACOSX_X86_X64
#include "macUSPCIOAccess.h"
@ -20,6 +21,33 @@
using namespace std::chrono_literals;
i2c_smbus_i801::i2c_smbus_i801()
{
#ifdef _WIN32
json drivers_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Drivers");
bool shared_smbus_access = true;
if(drivers_settings.contains("shared_smbus_access"))
{
shared_smbus_access = drivers_settings["shared_smbus_access"].get<bool>();
}
if(shared_smbus_access)
{
global_smbus_access_handle = CreateMutexA(NULL, FALSE, GLOBAL_SMBUS_MUTEX_NAME);
}
#endif
}
i2c_smbus_i801::~i2c_smbus_i801()
{
#ifdef _WIN32
if(global_smbus_access_handle != NULL)
{
CloseHandle(global_smbus_access_handle);
}
#endif
}
/* Return negative errno on error. */
s32 i2c_smbus_i801::i801_access(u16 addr, char read_write, u8 command, int size, i2c_smbus_data *data)
{
@ -486,7 +514,23 @@ int i2c_smbus_i801::i801_wait_intr()
s32 i2c_smbus_i801::i2c_smbus_xfer(u8 addr, char read_write, u8 command, int size, i2c_smbus_data* data)
{
return i801_access(addr, read_write, command, size, data);
#ifdef _WIN32
if(global_smbus_access_handle != NULL)
{
WaitForSingleObject(global_smbus_access_handle, INFINITE);
}
#endif
s32 result = i801_access(addr, read_write, command, size, data);
#ifdef _WIN32
if(global_smbus_access_handle != NULL)
{
ReleaseMutex(global_smbus_access_handle);
}
#endif
return result;
}
s32 i2c_smbus_i801::i2c_xfer(u8 addr, char read_write, int* size, u8* data)

16
i2c_smbus/i2c_smbus_i801.h
View file

@ -10,6 +10,10 @@
#include "i2c_smbus.h"
#ifdef _WIN32
#include <Windows.h>
#endif
#pragma once
/* BIT shifting macro */
@ -81,10 +85,16 @@
#define SMBHSTCFG 0x040
#define SMBHSTCFG_HST_EN BIT(0)
#ifdef _WIN32
#define GLOBAL_SMBUS_MUTEX_NAME "Global\\Access_SMBUS.HTP.Method"
#endif
class i2c_smbus_i801 : public i2c_smbus_interface
{
public:
u16 i801_smba = 0xF000;
i2c_smbus_i801();
~i2c_smbus_i801();
private:
s32 i801_access(u16 addr, char read_write, u8 command, int size, i2c_smbus_data *data);
@ -97,4 +107,8 @@ private:
int i801_wait_intr();
s32 i2c_smbus_xfer(u8 addr, char read_write, u8 command, int size, i2c_smbus_data* data);
s32 i2c_xfer(u8 addr, char read_write, int* size, u8* data);
};
#ifdef _WIN32
HANDLE global_smbus_access_handle = NULL;
#endif
};

39
i2c_smbus/i2c_smbus_nct6775.cpp
View file

@ -7,12 +7,35 @@
\*-----------------------------------------*/
#include "i2c_smbus_nct6775.h"
#include <Windows.h>
#include "OlsApi.h"
#include "LogManager.h"
#include "ResourceManager.h"
using namespace std::chrono_literals;
i2c_smbus_nct6775::i2c_smbus_nct6775()
{
json drivers_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Drivers");
bool shared_smbus_access = true;
if(drivers_settings.contains("shared_smbus_access"))
{
shared_smbus_access = drivers_settings["shared_smbus_access"].get<bool>();
}
if(shared_smbus_access)
{
global_smbus_access_handle = CreateMutexA(NULL, FALSE, GLOBAL_SMBUS_MUTEX_NAME);
}
}
i2c_smbus_nct6775::~i2c_smbus_nct6775()
{
if(global_smbus_access_handle != NULL)
{
CloseHandle(global_smbus_access_handle);
}
}
s32 i2c_smbus_nct6775::nct6775_access(u16 addr, char read_write, u8 command, int size, i2c_smbus_data *data)
{
int i, len, status, cnt;
@ -186,7 +209,19 @@ s32 i2c_smbus_nct6775::nct6775_access(u16 addr, char read_write, u8 command, int
s32 i2c_smbus_nct6775::i2c_smbus_xfer(u8 addr, char read_write, u8 command, int size, i2c_smbus_data* data)
{
return nct6775_access(addr, read_write, command, size, data);
if(global_smbus_access_handle != NULL)
{
WaitForSingleObject(global_smbus_access_handle, INFINITE);
}
s32 result = nct6775_access(addr, read_write, command, size, data);
if(global_smbus_access_handle != NULL)
{
ReleaseMutex(global_smbus_access_handle);
}
return result;
}
s32 i2c_smbus_nct6775::i2c_xfer(u8 addr, char read_write, int* size, u8* data)

5
i2c_smbus/i2c_smbus_nct6775.h
View file

@ -7,6 +7,7 @@
\*-----------------------------------------*/
#include "i2c_smbus.h"
#include <Windows.h>
#pragma once
@ -44,15 +45,19 @@
/* Other settings */
#define NCT6775_MAX_RETRIES 400
#define GLOBAL_SMBUS_MUTEX_NAME "Global\\Access_SMBUS.HTP.Method"
class i2c_smbus_nct6775: public i2c_smbus_interface
{
public:
u16 nct6775_smba = 0x0290;
i2c_smbus_nct6775();
~i2c_smbus_nct6775();
private:
s32 nct6775_access(u16 addr, char read_write, u8 command, int size, i2c_smbus_data *data);
s32 i2c_smbus_xfer(u8 addr, char read_write, u8 command, int size, i2c_smbus_data* data);
s32 i2c_xfer(u8 addr, char read_write, int* size, u8* data);
HANDLE global_smbus_access_handle = NULL;
};

32
i2c_smbus/i2c_smbus_piix4.cpp
View file

@ -16,13 +16,12 @@
i2c_smbus_piix4::i2c_smbus_piix4()
{
json drivers_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Drivers");
bool amd_smbus_reduce_cpu = false;
bool amd_smbus_reduce_cpu = false;
if(drivers_settings.contains("amd_smbus_reduce_cpu"))
{
amd_smbus_reduce_cpu = drivers_settings["amd_smbus_reduce_cpu"].get<bool>();
}
if(amd_smbus_reduce_cpu)
{
delay_timer = CreateWaitableTimerExW(NULL, NULL, CREATE_WAITABLE_TIMER_MANUAL_RESET | CREATE_WAITABLE_TIMER_HIGH_RESOLUTION, TIMER_ALL_ACCESS);
@ -31,6 +30,16 @@ i2c_smbus_piix4::i2c_smbus_piix4()
delay_timer = CreateWaitableTimer(NULL, TRUE, NULL); // create regular timer instead
}
}
bool shared_smbus_access = true;
if(drivers_settings.contains("shared_smbus_access"))
{
shared_smbus_access = drivers_settings["shared_smbus_access"].get<bool>();
}
if(shared_smbus_access)
{
global_smbus_access_handle = CreateMutexA(NULL, FALSE, GLOBAL_SMBUS_MUTEX_NAME);
}
}
i2c_smbus_piix4::~i2c_smbus_piix4()
@ -39,6 +48,11 @@ i2c_smbus_piix4::~i2c_smbus_piix4()
{
CloseHandle(delay_timer);
}
if(global_smbus_access_handle != NULL)
{
CloseHandle(global_smbus_access_handle);
}
}
//Logic adapted from piix4_transaction() in i2c-piix4.c
@ -221,7 +235,19 @@ s32 i2c_smbus_piix4::piix4_access(u16 addr, char read_write, u8 command, int siz
s32 i2c_smbus_piix4::i2c_smbus_xfer(u8 addr, char read_write, u8 command, int size, i2c_smbus_data* data)
{
return piix4_access(addr, read_write, command, size, data);
if(global_smbus_access_handle != NULL)
{
WaitForSingleObject(global_smbus_access_handle, INFINITE);
}
s32 result = piix4_access(addr, read_write, command, size, data);
if(global_smbus_access_handle != NULL)
{
ReleaseMutex(global_smbus_access_handle);
}
return result;
}
s32 i2c_smbus_piix4::i2c_xfer(u8 addr, char read_write, int* size, u8* data)

3
i2c_smbus/i2c_smbus_piix4.h
View file

@ -37,6 +37,8 @@
#define PIIX4_WORD_DATA 0x0C
#define PIIX4_BLOCK_DATA 0x14
#define GLOBAL_SMBUS_MUTEX_NAME "Global\\Access_SMBUS.HTP.Method"
class i2c_smbus_piix4 : public i2c_smbus_interface
{
public:
@ -50,4 +52,5 @@ private:
s32 i2c_smbus_xfer(u8 addr, char read_write, u8 command, int size, i2c_smbus_data* data);
s32 i2c_xfer(u8 addr, char read_write, int* size, u8* data);
HANDLE delay_timer;
HANDLE global_smbus_access_handle = NULL;
};