nexoniarz/SchOS
nexoniarz/SchOS
Watch
1
0
Fork
You've already forked SchOS
 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

i2c-hid: the touchpad crash was a printf format, not the driver

Browse source 
The PSOGM on the ASUS TUF A15 was a page fault in cprintf, from probe(),
in the touchpad driver's own success message. cprintf had no field widths:
"%04x" printed literally and consumed no argument, so the "%s" after it
was handed the product ID as a string pointer. "%lx" misprinted the same
way -- "0x4275838976x" for 0xFEDC2000 -- on the line before.

The driver's formats are fixed, and cprintf now steps over flags and
widths and takes l/ll/z as 64-bit, so a directive it does not render can
no longer shift every argument after it. Until now any %ld or %lu printed
the number followed by a stray letter.

The touchpad on/off entry in the boot menu has served its purpose and is
gone; the verbose step trace stays.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01S1giNvrHTrPMPw7V6x1kQ4
This commit is contained in:
Nexoniarz 2026-10-25 00:28:23 +02:00
commit 5ea03c4cf5
5 changed files with 43 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/acpi/i2c_hid.c
View file

@ -43,8 +43,6 @@
#include "core/param.h"
#include "core/spinlock.h"
#include "arch/mmu.h"
#include "arch/memlayout.h"
#include "arch/schboot.h"
#include "dev/hid.h"
#include "dev/acpi.h"
@ -177,10 +175,10 @@ dw_init(struct dwi2c *c, uacpi_namespace_node *node, uint32 speed)
c->regs = ioremap(c->phys, 0x1000);
if(c->regs == 0)
return -1;
STEP("i2c: controller registers at 0x%lx\n", c->phys);
STEP("i2c: controller registers at 0x%p\n", c->phys);
type = rd(c, IC_COMP_TYPE);
if(type != DW_COMP_TYPE){
cprintf("i2c: controller at 0x%lx is not DesignWare (0x%x)\n",
cprintf("i2c: controller at 0x%p is not DesignWare (0x%x)\n",
c->phys, type);
return -1;
}
@ -422,7 +420,7 @@ controller(const char *path, uint32 speed)
if(dw_init(c, node, speed) < 0)
return 0;
nctl++;
cprintf("i2c: %s at 0x%lx, %s mode, FIFOs %d/%d\n", path, c->phys,
cprintf("i2c: %s at 0x%p, %s mode, FIFOs %d/%d\n", path, c->phys,
c->fast ? "fast" : "standard", c->txdepth, c->rxdepth);
return c;
}
@ -605,7 +603,7 @@ probe(void *user, uacpi_namespace_node *node, uacpi_u32 depth)
cprintf("i2c-hid: %s is neither a keyboard nor a pointer\n", d->name);
return UACPI_ITERATION_DECISION_CONTINUE;
}
cprintf("i2c-hid: %s: %04x:%04x at 0x%x, %s\n", d->name,
cprintf("i2c-hid: %s: %x:%x at 0x%x, %s\n", d->name,
desc[20] | desc[21] << 8, desc[22] | desc[23] << 8, d->addr,
d->pin ? "interrupt pin watched" : "polled");
ndev++;
@ -666,10 +664,6 @@ i2c_hid_start(void)
{
if(acpi_rsdp_phys() == 0)
return;
if(*(volatile uchar *)P2V(SCHBOOT_OFF_FLAGS) & SCHBOOT_OFF_I2C_HID){
cprintf("i2c-hid: off, as chosen at the boot menu\n");
return;
}
if(kthread_create(i2c_hid_thread, "i2chid") < 0)
cprintf("i2c-hid: no thread; touchpads will not work\n");
}

31
kernel/core/console.c
View file

@ -119,20 +119,39 @@ vcprintf(char *fmt, va_list ap)
continue;
}
c = fmt[++i] & 0xff;
// Flags and a width are stepped over, and l/ll/z make the conversion
// 64-bit. Not because the output honours them -- it does not pad -- but
// because a conversion this function did not understand used to consume
// no argument, and every one after it then read the wrong one. "%04x"
// before a "%s" handed the %s an integer as a string, and the touchpad
// driver's first message on real hardware was a page fault in here.
while (c == '0' || c == '-' || c == '+' || c == ' ' || c == '#')
c = fmt[++i] & 0xff;
while (c >= '1' && c <= '9')
c = fmt[++i] & 0xff;
while (c >= '0' && c <= '9')
c = fmt[++i] & 0xff;
int wide = 0;
while (c == 'l' || c == 'z') {
wide = 1;
c = fmt[++i] & 0xff;
}
if (c == 0)
break;
switch(c) {
case 'd':
print_int(va_arg(ap, int), 10, 1);
case 'i':
print_int(wide ? va_arg(ap, int64) : va_arg(ap, int), 10, 1);
break;
case 'u':
print_int(va_arg(ap, uint32), 10, 0);
break;
case 'l':
print_int(va_arg(ap, int64), 10, 1);
print_int(wide ? va_arg(ap, uint64) : va_arg(ap, uint32), 10, 0);
break;
case 'x':
print_int(va_arg(ap, uint32), 16, 0);
case 'X':
print_int(wide ? va_arg(ap, uint64) : va_arg(ap, uint32), 16, 0);
break;
case 'c':
consputc(va_arg(ap, int));
break;
case 'p':
print_int(va_arg(ap, uint64), 16, 0);

7
kernel/drivers/bus/xhci/xhci.c
View file

@ -1059,10 +1059,9 @@ attach_device(struct xhci *x, const struct usb_dev *proto, int parent,
goto fail;
}
// cprintf understands %d %u %l %x %p %b %s and nothing else -- no field
// widths. "%04x" is not a directive to it: it prints '%' and '0' literally,
// consumes no argument, and every argument after it lands in the wrong
// place. That is what turned this line into rubbish, not the enumeration.
// cprintf does not pad: "%04x" prints like "%x". It used to be worse -- an
// unknown directive consumed no argument and every one after it landed in
// the wrong place, which is what once turned this line into rubbish.
cprintf("usb: port %d%s slot %d %x:%x %s, %s speed, %d configuration%s\n",
proto->port, proto->route ? " (via hub)" : "", slot,
desc->idVendor, desc->idProduct,