Commit e2f8db50 authored by Dan Williams's avatar Dan Williams

isci: uplevel port infrastructure

* Move port configuration agent implementation
* Merge core/scic_sds_port.[ch] into port.[ch]
Reported-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d35bc1bd
EXTRA_CFLAGS += -Idrivers/scsi/isci/core/ -Idrivers/scsi/isci/
obj-$(CONFIG_SCSI_ISCI) += isci.o obj-$(CONFIG_SCSI_ISCI) += isci.o
isci-objs := init.o phy.o request.o sata.o \ isci-objs := init.o phy.o request.o sata.o \
remote_device.o port.o timers.o \ remote_device.o port.o timers.o \
...@@ -10,5 +9,4 @@ isci-objs := init.o phy.o request.o sata.o \ ...@@ -10,5 +9,4 @@ isci-objs := init.o phy.o request.o sata.o \
stp_request.o \ stp_request.o \
ssp_request.o \ ssp_request.o \
smp_request.o \ smp_request.o \
core/scic_sds_port.o \ port_config.o \
core/scic_sds_port_configuration_agent.o \
/*
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
* GPL LICENSE SUMMARY
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
* The full GNU General Public License is included in this distribution
* in the file called LICENSE.GPL.
*
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _SCIC_SDS_USER_PARAMETERS_H_
#define _SCIC_SDS_USER_PARAMETERS_H_
#include "probe_roms.h"
struct scic_sds_controller;
/**
*
*
* SCIC_SDS_PARM_PHY_SPEED These constants define the speeds utilized for a
* phy/port.
*/
#define SCIC_SDS_PARM_NO_SPEED 0
/**
*
*
* This value of 1 indicates generation 1 (i.e. 1.5 Gb/s).
*/
#define SCIC_SDS_PARM_GEN1_SPEED 1
/**
*
*
* This value of 2 indicates generation 2 (i.e. 3.0 Gb/s).
*/
#define SCIC_SDS_PARM_GEN2_SPEED 2
/**
*
*
* This value of 3 indicates generation 3 (i.e. 6.0 Gb/s).
*/
#define SCIC_SDS_PARM_GEN3_SPEED 3
/**
*
*
* For range checks, the max speed generation
*/
#define SCIC_SDS_PARM_MAX_SPEED SCIC_SDS_PARM_GEN3_SPEED
/**
* struct scic_sds_user_parameters - This structure delineates the various user
* parameters that can be changed by the core user.
*
*
*/
struct scic_sds_user_parameters {
struct sci_phy_user_params {
/**
* This field specifies the NOTIFY (ENABLE SPIN UP) primitive
* insertion frequency for this phy index.
*/
u32 notify_enable_spin_up_insertion_frequency;
/**
* This method specifies the number of transmitted DWORDs within which
* to transmit a single ALIGN primitive. This value applies regardless
* of what type of device is attached or connection state. A value of
* 0 indicates that no ALIGN primitives will be inserted.
*/
u16 align_insertion_frequency;
/**
* This method specifies the number of transmitted DWORDs within which
* to transmit 2 ALIGN primitives. This applies for SAS connections
* only. A minimum value of 3 is required for this field.
*/
u16 in_connection_align_insertion_frequency;
/**
* This field indicates the maximum speed generation to be utilized
* by phys in the supplied port.
* - A value of 1 indicates generation 1 (i.e. 1.5 Gb/s).
* - A value of 2 indicates generation 2 (i.e. 3.0 Gb/s).
* - A value of 3 indicates generation 3 (i.e. 6.0 Gb/s).
*/
u8 max_speed_generation;
} phys[SCI_MAX_PHYS];
/**
* This field specifies the maximum number of direct attached devices
* that can have power supplied to them simultaneously.
*/
u8 max_number_concurrent_device_spin_up;
/**
* This field specifies the number of seconds to allow a phy to consume
* power before yielding to another phy.
*
*/
u8 phy_spin_up_delay_interval;
/**
* These timer values specifies how long a link will remain open with no
* activity in increments of a microsecond, it can be in increments of
* 100 microseconds if the upper most bit is set.
*
*/
u16 stp_inactivity_timeout;
u16 ssp_inactivity_timeout;
/**
* These timer values specifies how long a link will remain open in increments
* of 100 microseconds.
*
*/
u16 stp_max_occupancy_timeout;
u16 ssp_max_occupancy_timeout;
/**
* This timer value specifies how long a link will remain open with no
* outbound traffic in increments of a microsecond.
*
*/
u8 no_outbound_task_timeout;
};
/**
* This structure/union specifies the various different user parameter sets
* available. Each type is specific to a hardware controller version.
*
* union scic_user_parameters
*/
union scic_user_parameters {
/**
* This field specifies the user parameters specific to the
* Storage Controller Unit (SCU) Driver Standard (SDS) version
* 1.
*/
struct scic_sds_user_parameters sds1;
};
/**
*
*
* SCIC_SDS_OEM_PHY_MASK These constants define the valid values for phy_mask
*/
/**
*
*
* This is the min value assignable to a port's phy mask
*/
#define SCIC_SDS_PARM_PHY_MASK_MIN 0x0
/**
*
*
* This is the max value assignable to a port's phy mask
*/
#define SCIC_SDS_PARM_PHY_MASK_MAX 0xF
#define MAX_CONCURRENT_DEVICE_SPIN_UP_COUNT 4
/**
* This structure/union specifies the various different OEM parameter sets
* available. Each type is specific to a hardware controller version.
*
* union scic_oem_parameters
*/
union scic_oem_parameters {
/**
* This field specifies the OEM parameters specific to the
* Storage Controller Unit (SCU) Driver Standard (SDS) version
* 1.
*/
struct scic_sds_oem_params sds1;
};
int scic_oem_parameters_validate(struct scic_sds_oem_params *oem);
/**
* scic_oem_parameters_get() - This method allows the user to retreive the OEM
* parameters utilized by the controller.
* @controller: This parameter specifies the controller on which to set the
* user parameters.
* @oem_parameters: This parameter specifies the OEM parameters object in which
* to write the core's OEM parameters.
*
*/
void scic_oem_parameters_get(
struct scic_sds_controller *controller,
union scic_oem_parameters *oem_parameters);
#endif /* _SCIC_SDS_USER_PARAMETERS_H_ */
/*
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
* GPL LICENSE SUMMARY
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
* The full GNU General Public License is included in this distribution
* in the file called LICENSE.GPL.
*
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _SCIC_PORT_H_
#define _SCIC_PORT_H_
#include "isci.h"
#include "sas.h"
#include "phy.h"
struct scic_sds_port;
enum scic_port_not_ready_reason_code {
SCIC_PORT_NOT_READY_NO_ACTIVE_PHYS,
SCIC_PORT_NOT_READY_HARD_RESET_REQUESTED,
SCIC_PORT_NOT_READY_INVALID_PORT_CONFIGURATION,
SCIC_PORT_NOT_READY_RECONFIGURING,
SCIC_PORT_NOT_READY_REASON_CODE_MAX
};
struct scic_port_end_point_properties {
struct sci_sas_address sas_address;
struct scic_phy_proto protocols;
};
struct scic_port_properties {
u32 index;
struct scic_port_end_point_properties local;
struct scic_port_end_point_properties remote;
u32 phy_mask;
};
enum sci_status scic_port_get_properties(
struct scic_sds_port *port,
struct scic_port_properties *properties);
enum sci_status scic_port_hard_reset(
struct scic_sds_port *port,
u32 reset_timeout);
void scic_port_enable_broadcast_change_notification(
struct scic_sds_port *port);
#endif /* _SCIC_PORT_H_ */
This diff is collapsed.
This diff is collapsed.
/*
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
* GPL LICENSE SUMMARY
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
* The full GNU General Public License is included in this distribution
* in the file called LICENSE.GPL.
*
* BSD LICENSE
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _SCIC_SDS_PORT_CONFIGURATION_AGENT_H_
#define _SCIC_SDS_PORT_CONFIGURATION_AGENT_H_
/**
* This file contains the structures, constants and prototypes used for the
* core controller automatic port configuration engine.
*
*
*/
#include "scic_sds_port.h"
struct scic_sds_controller;
struct scic_sds_port_configuration_agent;
struct scic_sds_port;
struct scic_sds_phy;
typedef void (*scic_sds_port_configuration_agent_phy_handler_t)(
struct scic_sds_controller *,
struct scic_sds_port_configuration_agent *,
struct scic_sds_port *,
struct scic_sds_phy *
);
struct SCIC_SDS_PORT_RANGE {
u8 min_index;
u8 max_index;
};
struct scic_sds_port_configuration_agent {
u16 phy_configured_mask;
u16 phy_ready_mask;
struct SCIC_SDS_PORT_RANGE phy_valid_port_range[SCI_MAX_PHYS];
bool timer_pending;
scic_sds_port_configuration_agent_phy_handler_t link_up_handler;
scic_sds_port_configuration_agent_phy_handler_t link_down_handler;
void *timer;
};
void scic_sds_port_configuration_agent_construct(
struct scic_sds_port_configuration_agent *port_agent);
enum sci_status scic_sds_port_configuration_agent_initialize(
struct scic_sds_controller *controller,
struct scic_sds_port_configuration_agent *port_agent);
#endif /* _SCIC_SDS_PORT_CONFIGURATION_AGENT_H_ */
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
#include "probe_roms.h" #include "probe_roms.h"
#include "remote_device.h" #include "remote_device.h"
#include "request.h" #include "request.h"
#include "scic_sds_port_configuration_agent.h"
#include "scu_completion_codes.h" #include "scu_completion_codes.h"
#include "scu_event_codes.h" #include "scu_event_codes.h"
#include "registers.h" #include "registers.h"
......
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#ifndef _SCI_HOST_H_ #ifndef _SCI_HOST_H_
#define _SCI_HOST_H_ #define _SCI_HOST_H_
#include "scic_config_parameters.h"
#include "remote_device.h" #include "remote_device.h"
#include "phy.h" #include "phy.h"
#include "pool.h" #include "pool.h"
...@@ -64,11 +63,12 @@ ...@@ -64,11 +63,12 @@
#include "registers.h" #include "registers.h"
#include "scu_unsolicited_frame.h" #include "scu_unsolicited_frame.h"
#include "unsolicited_frame_control.h" #include "unsolicited_frame_control.h"
#include "scic_sds_port_configuration_agent.h" #include "probe_roms.h"
struct scic_sds_request; struct scic_sds_request;
struct scu_task_context; struct scu_task_context;
/** /**
* struct scic_power_control - * struct scic_power_control -
* *
...@@ -107,6 +107,24 @@ struct scic_power_control { ...@@ -107,6 +107,24 @@ struct scic_power_control {
}; };
struct scic_sds_port_configuration_agent;
typedef void (*port_config_fn)(struct scic_sds_controller *,
struct scic_sds_port_configuration_agent *,
struct scic_sds_port *, struct scic_sds_phy *);
struct scic_sds_port_configuration_agent {
u16 phy_configured_mask;
u16 phy_ready_mask;
struct {
u8 min_index;
u8 max_index;
} phy_valid_port_range[SCI_MAX_PHYS];
bool timer_pending;
port_config_fn link_up_handler;
port_config_fn link_down_handler;
void *timer;
};
/** /**
* struct scic_sds_controller - * struct scic_sds_controller -
* *
...@@ -800,4 +818,11 @@ u16 scic_controller_allocate_io_tag( ...@@ -800,4 +818,11 @@ u16 scic_controller_allocate_io_tag(
enum sci_status scic_controller_free_io_tag( enum sci_status scic_controller_free_io_tag(
struct scic_sds_controller *scic, struct scic_sds_controller *scic,
u16 io_tag); u16 io_tag);
void scic_sds_port_configuration_agent_construct(
struct scic_sds_port_configuration_agent *port_agent);
enum sci_status scic_sds_port_configuration_agent_initialize(
struct scic_sds_controller *controller,
struct scic_sds_port_configuration_agent *port_agent);
#endif #endif
...@@ -57,9 +57,8 @@ ...@@ -57,9 +57,8 @@
#include "host.h" #include "host.h"
#include "phy.h" #include "phy.h"
#include "scu_event_codes.h" #include "scu_event_codes.h"
#include "scic_port.h"
#include "scic_config_parameters.h"
#include "timers.h" #include "timers.h"
#include "probe_roms.h"
/* Maximum arbitration wait time in micro-seconds */ /* Maximum arbitration wait time in micro-seconds */
#define SCIC_SDS_PHY_MAX_ARBITRATION_WAIT_TIME (700) #define SCIC_SDS_PHY_MAX_ARBITRATION_WAIT_TIME (700)
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
#include <scsi/sas.h> #include <scsi/sas.h>
#include <scsi/libsas.h> #include <scsi/libsas.h>
#include "state_machine.h" #include "state_machine.h"
#include "sas.h"
/* This is the timeout value for the SATA phy to wait for a SIGNATURE FIS /* This is the timeout value for the SATA phy to wait for a SIGNATURE FIS
* before restarting the starting state machine. Technically, the old parallel * before restarting the starting state machine. Technically, the old parallel
......
This diff is collapsed.
This diff is collapsed.
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
*/ */
#include "host.h" #include "host.h"
#include "scic_sds_port_configuration_agent.h"
#include "timers.h" #include "timers.h"
#define SCIC_SDS_MPC_RECONFIGURATION_TIMEOUT (10) #define SCIC_SDS_MPC_RECONFIGURATION_TIMEOUT (10)
......
...@@ -60,15 +60,117 @@ ...@@ -60,15 +60,117 @@
#include <linux/pci.h> #include <linux/pci.h>
#include "isci.h" #include "isci.h"
struct isci_orom *isci_request_oprom(struct pci_dev *pdev); #define SCIC_SDS_PARM_NO_SPEED 0
/* generation 1 (i.e. 1.5 Gb/s) */
#define SCIC_SDS_PARM_GEN1_SPEED 1
/* generation 2 (i.e. 3.0 Gb/s) */
#define SCIC_SDS_PARM_GEN2_SPEED 2
/* generation 3 (i.e. 6.0 Gb/s) */
#define SCIC_SDS_PARM_GEN3_SPEED 3
#define SCIC_SDS_PARM_MAX_SPEED SCIC_SDS_PARM_GEN3_SPEED
/* parameters that can be set by module parameters */
struct scic_sds_user_parameters {
struct sci_phy_user_params {
/**
* This field specifies the NOTIFY (ENABLE SPIN UP) primitive
* insertion frequency for this phy index.
*/
u32 notify_enable_spin_up_insertion_frequency;
/**
* This method specifies the number of transmitted DWORDs within which
* to transmit a single ALIGN primitive. This value applies regardless
* of what type of device is attached or connection state. A value of
* 0 indicates that no ALIGN primitives will be inserted.
*/
u16 align_insertion_frequency;
/**
* This method specifies the number of transmitted DWORDs within which
* to transmit 2 ALIGN primitives. This applies for SAS connections
* only. A minimum value of 3 is required for this field.
*/
u16 in_connection_align_insertion_frequency;
/**
* This field indicates the maximum speed generation to be utilized
* by phys in the supplied port.
* - A value of 1 indicates generation 1 (i.e. 1.5 Gb/s).
* - A value of 2 indicates generation 2 (i.e. 3.0 Gb/s).
* - A value of 3 indicates generation 3 (i.e. 6.0 Gb/s).
*/
u8 max_speed_generation;
} phys[SCI_MAX_PHYS];
/**
* This field specifies the maximum number of direct attached devices
* that can have power supplied to them simultaneously.
*/
u8 max_number_concurrent_device_spin_up;
/**
* This field specifies the number of seconds to allow a phy to consume
* power before yielding to another phy.
*
*/
u8 phy_spin_up_delay_interval;
/**
* These timer values specifies how long a link will remain open with no
* activity in increments of a microsecond, it can be in increments of
* 100 microseconds if the upper most bit is set.
*
*/
u16 stp_inactivity_timeout;
u16 ssp_inactivity_timeout;
/**
* These timer values specifies how long a link will remain open in increments
* of 100 microseconds.
*
*/
u16 stp_max_occupancy_timeout;
u16 ssp_max_occupancy_timeout;
/**
* This timer value specifies how long a link will remain open with no
* outbound traffic in increments of a microsecond.
*
*/
u8 no_outbound_task_timeout;
};
/* XXX kill this union */
union scic_user_parameters {
/**
* This field specifies the user parameters specific to the
* Storage Controller Unit (SCU) Driver Standard (SDS) version
* 1.
*/
struct scic_sds_user_parameters sds1;
};
#define SCIC_SDS_PARM_PHY_MASK_MIN 0x0
#define SCIC_SDS_PARM_PHY_MASK_MAX 0xF
#define MAX_CONCURRENT_DEVICE_SPIN_UP_COUNT 4
struct scic_sds_oem_params;
int scic_oem_parameters_validate(struct scic_sds_oem_params *oem);
union scic_oem_parameters; union scic_oem_parameters;
struct isci_orom; void scic_oem_parameters_get(struct scic_sds_controller *scic,
union scic_oem_parameters *oem);
enum sci_status isci_parse_oem_parameters( struct isci_orom;
union scic_oem_parameters *oem_params, struct isci_orom *isci_request_oprom(struct pci_dev *pdev);
struct isci_orom *orom, enum sci_status isci_parse_oem_parameters(union scic_oem_parameters *oem,
int scu_index); struct isci_orom *orom, int scu_index);
struct isci_orom *isci_request_firmware(struct pci_dev *pdev, const struct firmware *fw); struct isci_orom *isci_request_firmware(struct pci_dev *pdev, const struct firmware *fw);
struct isci_orom *isci_get_efi_var(struct pci_dev *pdev); struct isci_orom *isci_get_efi_var(struct pci_dev *pdev);
...@@ -153,6 +255,16 @@ struct scic_sds_oem_params { ...@@ -153,6 +255,16 @@ struct scic_sds_oem_params {
} phys[SCI_MAX_PHYS]; } phys[SCI_MAX_PHYS];
} __attribute__ ((packed)); } __attribute__ ((packed));
/* XXX kill this union */
union scic_oem_parameters {
/**
* This field specifies the OEM parameters specific to the
* Storage Controller Unit (SCU) Driver Standard (SDS) version
* 1.
*/
struct scic_sds_oem_params sds1;
};
struct isci_orom { struct isci_orom {
struct sci_bios_oem_param_block_hdr hdr; struct sci_bios_oem_param_block_hdr hdr;
struct scic_sds_oem_params ctrl[SCI_MAX_CONTROLLERS]; struct scic_sds_oem_params ctrl[SCI_MAX_CONTROLLERS];
......
...@@ -57,8 +57,6 @@ ...@@ -57,8 +57,6 @@
#include "port.h" #include "port.h"
#include "remote_device.h" #include "remote_device.h"
#include "request.h" #include "request.h"
#include "scic_port.h"
#include "scic_sds_port.h"
#include "remote_node_context.h" #include "remote_node_context.h"
#include "scu_event_codes.h" #include "scu_event_codes.h"
#include "task.h" #include "task.h"
......
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#include "host.h" #include "host.h"
#include "state_machine.h" #include "state_machine.h"
#include "scic_sds_port.h"
#include "remote_device.h" #include "remote_device.h"
#include "remote_node_context.h" #include "remote_node_context.h"
#include "scu_event_codes.h" #include "scu_event_codes.h"
......
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
*/ */
#include "isci.h" #include "isci.h"
#include "scic_port.h"
#include "task.h" #include "task.h"
#include "request.h" #include "request.h"
#include "sata.h" #include "sata.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment