patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

drivers: net: lan865x: Always read at least one chunk on IRQ received

Browse source 
According to the OPEN Alliance 10Base-T1x standard (point 7.7), it is
mandatory to read at least single data chunk (no matter if received data
is valid or not) to deassert the interrupt in the LAN865x (then the tc6
structure fields are also updated from the footer).

Current approach with reading OA_BUFSTS register was providing the
required information (RCA and TXC), but could cause transmission "stalls"
as this operation (i.e. control, not data transmission) is not causing
deassertion of the interrupt IRQ_N line from OA TC6 compliant device.

With this patch - the transmission is always performed at least once, so
interrupt is always deasserted.

As the functionality of oa_tc6_update_buf_info() - i.e reading value of
RCA and TXC - has been replaced with extracting data from footer, this
function can be safely removed.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Lukasz Majewski 2023-11-24 15:31:43 +01:00 committed by Fabio Baltieri
parent 3754a4b315
commit 953c5f2d32
3 changed files with 10 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/ethernet/eth_lan865x.c
View file

@ -449,16 +449,15 @@ static void lan865x_int_thread(const struct device *dev)
}
/*
* The IRQ_N is asserted when RCA becomes > 0, so update its value
* before reading chunks.
* The IRQ_N is asserted when RCA becomes > 0. As described in
* OPEN Alliance 10BASE-T1x standard it is deasserted when first
* data header is received by LAN865x.
*
* Hence, it is mandatory to ALWAYS read at least one data chunk!
*/
if (oa_tc6_update_buf_info(tc6) < 0) {
continue;
}
while (tc6->rca > 0) {
do {
lan865x_read_chunks(dev);
}
} while (tc6->rca > 0);
oa_tc6_check_status(tc6);
}

42
drivers/ethernet/oa_tc6.c
View file

@ -257,42 +257,6 @@ static void oa_tc6_update_status(struct oa_tc6 *tc6, uint32_t ftr)
tc6->txc = FIELD_GET(OA_DATA_FTR_TXC, ftr);
}
int oa_tc6_update_buf_info(struct oa_tc6 *tc6)
{
uint32_t val;
int ret;
ret = oa_tc6_reg_read(tc6, OA_BUFSTS, &val);
if (ret < 0) {
return ret;
}
tc6->rca = FIELD_GET(OA_BUFSTS_RCA, val);
tc6->txc = FIELD_GET(OA_BUFSTS_TXC, val);
/*
* There is a mismatch in the max value of RBA(RCA) and TXC provided by the
* OA TC6 standard.
*
* The OA_BUFSTS register has 8 bits for RBA(RCA) and TXC (max value is 0x30)
*
* However, with footer, the RBA(RCA) and TXC are saturated to 0x1F maximal
* value (due to 32 bit constrain of footer size).
*
* To avoid any issues, the number read directly from OA_BUFSTS is saturated
* as well.
*/
if (tc6->rca >= OA_TC6_FTR_RCA_MAX) {
tc6->rca = OA_TC6_FTR_RCA_MAX;
}
if (tc6->txc >= OA_TC6_FTR_TXC_MAX) {
tc6->txc = OA_TC6_FTR_TXC_MAX;
}
return 0;
}
int oa_tc6_chunk_spi_transfer(struct oa_tc6 *tc6, uint8_t *buf_rx, uint8_t *buf_tx,
uint32_t hdr, uint32_t *ftr)
{
@ -346,8 +310,8 @@ int oa_tc6_read_status(struct oa_tc6 *tc6, uint32_t *ftr)
int oa_tc6_read_chunks(struct oa_tc6 *tc6, struct net_pkt *pkt)
{
struct net_buf *buf_rx = NULL;
uint8_t chunks, sbo, ebo;
uint32_t hdr, ftr;
uint8_t sbo, ebo;
int ret;
/*
@ -359,7 +323,7 @@ int oa_tc6_read_chunks(struct oa_tc6 *tc6, struct net_pkt *pkt)
tc6->concat_buf = NULL;
}
for (chunks = tc6->rca; chunks; chunks--) {
do {
buf_rx = net_pkt_get_frag(pkt, tc6->cps, OA_TC6_BUF_ALLOC_TIMEOUT);
if (!buf_rx) {
LOG_ERR("OA RX: Can't allocate RX buffer fordata!");
@ -443,7 +407,7 @@ int oa_tc6_read_chunks(struct oa_tc6 *tc6, struct net_pkt *pkt)
*/
break;
}
}
} while (tc6->rca > 0);
return 0;

9
drivers/ethernet/oa_tc6.h
View file

@ -225,15 +225,6 @@ int oa_tc6_chunk_spi_transfer(struct oa_tc6 *tc6, uint8_t *buf_rx, uint8_t *buf_
*/
int oa_tc6_read_status(struct oa_tc6 *tc6, uint32_t *ftr);
/**
* @brief Read from OA TC6 device and update buffer information
*
* @param tc6 OA TC6 specific data
*
* @return 0 if successful, <0 otherwise.
*/
int oa_tc6_update_buf_info(struct oa_tc6 *tc6);
/**
* @brief Read, modify and write control register from OA TC6 device
*