Skip to content
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

Updated patch to work with 3.5 #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated patch to work with 3.5 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .mpss-metadata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
3.4.2-1
36aff5ba523102d83ed26965d87593c6faa8be27
3.5.2-1
5c2298f5c59a5aaa74df6d07f860b983cd11e45d
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Intel MPSS 3.4 for Linux 3.13.0
Intel MPSS 3.5 for Linux 3.13.0
===============================

This repository contains Intel MPSS 3.4 modules. The source is patched to work
This repository contains Intel MPSS 3.5 modules. The source is patched to work
with Linux Kernel 3.13.0, it was only tested on Ubuntu 14.04, but should work
on any distro since the Kernel version is 3.13.0 (not tested with newer
kernel versions).
Expand Down
2 changes: 1 addition & 1 deletion host/micscif_pm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ mic_pm_send(mic_ctx_t *mic_ctx, void *msg, uint32_t len)
err = scif_send(epd, msg, len, PM_SEND_MODE);
/*scif_send returns the number of bytes returned on success */
if(err <= 0) {
printk("scif_send to node: %d port: %d failed with error %d\n",
PM_DEBUG("scif_send to node: %d port: %d failed with error %d\n",
epd->peer.node, epd->peer.port, err);
} else {
PM_DEBUG("Bytes sent = %d\n",err);
Expand Down
13 changes: 13 additions & 0 deletions include/mic/io_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@
#ifndef __IO_INTERFACE_H__
#define __IO_INTERFACE_H__

/*
* The host driver exports sysfs entries in
* /sys/class/mic/micX/
* The "/sys/class/mic/micX/state" entry reflects the state of the
* card as it transitions from hardware reset through booting an image
*
* All the other entries have valid values when the state entry is either
* "ready" or "online"
*/

/*
* -----------------------------------------
* IOCTL interface information
Expand Down Expand Up @@ -81,6 +91,9 @@ typedef enum {
* \param len uos escape opecode
*
* This structure is used for IOCTL_FLASHCMD.
*
* This IOCTL can only be issued when /sys/class/mic/mic0/state returns "online"
* after it has been set to "boot:flash"
*/
struct ctrlioctl_flashcmd {
uint32_t brdnum;
Expand Down
2 changes: 1 addition & 1 deletion micscif/micscif_nodeqp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2568,7 +2568,7 @@ micscif_nodeqp_intrhandler(struct micscif_dev *scifdev, struct micscif_qp *qp)
* P2P connections to provide better Node QP responsiveness
* in anticipation of P2P Proxy DMA requests for performance.
*/
if (is_p2p_scifdev(scifdev) &&
if (scifdev->sd_proxy_dma_reads &&
scifdev->num_active_conn &&
SCIFDEV_STOPPED != scifdev->sd_state) {
queue_work(scifdev->sd_intr_wq, &scifdev->sd_intr_bh);
Expand Down
2 changes: 1 addition & 1 deletion micscif/micscif_ports.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ get_scif_port(void)
init_scif_array();

spin_lock(&port_lock);
if (first_free == PORTS_ARRAY_SIZE) { /* Pool is empty */
if (first_free >= PORTS_ARRAY_SIZE) { /* Pool is empty */
port = 0;
port_err++;
goto out;
Expand Down