Skip to content

Devel #56

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
wesleywesley merged 6 commits into from
Jan 8, 2019
Merged

Devel #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5a1a03
ntb_hw_switchtec: remove unnecessary shared MW reinit in crosslink case
wesleywesley Dec 14, 2018
e5c6f05
switchtec: Remove unnecessary ternary operator
wesleywesley Dec 14, 2018
fba7b8a
switchtec: Fix unintended mask of MRPC event
wesleywesley Dec 14, 2018
4364ef1
Merge pull request #52 from Microsemi/mrpc_msi_dis
wesleywesley Dec 17, 2018
e2a4d10
Merge pull request #53 from Microsemi/peer_reinit_xlink
wesleywesley Dec 17, 2018
b046a68
Merge pull request #54 from Microsemi/ternary_op
wesleywesley Dec 17, 2018
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
3 changes: 3 additions & 0 deletions ntb_hw_switchtec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,6 +1492,9 @@ static int switchtec_ntb_reinit_peer(struct switchtec_ntb *sndev)
{
int rc;

if (crosslink_is_enabled(sndev))
return 0;

dev_info(&sndev->stdev->dev, "reinitialize shared memory window\n");
rc = config_rsvd_lut_win(sndev, sndev->mmio_peer_ctrl, 0,
sndev->self_partition,
Expand Down
5 changes: 3 additions & 2 deletions switchtec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,7 +1184,8 @@ static int mask_event(struct switchtec_dev *stdev, int eid, int idx)
if (!(hdr & SWITCHTEC_EVENT_OCCURRED && hdr & SWITCHTEC_EVENT_EN_IRQ))
return 0;

if (eid == SWITCHTEC_IOCTL_EVENT_LINK_STATE)
if (eid == SWITCHTEC_IOCTL_EVENT_LINK_STATE ||
eid == SWITCHTEC_IOCTL_EVENT_MRPC_COMP)
return 0;

dev_dbg(&stdev->dev, "%s: %d %d %x\n", __func__, eid, idx, hdr);
Expand Down Expand Up @@ -1392,7 +1393,7 @@ static int switchtec_init_pci(struct switchtec_dev *stdev,
if (!use_dma_mrpc)
return 0;

if(!(ioread32(&stdev->mmio_mrpc->dma_ver)? true : false))
if (!ioread32(&stdev->mmio_mrpc->dma_ver))
return 0;

stdev->dma_mrpc = dma_zalloc_coherent(&stdev->pdev->dev, sizeof(*stdev->dma_mrpc),
Expand Down