RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 10:57:34 +00:00
Code Issues Activity Actions

Kernel: Put Raspberry Pi devices into RPi namespace

Browse source 
This makes it clear in the code that these drivers are specific for the
Raspberry Pi devices.
This commit is contained in:
Timon Kruiper 2022-05-29 11:12:17 +02:00 • committed by Linus Groh
parent 77f24056e0
commit 63ee2781fb
16 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Arch/aarch64/MMU.cpp
View file

@ -142,7 +142,7 @@ static void build_identity_map(PageBumpAllocator& allocator)
u64 device_memory_flags = ACCESS_FLAG | PAGE_DESCRIPTOR | OUTER_SHAREABLE | DEVICE_MEMORY; u64 device_memory_flags = ACCESS_FLAG | PAGE_DESCRIPTOR | OUTER_SHAREABLE | DEVICE_MEMORY;
insert_identity_entries_for_physical_memory_range(allocator, level1_table, START_OF_NORMAL_MEMORY, END_OF_NORMAL_MEMORY, normal_memory_flags); insert_identity_entries_for_physical_memory_range(allocator, level1_table, START_OF_NORMAL_MEMORY, END_OF_NORMAL_MEMORY, normal_memory_flags);
insert_identity_entries_for_physical_memory_range(allocator, level1_table, MMIO::the().peripheral_base_address(), MMIO::the().peripheral_end_address(), device_memory_flags); insert_identity_entries_for_physical_memory_range(allocator, level1_table, RPi::MMIO::the().peripheral_base_address(), RPi::MMIO::the().peripheral_end_address(), device_memory_flags);
} }
static void switch_to_page_table(u8* page_table) static void switch_to_page_table(u8* page_table)

2
Kernel/Arch/aarch64/RPi/Framebuffer.cpp
View file

@ -8,7 +8,7 @@
#include <Kernel/Arch/aarch64/RPi/Framebuffer.h> #include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
#include <Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h> #include <Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h>
namespace Kernel { namespace Kernel::RPi {
Framebuffer::Framebuffer() Framebuffer::Framebuffer()
{ {

2
Kernel/Arch/aarch64/RPi/Framebuffer.h
View file

@ -8,7 +8,7 @@
#include <AK/Types.h> #include <AK/Types.h>
namespace Kernel { namespace Kernel::RPi {
class Framebuffer { class Framebuffer {
public: public:

2
Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h
View file

@ -8,7 +8,7 @@
#include <Kernel/Arch/aarch64/RPi/Mailbox.h> #include <Kernel/Arch/aarch64/RPi/Mailbox.h>
namespace Kernel { namespace Kernel::RPi {
class FramebufferSetPhysicalSizeMboxMessage : public Mailbox::Message { class FramebufferSetPhysicalSizeMboxMessage : public Mailbox::Message {
public: public:

2
Kernel/Arch/aarch64/RPi/GPIO.cpp
View file

@ -8,7 +8,7 @@
#include <Kernel/Arch/aarch64/RPi/GPIO.h> #include <Kernel/Arch/aarch64/RPi/GPIO.h>
#include <Kernel/Arch/aarch64/RPi/MMIO.h> #include <Kernel/Arch/aarch64/RPi/MMIO.h>
namespace Kernel { namespace Kernel::RPi {
// See BCM2835-ARM-Peripherals.pdf section "6 General Purpose I/O" or bcm2711-peripherals.pdf "Chapter 5. General Purpose I/O". // See BCM2835-ARM-Peripherals.pdf section "6 General Purpose I/O" or bcm2711-peripherals.pdf "Chapter 5. General Purpose I/O".

2
Kernel/Arch/aarch64/RPi/GPIO.h
View file

@ -9,7 +9,7 @@
#include <AK/Array.h> #include <AK/Array.h>
#include <AK/Types.h> #include <AK/Types.h>
namespace Kernel { namespace Kernel::RPi {
struct GPIOControlRegisters; struct GPIOControlRegisters;

2
Kernel/Arch/aarch64/RPi/MMIO.cpp
View file

@ -7,7 +7,7 @@
#include <Kernel/Arch/aarch64/MainIdRegister.h> #include <Kernel/Arch/aarch64/MainIdRegister.h>
#include <Kernel/Arch/aarch64/RPi/MMIO.h> #include <Kernel/Arch/aarch64/RPi/MMIO.h>
namespace Kernel { namespace Kernel::RPi {
MMIO::MMIO() MMIO::MMIO()
: m_base_address(0xFE00'0000) : m_base_address(0xFE00'0000)

2
Kernel/Arch/aarch64/RPi/MMIO.h
View file

@ -8,7 +8,7 @@
#include <AK/Types.h> #include <AK/Types.h>
namespace Kernel { namespace Kernel::RPi {
// Knows about memory-mapped IO addresses on the Broadcom family of SOCs used in Raspberry Pis. // Knows about memory-mapped IO addresses on the Broadcom family of SOCs used in Raspberry Pis.
// RPi3 is the first Raspberry Pi that supports aarch64. // RPi3 is the first Raspberry Pi that supports aarch64.

2
Kernel/Arch/aarch64/RPi/Mailbox.cpp
View file

@ -7,7 +7,7 @@
#include <Kernel/Arch/aarch64/RPi/MMIO.h> #include <Kernel/Arch/aarch64/RPi/MMIO.h>
#include <Kernel/Arch/aarch64/RPi/Mailbox.h> #include <Kernel/Arch/aarch64/RPi/Mailbox.h>
namespace Kernel { namespace Kernel::RPi {
// There's one mailbox at MBOX_BASE_OFFSET for reading responses from VideoCore, and one at MBOX_BASE_OFFSET + 0x20 for sending requests. // There's one mailbox at MBOX_BASE_OFFSET for reading responses from VideoCore, and one at MBOX_BASE_OFFSET + 0x20 for sending requests.
// Each has its own status word. // Each has its own status word.

2
Kernel/Arch/aarch64/RPi/Mailbox.h
View file

@ -8,7 +8,7 @@
#include <AK/Types.h> #include <AK/Types.h>
namespace Kernel { namespace Kernel::RPi {
// Can exchange mailbox messages with the Raspberry Pi's VideoCore chip. // Can exchange mailbox messages with the Raspberry Pi's VideoCore chip.
// https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface // https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface

2
Kernel/Arch/aarch64/RPi/Timer.cpp
View file

@ -9,7 +9,7 @@
#include <Kernel/Arch/aarch64/RPi/Mailbox.h> #include <Kernel/Arch/aarch64/RPi/Mailbox.h>
#include <Kernel/Arch/aarch64/RPi/Timer.h> #include <Kernel/Arch/aarch64/RPi/Timer.h>
namespace Kernel { namespace Kernel::RPi {
// "12.1 System Timer Registers" / "10.2 System Timer Registers" // "12.1 System Timer Registers" / "10.2 System Timer Registers"
struct TimerRegisters { struct TimerRegisters {

2
Kernel/Arch/aarch64/RPi/Timer.h
View file

@ -8,7 +8,7 @@
#include <AK/Types.h> #include <AK/Types.h>
namespace Kernel { namespace Kernel::RPi {
struct TimerRegisters; struct TimerRegisters;

2
Kernel/Arch/aarch64/RPi/UART.cpp
View file

@ -9,7 +9,7 @@
#include <Kernel/Arch/aarch64/RPi/Timer.h> #include <Kernel/Arch/aarch64/RPi/Timer.h>
#include <Kernel/Arch/aarch64/RPi/UART.h> #include <Kernel/Arch/aarch64/RPi/UART.h>
namespace Kernel { namespace Kernel::RPi {
// "13.4 Register View" / "11.5 Register View" // "13.4 Register View" / "11.5 Register View"
struct UARTRegisters { struct UARTRegisters {

2
Kernel/Arch/aarch64/RPi/UART.h
View file

@ -9,7 +9,7 @@
#include <AK/Types.h> #include <AK/Types.h>
namespace Kernel { namespace Kernel::RPi {
struct UARTRegisters; struct UARTRegisters;

20
Kernel/Arch/aarch64/init.cpp
View file

@ -112,14 +112,14 @@ extern "C" [[noreturn]] void init()
dbgln("Initialize MMU"); dbgln("Initialize MMU");
init_prekernel_page_tables(); init_prekernel_page_tables();
auto& framebuffer = Framebuffer::the(); auto& framebuffer = RPi::Framebuffer::the();
if (framebuffer.initialized()) { if (framebuffer.initialized()) {
draw_logo(); draw_logo();
} }
dbgln("Enter loop"); dbgln("Enter loop");
auto& timer = Timer::the(); auto& timer = RPi::Timer::the();
u64 start_musec = 0; u64 start_musec = 0;
for (;;) { for (;;) {
u64 now_musec; u64 now_musec;
@ -130,12 +130,12 @@ extern "C" [[noreturn]] void init()
} }
} }
class QueryFirmwareVersionMboxMessage : Mailbox::Message { class QueryFirmwareVersionMboxMessage : RPi::Mailbox::Message {
public: public:
u32 version; u32 version;
QueryFirmwareVersionMboxMessage() QueryFirmwareVersionMboxMessage()
: Mailbox::Message(0x0000'0001, 4) : RPi::Mailbox::Message(0x0000'0001, 4)
{ {
version = 0; version = 0;
} }
@ -144,12 +144,12 @@ public:
static u32 query_firmware_version() static u32 query_firmware_version()
{ {
struct __attribute__((aligned(16))) { struct __attribute__((aligned(16))) {
Mailbox::MessageHeader header; RPi::Mailbox::MessageHeader header;
QueryFirmwareVersionMboxMessage query_firmware_version; QueryFirmwareVersionMboxMessage query_firmware_version;
Mailbox::MessageTail tail; RPi::Mailbox::MessageTail tail;
} message_queue; } message_queue;
if (!Mailbox::the().send_queue(&message_queue, sizeof(message_queue))) { if (!RPi::Mailbox::the().send_queue(&message_queue, sizeof(message_queue))) {
return 0xffff'ffff; return 0xffff'ffff;
} }
@ -169,7 +169,7 @@ static void draw_logo()
dbgln("Boot logo size: {} ({} x {})", serenity_boot_logo_size, logo_parser.image.width, logo_parser.image.height); dbgln("Boot logo size: {} ({} x {})", serenity_boot_logo_size, logo_parser.image.width, logo_parser.image.height);
auto& framebuffer = Framebuffer::the(); auto& framebuffer = RPi::Framebuffer::the();
auto fb_ptr = framebuffer.gpu_buffer(); auto fb_ptr = framebuffer.gpu_buffer();
auto image_left = (framebuffer.width() - logo_parser.image.width) / 2; auto image_left = (framebuffer.width() - logo_parser.image.width) / 2;
auto image_right = image_left + logo_parser.image.width; auto image_right = image_left + logo_parser.image.width;
@ -181,12 +181,12 @@ static void draw_logo()
for (u32 x = 0; x < framebuffer.width(); x++) { for (u32 x = 0; x < framebuffer.width(); x++) {
if (x >= image_left && x < image_right && y >= image_top && y < image_bottom) { if (x >= image_left && x < image_right && y >= image_top && y < image_bottom) {
switch (framebuffer.pixel_order()) { switch (framebuffer.pixel_order()) {
case Framebuffer::PixelOrder::RGB: case RPi::Framebuffer::PixelOrder::RGB:
fb_ptr[0] = logo_pixels[0]; fb_ptr[0] = logo_pixels[0];
fb_ptr[1] = logo_pixels[1]; fb_ptr[1] = logo_pixels[1];
fb_ptr[2] = logo_pixels[2]; fb_ptr[2] = logo_pixels[2];
break; break;
case Framebuffer::PixelOrder::BGR: case RPi::Framebuffer::PixelOrder::BGR:
fb_ptr[0] = logo_pixels[2]; fb_ptr[0] = logo_pixels[2];
fb_ptr[1] = logo_pixels[1]; fb_ptr[1] = logo_pixels[1];
fb_ptr[2] = logo_pixels[0]; fb_ptr[2] = logo_pixels[0];

6
Kernel/Arch/aarch64/kprintf.cpp
View file

@ -14,7 +14,7 @@ void kernelputstr(char const* characters, size_t length)
if (!characters) if (!characters)
return; return;
auto& uart = Kernel::UART::the(); auto& uart = Kernel::RPi::UART::the();
uart.print_str(characters, length); uart.print_str(characters, length);
} }
@ -23,7 +23,7 @@ void kernelcriticalputstr(char const* characters, size_t length)
if (!characters) if (!characters)
return; return;
auto& uart = Kernel::UART::the(); auto& uart = Kernel::RPi::UART::the();
uart.print_str(characters, length); uart.print_str(characters, length);
} }
@ -32,6 +32,6 @@ void kernelearlyputstr(char const* characters, size_t length)
if (!characters) if (!characters)
return; return;
auto& uart = Kernel::UART::the(); auto& uart = Kernel::RPi::UART::the();
uart.print_str(characters, length); uart.print_str(characters, length);
} }