luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NTB: Alter link-state API to support multi-port devices

Browse Source 
Multi-port devices permit the NTB connections between multiple domains,
so a local device can have NTB link being up with one peer and being
down with another. NTB link-state API is appropriately altered to return
a bitfield of the link-states between the local device and possible peers.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Acked-by: Allen Hubbe <Allen.Hubbe@dell.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
This commit is contained in:
Serge Semin 2016-12-14 02:49:15 +03:00 committed by Jon Mason
parent 1e5301196a
commit 4e8c11b7fd
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ntb/hw/amd/ntb_hw_amd.c
View File

@ -212,7 +212,7 @@ static int amd_link_is_up(struct amd_ntb_dev *ndev)
return 0; return 0;
} }
static int amd_ntb_link_is_up(struct ntb_dev *ntb, static u64 amd_ntb_link_is_up(struct ntb_dev *ntb,
enum ntb_speed *speed, enum ntb_speed *speed,
enum ntb_width *width) enum ntb_width *width)
{ {

2
drivers/ntb/hw/intel/ntb_hw_intel.c
View File

@ -1171,7 +1171,7 @@ static int intel_ntb_mw_set_trans(struct ntb_dev *ntb, int idx,
return 0; return 0;
} }
static int intel_ntb_link_is_up(struct ntb_dev *ntb, static u64 intel_ntb_link_is_up(struct ntb_dev *ntb,
enum ntb_speed *speed, enum ntb_speed *speed,
enum ntb_width *width) enum ntb_width *width)
{ {

31
include/linux/ntb.h
View File

@ -235,7 +235,7 @@ struct ntb_dev_ops {
int (*peer_port_number)(struct ntb_dev *ntb, int pidx); int (*peer_port_number)(struct ntb_dev *ntb, int pidx);
int (*peer_port_idx)(struct ntb_dev *ntb, int port); int (*peer_port_idx)(struct ntb_dev *ntb, int port);
int (*link_is_up)(struct ntb_dev *ntb, u64 (*link_is_up)(struct ntb_dev *ntb,
enum ntb_speed *speed, enum ntb_width *width); enum ntb_speed *speed, enum ntb_width *width);
int (*link_enable)(struct ntb_dev *ntb, int (*link_enable)(struct ntb_dev *ntb,
enum ntb_speed max_speed, enum ntb_width max_width); enum ntb_speed max_speed, enum ntb_width max_width);
@ -607,25 +607,26 @@ static inline int ntb_peer_port_idx(struct ntb_dev *ntb, int port)
* state once after every link event. It is safe to query the link state in * state once after every link event. It is safe to query the link state in
* the context of the link event callback. * the context of the link event callback.
* *
* Return: One if the link is up, zero if the link is down, otherwise a * Return: bitfield of indexed ports link state: bit is set/cleared if the
* negative value indicating the error number. * link is up/down respectively.
*/ */
static inline int ntb_link_is_up(struct ntb_dev *ntb, static inline u64 ntb_link_is_up(struct ntb_dev *ntb,
enum ntb_speed *speed, enum ntb_width *width) enum ntb_speed *speed, enum ntb_width *width)
{ {
return ntb->ops->link_is_up(ntb, speed, width); return ntb->ops->link_is_up(ntb, speed, width);
} }
/** /**
* ntb_link_enable() - enable the link on the secondary side of the ntb * ntb_link_enable() - enable the local port ntb connection
* @ntb: NTB device context. * @ntb: NTB device context.
* @max_speed: The maximum link speed expressed as PCIe generation number. * @max_speed: The maximum link speed expressed as PCIe generation number.
* @max_width: The maximum link width expressed as the number of PCIe lanes. * @max_width: The maximum link width expressed as the number of PCIe lanes.
* *
* Enable the link on the secondary side of the ntb. This can only be done * Enable the NTB/PCIe link on the local or remote (for bridge-to-bridge
* from the primary side of the ntb in primary or b2b topology. The ntb device * topology) side of the bridge. If it's supported the ntb device should train
* should train the link to its maximum speed and width, or the requested speed * the link to its maximum speed and width, or the requested speed and width,
* and width, whichever is smaller, if supported. * whichever is smaller. Some hardware doesn't support PCIe link training, so
* the last two arguments will be ignored then.
* *
* Return: Zero on success, otherwise an error number. * Return: Zero on success, otherwise an error number.
*/ */
@ -637,14 +638,14 @@ static inline int ntb_link_enable(struct ntb_dev *ntb,
} }
/** /**
* ntb_link_disable() - disable the link on the secondary side of the ntb * ntb_link_disable() - disable the local port ntb connection
* @ntb: NTB device context. * @ntb: NTB device context.
* *
* Disable the link on the secondary side of the ntb. This can only be * Disable the link on the local or remote (for b2b topology) of the ntb.
* done from the primary side of the ntb in primary or b2b topology. The ntb * The ntb device should disable the link. Returning from this call must
* device should disable the link. Returning from this call must indicate that * indicate that a barrier has passed, though with no more writes may pass in
* a barrier has passed, though with no more writes may pass in either * either direction across the link, except if this call returns an error
* direction across the link, except if this call returns an error number. * number.
* *
* Return: Zero on success, otherwise an error number. * Return: Zero on success, otherwise an error number.
*/ */