[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH 5/5] Use /sys/devices/lcs instead of /sys/devices/cu3088 (#561816).



The commit to rhel6-branch should be synchronized with bug 561061 or
meanwhile rather 563548, but I guess you are aware of that.

cu3088 is replaced in some paths by either lcs OR ctcm depending on the
NETTYPE. IOW, it's not all lcs then.

Did you test this with lcs and ctcm?

FYI: I'll post a patch on top of this one dealing with slight changes in
sysfs for lcs and ctcm in set_device_online() determining the network
device name. Those changes are not related to the cu3088 conversion here.

On 02/10/2010 11:14 PM, David Cantrell wrote:
> The kernel change is in place and the cu3088 sysfs path is going away at
> some point.  For CTC and LCS devices, we need to use the
> /sys/devices/lcs path.
> ---
>  loader/linuxrc.s390 |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390
> index 47a769f..6a8d2c2 100644
> --- a/loader/linuxrc.s390
> +++ b/loader/linuxrc.s390
> @@ -607,7 +607,7 @@ function set_device_online() {
>      local sysnettype
>      case "${NETTYPE}" in
>          qeth) sysnettype=${NETTYPE} ;;

qeth|lcs) sysnettype=${NETTYPE} ;;

> -        lcs|ctc) sysnettype=cu3088 ;;
> +        lcs|ctc) sysnettype=lcs ;;

ctc) sysnettype=ctcm ;;

>      esac
>      if ! [ -f /sys/devices/${sysnettype}/$SCH_R_DEVBUSID/online ]; then
>          echo $"Sysfs path to set device online does not exist."
> @@ -804,7 +804,7 @@ function rollback_config() {
>              local sysnettype
>              case "${NETTYPE}" in
>                  qeth) sysnettype=${NETTYPE} ;;

qeth|lcs) sysnettype=${NETTYPE} ;;

> -                lcs|ctc) sysnettype=cu3088 ;;
> +                lcs|ctc) sysnettype=lcs ;;

ctc) sysnettype=ctcm ;;

>              esac
>              [ -f /sys/devices/${sysnettype}/$SCH_R_DEVBUSID/online ] && \
>                  sysecho /sys/devices/${sysnettype}/$SCH_R_DEVBUSID/online "0"
> @@ -1362,9 +1362,9 @@ function handle_subchannels() {
>                  fi
>                  ;;
>              ctc|lcs)
> -                if [ -f /sys/devices/cu3088/$SCH_R_DEVBUSID/type ]; then
> +                if [ -f /sys/devices/lcs/$SCH_R_DEVBUSID/type ]; then

if [ -f /sys/devices/$driver/$SCH_R_DEVBUSID/type ]; then

>                      local type
> -                    read type < /sys/devices/cu3088/$SCH_R_DEVBUSID/type
> +                    read type < /sys/devices/lcs/$SCH_R_DEVBUSID/type

read type < /sys/devices/$driver/$SCH_R_DEVBUSID/type

>                      [ "$type" = "CTC/A" ] && \
>                          type="channel-to-channel adapter (CTC/A)"
>                      echo $"Detected: $type"
> @@ -1721,7 +1721,7 @@ function syntax_check_ctcprot() {
> 
>  function handle_ctcprot() {
>      [ -n "$CTCPROT" ] || return 0
> -    if sysecho /sys/devices/cu3088/${SCH_R_DEVBUSID}/protocol "$CTCPROT"; then
> +    if sysecho /sys/devices/lcs/${SCH_R_DEVBUSID}/protocol "$CTCPROT"; then

if sysecho /sys/devices/ctcm/${SCH_R_DEVBUSID}/protocol "$CTCPROT"; then

>          return 0
>      fi
>      echo $"Could not configure CTC protocol $CTCPROT for $SUBCHANNELS"
> @@ -1775,7 +1775,7 @@ function syntax_check_lcs_portno() {
> 
>  function handle_lcs_portno() {
>      [ -n "$PORTNAME" ] || return 0
> -    if sysecho /sys/devices/cu3088/$SCH_R_DEVBUSID/portno "$PORTNAME"; then
> +    if sysecho /sys/devices/lcs/$SCH_R_DEVBUSID/portno "$PORTNAME"; then

That one is correct since this function is called for lcs only.

>          return 0
>      fi
>      echo $"Could not configure relative port number $PORTNAME for $SUBCHANNELS"

Steffen

Linux on System z Development

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martin Jetter
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]