2019-08-22 00:21:48 +00:00
|
|
|
/*
|
|
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
|
|
|
* Copyright (c) 2019, Michael Neuling, IBM Corporation.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is a driver for the potato UART used by the microwatt core.
|
|
|
|
* The original potato UART came from here
|
|
|
|
* https://github.com/skordal/potato
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include "py/mpconfig.h"
|
|
|
|
|
2020-05-26 03:29:55 +00:00
|
|
|
#define SYSCON_BASE 0xc0000000 /* System control regs */
|
|
|
|
#define SYS_REG_CLKINFO 0x20
|
|
|
|
|
2019-08-22 00:21:48 +00:00
|
|
|
#define UART_FREQ 115200
|
|
|
|
#define POTATO_UART_BASE 0xc0002000
|
2020-05-26 03:29:55 +00:00
|
|
|
static uint64_t potato_uart_base;
|
2019-08-22 00:21:48 +00:00
|
|
|
|
|
|
|
#define POTATO_CONSOLE_TX 0x00
|
|
|
|
#define POTATO_CONSOLE_RX 0x08
|
|
|
|
#define POTATO_CONSOLE_STATUS 0x10
|
|
|
|
#define POTATO_CONSOLE_STATUS_RX_EMPTY 0x01
|
|
|
|
#define POTATO_CONSOLE_STATUS_TX_EMPTY 0x02
|
|
|
|
#define POTATO_CONSOLE_STATUS_RX_FULL 0x04
|
|
|
|
#define POTATO_CONSOLE_STATUS_TX_FULL 0x08
|
|
|
|
#define POTATO_CONSOLE_CLOCK_DIV 0x18
|
|
|
|
#define POTATO_CONSOLE_IRQ_EN 0x20
|
|
|
|
|
|
|
|
static uint64_t potato_uart_reg_read(int offset) {
|
|
|
|
uint64_t addr;
|
|
|
|
uint64_t val;
|
|
|
|
|
|
|
|
addr = potato_uart_base + offset;
|
|
|
|
|
|
|
|
val = *(volatile uint64_t *)addr;
|
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2020-05-26 03:29:55 +00:00
|
|
|
static void potato_uart_reg_write(int offset, uint64_t val) {
|
2019-08-22 00:21:48 +00:00
|
|
|
uint64_t addr;
|
|
|
|
|
|
|
|
addr = potato_uart_base + offset;
|
|
|
|
|
|
|
|
*(volatile uint64_t *)addr = val;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int potato_uart_rx_empty(void) {
|
|
|
|
uint64_t val;
|
|
|
|
|
|
|
|
val = potato_uart_reg_read(POTATO_CONSOLE_STATUS);
|
|
|
|
|
|
|
|
if (val & POTATO_CONSOLE_STATUS_RX_EMPTY) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int potato_uart_tx_full(void) {
|
|
|
|
uint64_t val;
|
|
|
|
|
|
|
|
val = potato_uart_reg_read(POTATO_CONSOLE_STATUS);
|
|
|
|
|
|
|
|
if (val & POTATO_CONSOLE_STATUS_TX_FULL) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long potato_uart_divisor(unsigned long proc_freq, unsigned long uart_freq) {
|
|
|
|
return proc_freq / (uart_freq * 16) - 1;
|
|
|
|
}
|
|
|
|
|
2020-05-26 03:29:55 +00:00
|
|
|
void uart_init_ppc(void) {
|
|
|
|
uint64_t proc_freq;
|
|
|
|
|
2019-08-22 00:21:48 +00:00
|
|
|
potato_uart_base = POTATO_UART_BASE;
|
2020-05-26 03:29:55 +00:00
|
|
|
proc_freq = *(volatile uint64_t *)(SYSCON_BASE + SYS_REG_CLKINFO);
|
|
|
|
potato_uart_reg_write(POTATO_CONSOLE_CLOCK_DIV, potato_uart_divisor(proc_freq, UART_FREQ));
|
2019-08-22 00:21:48 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2020-05-26 03:29:55 +00:00
|
|
|
int mp_hal_stdin_rx_chr(void) {
|
2019-08-22 00:21:48 +00:00
|
|
|
uint64_t val;
|
|
|
|
|
2020-02-27 04:36:53 +00:00
|
|
|
while (potato_uart_rx_empty()) {
|
|
|
|
;
|
|
|
|
}
|
2019-08-22 00:21:48 +00:00
|
|
|
val = potato_uart_reg_read(POTATO_CONSOLE_RX);
|
|
|
|
|
|
|
|
return (char)(val & 0x000000ff);
|
|
|
|
}
|
|
|
|
|
ports: Fix sys.stdout.buffer.write() return value.
MicroPython code may rely on the return value of sys.stdout.buffer.write()
to reflect the number of bytes actually written. While in most scenarios a
write() operation is successful, there are cases where it fails, leading to
data loss. This problem arises because, currently, write() merely returns
the number of bytes it was supposed to write, without indication of
failure.
One scenario where write() might fail, is where USB is used and the
receiving end doesn't read quickly enough to empty the receive buffer. In
that case, write() on the MicroPython side can timeout, resulting in the
loss of data without any indication, a behavior observed notably in
communication between a Pi Pico as a client and a Linux host using the ACM
driver.
A complex issue arises with mp_hal_stdout_tx_strn() when it involves
multiple outputs, such as USB, dupterm and hardware UART. The challenge is
in handling cases where writing to one output is successful, but another
fails, either fully or partially. This patch implements the following
solution:
mp_hal_stdout_tx_strn() attempts to write len bytes to all of the possible
destinations for that data, and returns the minimum successful write
length.
The implementation of this is complicated by several factors:
- multiple outputs may be enabled or disabled at compiled time
- multiple outputs may be enabled or disabled at runtime
- mp_os_dupterm_tx_strn() is one such output, optionally containing
multiple additional outputs
- each of these outputs may or may not be able to report success
- each of these outputs may or may not be able to report partial writes
As a result, there's no single strategy that fits all ports, necessitating
unique logic for each instance of mp_hal_stdout_tx_strn().
Note that addressing sys.stdout.write() is more complex due to its data
modification process ("cooked" output), and it remains unchanged in this
patch. Developers who are concerned about accurate return values from
write operations should use sys.stdout.buffer.write().
This patch might disrupt some existing code, but it's also expected to
resolve issues, considering that the peculiar return value behavior of
sys.stdout.buffer.write() is not well-documented and likely not widely
known. Therefore, it's improbable that much existing code relies on the
previous behavior.
Signed-off-by: Maarten van der Schrieck <maarten@thingsconnected.nl>
2023-06-18 09:46:25 +00:00
|
|
|
mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
|
2020-05-26 03:29:55 +00:00
|
|
|
int i;
|
2019-08-22 00:21:48 +00:00
|
|
|
|
2020-05-26 03:29:55 +00:00
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
uint64_t val = str[i];
|
2019-08-22 00:21:48 +00:00
|
|
|
|
2020-05-26 03:29:55 +00:00
|
|
|
while (potato_uart_tx_full()) {
|
|
|
|
;
|
|
|
|
}
|
|
|
|
potato_uart_reg_write(POTATO_CONSOLE_TX, val);
|
2020-02-27 04:36:53 +00:00
|
|
|
}
|
ports: Fix sys.stdout.buffer.write() return value.
MicroPython code may rely on the return value of sys.stdout.buffer.write()
to reflect the number of bytes actually written. While in most scenarios a
write() operation is successful, there are cases where it fails, leading to
data loss. This problem arises because, currently, write() merely returns
the number of bytes it was supposed to write, without indication of
failure.
One scenario where write() might fail, is where USB is used and the
receiving end doesn't read quickly enough to empty the receive buffer. In
that case, write() on the MicroPython side can timeout, resulting in the
loss of data without any indication, a behavior observed notably in
communication between a Pi Pico as a client and a Linux host using the ACM
driver.
A complex issue arises with mp_hal_stdout_tx_strn() when it involves
multiple outputs, such as USB, dupterm and hardware UART. The challenge is
in handling cases where writing to one output is successful, but another
fails, either fully or partially. This patch implements the following
solution:
mp_hal_stdout_tx_strn() attempts to write len bytes to all of the possible
destinations for that data, and returns the minimum successful write
length.
The implementation of this is complicated by several factors:
- multiple outputs may be enabled or disabled at compiled time
- multiple outputs may be enabled or disabled at runtime
- mp_os_dupterm_tx_strn() is one such output, optionally containing
multiple additional outputs
- each of these outputs may or may not be able to report success
- each of these outputs may or may not be able to report partial writes
As a result, there's no single strategy that fits all ports, necessitating
unique logic for each instance of mp_hal_stdout_tx_strn().
Note that addressing sys.stdout.write() is more complex due to its data
modification process ("cooked" output), and it remains unchanged in this
patch. Developers who are concerned about accurate return values from
write operations should use sys.stdout.buffer.write().
This patch might disrupt some existing code, but it's also expected to
resolve issues, considering that the peculiar return value behavior of
sys.stdout.buffer.write() is not well-documented and likely not widely
known. Therefore, it's improbable that much existing code relies on the
previous behavior.
Signed-off-by: Maarten van der Schrieck <maarten@thingsconnected.nl>
2023-06-18 09:46:25 +00:00
|
|
|
return len;
|
2019-08-22 00:21:48 +00:00
|
|
|
}
|