Skip to content

Fixes cursor movement lagging or jumping since 2.1.4+ #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Erictoby wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fixes cursor movement lagging or jumping since 2.1.4+ #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f42a0b
Fixes cursor movement lagging or jumping since 2.1.4+
Erictoby Sep 2, 2019
cf8387f
Fixes deadlock or delays in interrupt loop.
Erictoby Sep 8, 2019
eb42516
Enable GPIO interrupt after initing all parameters
Erictoby Sep 14, 2019
bd3b177
Minor change - PMInit location.
Erictoby Sep 23, 2019
ec0b2d9
Reduce CPU load caused by too many GPIO interrupts
Erictoby Sep 28, 2019
268d60a
Merge pull request #1 from coolstar/master
Erictoby Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 68 additions & 55 deletions VoodooGPIO/VoodooGPIO.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,26 +85,6 @@ void VoodooGPIO::writel(UInt32 b, IOVirtualAddress addr) {
*(volatile UInt32 *)(addr) = b;
}

IOWorkLoop* VoodooGPIO::getWorkLoop() {
// Do we have a work loop already?, if so return it NOW.
if ((vm_address_t) workLoop >> 1)
return workLoop;

if (OSCompareAndSwap(0, 1, reinterpret_cast<IOWorkLoop*>(&workLoop))) {
// Construct the workloop and set the cntrlSync variable
// to whatever the result is and return
workLoop = IOWorkLoop::workLoop();
} else {
while (reinterpret_cast<IOWorkLoop*>(workLoop) == reinterpret_cast<IOWorkLoop*>(1)) {
// Spin around the cntrlSync variable until the
// initialization finishes.
thread_block(0);
}
}

return workLoop;
}

struct intel_community *VoodooGPIO::intel_get_community(unsigned pin) {
struct intel_community *community;
for (int i = 0; i < ncommunities; i++) {
Expand Down Expand Up @@ -285,7 +265,7 @@ void VoodooGPIO::intel_gpio_irq_enable(UInt32 pin) {
gpp = padgrp->reg_num;
gpp_offset = padgroup_offset(padgrp, pin);
/* Clear interrupt status first to avoid unexpected interrupt */
writel(BIT(gpp_offset), community->regs + GPI_IS + gpp * 4);
writel((UInt32)BIT(gpp_offset), community->regs + GPI_IS + gpp * 4);

value = readl(community->regs + community->ie_offset + gpp * 4);
value |= BIT(gpp_offset);
Expand Down Expand Up @@ -385,7 +365,7 @@ bool VoodooGPIO::intel_pinctrl_add_padgroups(intel_community *community) {
unsigned gpp_size = community->gpp_size;
gpps[i].reg_num = i;
gpps[i].base = community->pin_base + i * gpp_size;
gpps[i].size = min(gpp_size, npins);
gpps[i].size = (UInt32)min(gpp_size, npins);
gpps[i].gpio_base = 0;
npins -= gpps[i].size;
}
Expand Down Expand Up @@ -564,7 +544,7 @@ bool VoodooGPIO::start(IOService *provider) {
if (!IOService::start(provider))
return false;

PMinit();
isInterruptBusy = true;

workLoop = getWorkLoop();
if (!workLoop) {
Expand All @@ -574,23 +554,21 @@ bool VoodooGPIO::start(IOService *provider) {
}
workLoop->retain();

interruptSource = IOInterruptEventSource::interruptEventSource(this, OSMemberFunctionCast(IOInterruptEventAction, this, &VoodooGPIO::InterruptOccurred), provider);
if (!interruptSource) {
IOLog("%s::Failed to get GPIO Controller interrupt!\n", getName());
stop(provider);
return false;
}

workLoop->addEventSource(interruptSource);
interruptSource->enable();

command_gate = IOCommandGate::commandGate(this);
if (!command_gate || (workLoop->addEventSource(command_gate) != kIOReturnSuccess)) {
IOLog("%s Could not open command gate\n", getName());
stop(provider);
return false;
}

interruptSource = IOInterruptEventSource::interruptEventSource(this, OSMemberFunctionCast(IOInterruptEventAction, this, &VoodooGPIO::InterruptOccurred), provider);
if (!interruptSource || (workLoop->addEventSource(interruptSource) != kIOReturnSuccess)) {
IOLog("%s::Failed to get GPIO Controller interrupt!\n", getName());
stop(provider);
return false;
}
interruptSource->enable();

IOLog("%s::VoodooGPIO Init!\n", getName());

for (int i = 0; i < ncommunities; i++) {
Expand Down Expand Up @@ -648,10 +626,15 @@ bool VoodooGPIO::start(IOService *provider) {
sz = sizeof(void *) * communities[i].npins;
communities[i].pinInterruptRefcons = (void **)IOMalloc(sz);
memset(communities[i].pinInterruptRefcons, 0, sz);

communities[i].isActiveCommunity = (bool *)IOMalloc(1);;
*communities[i].isActiveCommunity = false;
}
nInactiveCommunities = (UInt32)ncommunities - 1;

intel_pinctrl_pm_init();

isInterruptBusy = false;
controllerIsAwake = true;

registerService();
Expand All @@ -674,6 +657,7 @@ bool VoodooGPIO::start(IOService *provider) {
myPowerStates[1].outputPowerCharacter = kIOPMPowerOn;
myPowerStates[1].inputPowerRequirement = kIOPMPowerOn;

PMinit();
provider->joinPMtree(this);

registerPowerDriver(this, myPowerStates, kMyNumberOfStates);
Expand All @@ -684,6 +668,17 @@ bool VoodooGPIO::start(IOService *provider) {
void VoodooGPIO::stop(IOService *provider) {
IOLog("%s::VoodooGPIO stop!\n", getName());

if (interruptSource) {
interruptSource->disable();
workLoop->removeEventSource(interruptSource);
OSSafeReleaseNULL(interruptSource);
}

if (command_gate) {
workLoop->removeEventSource(command_gate);
OSSafeReleaseNULL(command_gate);
}

intel_pinctrl_pm_release();

for (int i = 0; i < ncommunities; i++) {
Expand All @@ -702,17 +697,7 @@ void VoodooGPIO::stop(IOService *provider) {
IOFree(communities[i].pinInterruptAction, sizeof(IOInterruptAction) * communities[i].npins);
IOFree(communities[i].interruptTypes, sizeof(unsigned) * communities[i].npins);
IOFree(communities[i].pinInterruptRefcons, sizeof(void *) * communities[i].npins);
}

if (interruptSource) {
interruptSource->disable();
workLoop->removeEventSource(interruptSource);
OSSafeReleaseNULL(interruptSource);
}

if (command_gate) {
workLoop->removeEventSource(command_gate);
OSSafeReleaseNULL(command_gate);
IOFree(communities[i].isActiveCommunity, 1);
}

if (workLoop) {
Expand Down Expand Up @@ -765,9 +750,13 @@ IOReturn VoodooGPIO::setPowerState(unsigned long powerState, IOService *whatDevi
return kIOPMAckImplied;
}

void VoodooGPIO::intel_gpio_community_irq_handler(struct intel_community *community) {
void VoodooGPIO::intel_gpio_community_irq_handler(struct intel_community *community, bool *firstdelay) {
for (int gpp = 0; gpp < community->ngpps; gpp++) {
const struct intel_padgroup *padgrp = &community->gpps[gpp];

unsigned padno = padgrp->base - community->pin_base;
if (padno >= community->npins)
break;

unsigned long pending, enabled;

Expand All @@ -778,20 +767,23 @@ void VoodooGPIO::intel_gpio_community_irq_handler(struct intel_community *commun
/* Only interrupts that are enabled */
pending &= enabled;

unsigned padno = padgrp->base - community->pin_base;
if (padno >= community->npins)
break;

for (int i = 0; i < 32; i++) {
bool isPin = (pending >> i) & 0x1;
if (isPin) {
if (pending) {
for (int i = 0; i < 32; i++) {
bool isPin = (pending >> i) & 0x1;
if (!isPin)
continue;

unsigned pin = padno + i;

OSObject *owner = community->pinInterruptActionOwners[pin];
if (owner) {
IOInterruptAction handler = community->pinInterruptAction[pin];
void *refcon = community->pinInterruptRefcons[pin];
handler(owner, refcon, this, pin);
if (*firstdelay) {
*firstdelay = false;
IODelay(25 * nInactiveCommunities); // Reduce CPU load. 25~30us per inactive community was reasonable.
}
}

if (community->interruptTypes[pin] & IRQ_TYPE_LEVEL_MASK)
Expand Down Expand Up @@ -824,7 +816,7 @@ IOReturn VoodooGPIO::registerInterrupt(int pin, OSObject *target, IOInterruptAct
if (hw_pin < 0)
return kIOReturnNoInterrupt;

IOLog("%s::Registering hardware pin %d for GPIO IRQ pin %u", getName(), hw_pin, pin);
IOLog("%s::Registering hardware pin %d for GPIO IRQ pin %u\n", getName(), hw_pin, pin);

unsigned communityidx = hw_pin - community->pin_base;

Expand All @@ -834,6 +826,7 @@ IOReturn VoodooGPIO::registerInterrupt(int pin, OSObject *target, IOInterruptAct
community->pinInterruptActionOwners[communityidx] = target;
community->pinInterruptAction[communityidx] = handler;
community->pinInterruptRefcons[communityidx] = refcon;
*community->isActiveCommunity = true;
return kIOReturnSuccess;
}

Expand Down Expand Up @@ -898,15 +891,35 @@ IOReturn VoodooGPIO::setInterruptTypeForPin(int pin, int type) {

unsigned communityidx = hw_pin - community->pin_base;
community->interruptTypes[communityidx] = type;
if (type & IRQ_TYPE_LEVEL_MASK)
*community->isActiveCommunity = true;
return kIOReturnSuccess;
}

void VoodooGPIO::InterruptOccurred(OSObject *owner, IOInterruptEventSource *src, int intCount) {
command_gate->runAction(OSMemberFunctionCast(IOCommandGate::Action, this, &VoodooGPIO::interruptOccurredGated));
if (isInterruptBusy)
return;
isInterruptBusy = true;

IOReturn ret = command_gate->attemptAction(OSMemberFunctionCast(IOCommandGate::Action, this, &VoodooGPIO::interruptOccurredGated));
if (ret != kIOReturnSuccess) {
isInterruptBusy = false;
IOLog("%s:InterruptOccurred:Failed on attemptAction(). Error code = %X\n", getName(), ret);
}
}

void VoodooGPIO::interruptOccurredGated() {
UInt32 inactive = 0;
bool firstdelay = true;

for (int i = 0; i < ncommunities; i++) {
struct intel_community *community = &communities[i];
intel_gpio_community_irq_handler(community);
if (*community->isActiveCommunity)
intel_gpio_community_irq_handler(community, &firstdelay);
else
inactive++;
}

nInactiveCommunities = (inactive < ncommunities)? inactive : ((UInt32)ncommunities - 1);
isInterruptBusy = false;
}
7 changes: 4 additions & 3 deletions VoodooGPIO/VoodooGPIO.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ struct intel_community {
const struct intel_padgroup *gpps;
size_t ngpps;
bool gpps_alloc;
bool *isActiveCommunity;
/* Reserved for the core driver */
IOMemoryMap *mmap;
IOVirtualAddress regs;
Expand Down Expand Up @@ -199,12 +200,12 @@ class VoodooGPIO : public IOService {
IOWorkLoop *workLoop;
IOInterruptEventSource *interruptSource;
IOCommandGate* command_gate;
bool isInterruptBusy;
UInt32 nInactiveCommunities;

UInt32 readl(IOVirtualAddress addr);
void writel(UInt32 b, IOVirtualAddress addr);

IOWorkLoop* getWorkLoop();

struct intel_community *intel_get_community(unsigned pin);
const struct intel_padgroup *intel_community_get_padgroup(const struct intel_community *community, unsigned pin);
IOVirtualAddress intel_get_padcfg(unsigned pin, unsigned reg);
Expand All @@ -229,7 +230,7 @@ class VoodooGPIO : public IOService {
void intel_gpio_irq_init();
void intel_pinctrl_resume();

void intel_gpio_community_irq_handler(struct intel_community *community);
void intel_gpio_community_irq_handler(struct intel_community *community, bool *firstdelay);

void InterruptOccurred(OSObject *owner, IOInterruptEventSource *src, int intCount);
void interruptOccurredGated();
Expand Down