Skip to content

ADIN2111 OA mode fixes #77832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 19, 2025
Merged

ADIN2111 OA mode fixes #77832

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85f18fc
drivers: ethernet: adin2111: Refactor the code in offload thread
panekmaciej Aug 30, 2024
1b69265
drivers: ethernet: adin2111: Add calculation of EBO in OA mode
panekmaciej Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 41 additions & 41 deletions drivers/ethernet/eth_adin2111.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ int eth_adin2111_oa_data_read(const struct device *dev, const uint16_t port_idx)
K_MSEC(CONFIG_ETH_ADIN2111_TIMEOUT));
if (!pkt) {
LOG_ERR("OA RX: cannot allcate packet space, skipping.");
return -EIO;
return -ENOMEM;
}
/* Skipping CRC32 */
ret = net_pkt_write(pkt, ctx->buf, ctx->scur - sizeof(uint32_t));
Expand Down Expand Up @@ -351,14 +351,25 @@ static int eth_adin2111_send_oa_frame(const struct device *dev, struct net_pkt *
uint16_t clen, len = net_pkt_get_len(pkt);
uint32_t hdr;
uint8_t chunks, i;
int ret, txc, cur;
int ret, txc, cur, ebo;

chunks = len / ctx->oa_cps;

if (len % ctx->oa_cps) {
chunks++;
}

if (chunks > 1) {
/* we have to calculate EBO so we do not exceed maximum Ethernet frame length */
ebo = (len % ctx->oa_cps) - 1;
if (ebo < 0) {
ebo += ctx->oa_cps;
}
} else {
/* we have to pad to the minimum Ethernet frame length */
ebo = ctx->oa_cps - 1;
}

ret = eth_adin2111_reg_read(dev, ADIN2111_BUFSTS, &txc);
if (ret < 0) {
LOG_ERR("Cannot read txc");
Expand All @@ -380,7 +391,7 @@ static int eth_adin2111_send_oa_frame(const struct device *dev, struct net_pkt *
}
if (i == chunks) {
hdr |= ADIN2111_OA_DATA_HDR_EV;
hdr |= (ctx->oa_cps - 1) << ADIN2111_OA_DATA_HDR_EBO;
hdr |= ebo << ADIN2111_OA_DATA_HDR_EBO;
Copy link
Contributor

@jpmur jpmur Oct 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When at the last chunk, you should consider adding ebo to cur instead of cur += ctx->oa_cps; (line 397). This would ensure that the frame length passed to the SPI layer is exactly correct, although I don't think this is a functional issue.

}

hdr |= eth_adin2111_oa_get_parity(hdr);
Expand Down Expand Up @@ -693,58 +704,47 @@ static void adin2111_offload_thread(void *p1, void *p2, void *p3)
adin2111_port_on_phyint(ctx->port[1]);
}

if (ctx->oa) {
if (status1 & ADIN2111_STATUS1_P1_RX_RDY) {
ret = eth_adin2111_oa_data_read(dev, 0);
if (ret < 0) {
goto continue_unlock;
}
}
if (is_adin2111 && (status1 & ADIN2111_STATUS1_P2_RX_RDY)) {
ret = eth_adin2111_oa_data_read(dev, 1);
if (ret < 0) {
goto continue_unlock;
}
}
} else {
if (!ctx->oa) {
#if CONFIG_ETH_ADIN2111_SPI_CFG0
if (status0 & ADIN2111_STATUS1_SPI_ERR) {
LOG_WRN("Detected TX SPI CRC error");
}
#endif /* CONFIG_ETH_ADIN2111_SPI_CFG0 */
#endif
}

/* handle rx interrupt(s) */
do {
/* handle port 1 rx */
if (status1 & ADIN2111_STATUS1_P1_RX_RDY) {
do {
if (ctx->oa) {
ret = eth_adin2111_oa_data_read(dev, 0);
} else {
ret = adin2111_read_fifo(dev, 0U);
if (ret < 0) {
break;
}

ret = eth_adin2111_reg_read(dev, ADIN2111_STATUS1,
&status1);
if (ret < 0) {
goto continue_unlock;
}
} while (!!(status1 & ADIN2111_STATUS1_P1_RX_RDY));
}

if (ret < 0) {
break;
}
}

/* handle port 2 rx */
if (is_adin2111 && (status1 & ADIN2111_STATUS1_P2_RX_RDY)) {
do {
if (ctx->oa) {
ret = eth_adin2111_oa_data_read(dev, 1);
} else {
ret = adin2111_read_fifo(dev, 1U);
if (ret < 0) {
break;
}

ret = eth_adin2111_reg_read(dev, ADIN2111_STATUS1,
&status1);
if (ret < 0) {
goto continue_unlock;
}
} while (!!(status1 & ADIN2111_STATUS1_P2_RX_RDY));
}

if (ret < 0) {
break;
}
}
}

ret = eth_adin2111_reg_read(dev, ADIN2111_STATUS1, &status1);
if (ret < 0) {
break;
}
} while (status1 & (ADIN2111_STATUS1_P1_RX_RDY | ADIN2111_STATUS1_P2_RX_RDY));

continue_unlock:
/* clear interrupts */
Expand Down
Loading