ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-19 07:38:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lx_kit(x86): restrict usb heuristics to usb

Browse Source 
Issue #4450
This commit is contained in:
Alexander Boettcher
2022-03-15 12:05:38 +01:00
committed by Christian Helmuth
parent cda0fafbd1
commit 6d924d3285
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
repos/dde_linux/src/include/spec/x86/lx_kit/platform_session/device.h
View File

@ -51,6 +51,7 @@ class Platform::Device : Interface, Noncopyable
Connection &_platform; Connection &_platform;
Legacy_platform::Device_capability _device_cap { }; Legacy_platform::Device_capability _device_cap { };
Name _name { }; Name _name { };
unsigned _class_code { };
public: public:

51
repos/dde_linux/src/lib/lx_kit/spec/x86/platform.cc
View File

@ -272,6 +272,9 @@ Platform::Device::Device(Connection &platform, Name name)
error(__func__, ": could not get device capability"); error(__func__, ": could not get device capability");
throw -1; throw -1;
} }
Legacy_platform::Device_client device(_device_cap);
_class_code = device.class_code() >> 8;
} }
@ -311,29 +314,37 @@ void Platform::Device::Config_space::write(unsigned char address,
return; return;
} }
/* reject writes to unknown addresses */ enum {
switch (address) { CLASS_CODE_USB = 0xc03,
case 0x04: };
switch(_device._class_code) {
case CLASS_CODE_USB:
/* reject writes to unknown addresses */
switch (address) {
case 0x04:
/*
* Doing this multiple times induces multiple "assignment of PCI
* device" diasgnostics currently.
*/
/* command register (value for enable io, memory, bus master) */
value = 7;
break;
/* /*
* Doing this multiple times induces multiple "assignment of PCI * Write in [0x40,0xff] should be okay if there are is no capability
* device" diasgnostics currently. * list (status register bit 4 + capability list pointer). Otherwise,
* writes into capability-list entries should be rejected.
*/ */
/* command register (value for enable io, memory, bus master) */
value = 7; case 0xc0: /* UHCI BIOS handoff (UHCI_USBLEGSUP) */ break;
case 0xc4: /* UHCI INTEL resume-enable (USBRES_INTEL) */ break;
case 0x60 ... 0x6f: /* EHCI BIOS handoff (just empiric, address not fixed) */ break;
default:
return;
}
break; break;
/*
* Write in [0x40,0xff] should be okay if there are is no capability
* list (status register bit 4 + capability list pointer). Otherwise,
* writes into capability-list entries should be rejected.
*/
case 0xc0: /* UHCI BIOS handoff (UHCI_USBLEGSUP) */ break;
case 0xc4: /* UHCI INTEL resume-enable (USBRES_INTEL) */ break;
case 0x60 ... 0x6f: /* EHCI BIOS handoff (just empiric, address not fixed) */ break;
default:
return;
} }
Legacy_platform::Device::Access_size const as = convert(size); Legacy_platform::Device::Access_size const as = convert(size);