system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 18:15:58 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Kernel/USB: Add UKBuffer variants of certain BulkPipe/Transfer functions

Browse source 
These will be useful for directly accessing the source/destination
buffers, without going through a third buffer first.
This commit is contained in:
Hendiadyoin1 2023-08-31 16:53:00 +02:00 committed by Andrew Kaster
parent 8335803045
commit 4b327bdc95
4 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Kernel/Bus/USB/USBPipe.cpp
View file

@ -94,6 +94,22 @@ ErrorOr<size_t> BulkInPipe::submit_bulk_in_transfer(size_t length, void* data)
return transfer_length;
}
ErrorOr<size_t> BulkInPipe::submit_bulk_in_transfer(size_t length, UserOrKernelBuffer data)
{
VERIFY(length <= m_dma_buffer->size());
MutexLocker lock(m_dma_buffer_lock);
auto transfer = TRY(Transfer::create(*this, length, *m_dma_buffer));
dbgln_if(USB_DEBUG, "Pipe: Bulk in transfer allocated @ {}", transfer->buffer_physical());
size_t transfer_length = TRY(m_controller->submit_bulk_transfer(*transfer));
TRY(data.write(transfer->buffer().as_ptr(), min(length, transfer_length)));
dbgln_if(USB_DEBUG, "Pipe: Bulk in transfer complete!");
return transfer_length;
}
ErrorOr<NonnullOwnPtr<BulkOutPipe>> BulkOutPipe::create(USBController const& controller, u8 endpoint_address, u16 max_packet_size, i8 device_address, size_t buffer_size)
{
VERIFY(buffer_size >= max_packet_size);
@ -124,6 +140,22 @@ ErrorOr<size_t> BulkOutPipe::submit_bulk_out_transfer(size_t length, void* data)
return transfer_length;
}
ErrorOr<size_t> BulkOutPipe::submit_bulk_out_transfer(size_t length, UserOrKernelBuffer data)
{
VERIFY(length <= m_dma_buffer->size());
MutexLocker lock(m_dma_buffer_lock);
auto transfer = TRY(Transfer::create(*this, length, *m_dma_buffer));
TRY(transfer->write_buffer(length, data));
dbgln_if(USB_DEBUG, "Pipe: Bulk out transfer allocated @ {}", transfer->buffer_physical());
size_t transfer_length = TRY(m_controller->submit_bulk_transfer(*transfer));
dbgln_if(USB_DEBUG, "Pipe: Bulk out transfer complete!");
return transfer_length;
}
ErrorOr<NonnullOwnPtr<InterruptInPipe>> InterruptInPipe::create(USBController const& controller, u8 endpoint_address, u16 max_packet_size, i8 device_address, u16 poll_interval, size_t buffer_size)
{
VERIFY(buffer_size >= max_packet_size);

2
Kernel/Bus/USB/USBPipe.h
View file

@ -94,6 +94,7 @@ public:
static ErrorOr<NonnullOwnPtr<BulkInPipe>> create(USBController const& controller, u8 endpoint_address, u16 max_packet_size, i8 device_address, size_t buffer_size = PAGE_SIZE);
ErrorOr<size_t> submit_bulk_in_transfer(size_t length, void* data);
ErrorOr<size_t> submit_bulk_in_transfer(size_t length, UserOrKernelBuffer data);
private:
BulkInPipe(USBController const& controller, u8 endpoint_address, u16 max_packet_size, i8 device_address, NonnullOwnPtr<Memory::Region> dma_buffer);
@ -104,6 +105,7 @@ public:
static ErrorOr<NonnullOwnPtr<BulkOutPipe>> create(USBController const& controller, u8 endpoint_address, u16 max_packet_size, i8 device_address, size_t buffer_size = PAGE_SIZE);
ErrorOr<size_t> submit_bulk_out_transfer(size_t length, void* data);
ErrorOr<size_t> submit_bulk_out_transfer(size_t length, UserOrKernelBuffer data);
private:
BulkOutPipe(USBController const& controller, u8 endpoint_address, u16 max_packet_size, i8 device_address, NonnullOwnPtr<Memory::Region> dma_buffer);

8
Kernel/Bus/USB/USBTransfer.cpp
View file

@ -6,6 +6,7 @@
#include <Kernel/Bus/USB/USBTransfer.h>
#include <Kernel/Library/StdLib.h>
#include <Kernel/Library/UserOrKernelBuffer.h>
#include <Kernel/Memory/MemoryManager.h>
namespace Kernel::USB {
@ -51,6 +52,13 @@ ErrorOr<void> Transfer::write_buffer(u16 len, void* data)
return {};
}
ErrorOr<void> Transfer::write_buffer(u16 len, UserOrKernelBuffer data)
{
VERIFY(len <= m_dma_buffer.size());
m_transfer_data_size = len;
return data.read(buffer().as_ptr(), len);
}
void Transfer::invoke_async_callback()
{
if (m_callback)

1
Kernel/Bus/USB/USBTransfer.h
View file

@ -30,6 +30,7 @@ public:
void set_error_occurred() { m_error_occurred = true; }
ErrorOr<void> write_buffer(u16 len, void* data);
ErrorOr<void> write_buffer(u16 len, UserOrKernelBuffer data);
// `const` here makes sure we don't blow up by writing to a physical address
USBRequestData const& request() const { return m_request; }