diff options
713 files changed, 9593 insertions, 7476 deletions
diff --git a/Documentation/ABI/stable/sysfs-bus-usb b/Documentation/ABI/stable/sysfs-bus-usb index 2be603c52a24..a6b685724740 100644 --- a/Documentation/ABI/stable/sysfs-bus-usb +++ b/Documentation/ABI/stable/sysfs-bus-usb | |||
| @@ -37,8 +37,8 @@ Description: | |||
| 37 | that the USB device has been connected to the machine. This | 37 | that the USB device has been connected to the machine. This |
| 38 | file is read-only. | 38 | file is read-only. |
| 39 | Users: | 39 | Users: |
| 40 | PowerTOP <power@bughost.org> | 40 | PowerTOP <powertop@lists.01.org> |
| 41 | http://www.lesswatts.org/projects/powertop/ | 41 | https://01.org/powertop/ |
| 42 | 42 | ||
| 43 | What: /sys/bus/usb/device/.../power/active_duration | 43 | What: /sys/bus/usb/device/.../power/active_duration |
| 44 | Date: January 2008 | 44 | Date: January 2008 |
| @@ -57,8 +57,8 @@ Description: | |||
| 57 | will give an integer percentage. Note that this does not | 57 | will give an integer percentage. Note that this does not |
| 58 | account for counter wrap. | 58 | account for counter wrap. |
| 59 | Users: | 59 | Users: |
| 60 | PowerTOP <power@bughost.org> | 60 | PowerTOP <powertop@lists.01.org> |
| 61 | http://www.lesswatts.org/projects/powertop/ | 61 | https://01.org/powertop/ |
| 62 | 62 | ||
| 63 | What: /sys/bus/usb/devices/<busnum>-<port[.port]>...:<config num>-<interface num>/supports_autosuspend | 63 | What: /sys/bus/usb/devices/<busnum>-<port[.port]>...:<config num>-<interface num>/supports_autosuspend |
| 64 | Date: January 2008 | 64 | Date: January 2008 |
diff --git a/Documentation/ABI/testing/sysfs-class-powercap b/Documentation/ABI/testing/sysfs-class-powercap new file mode 100644 index 000000000000..db3b3ff70d84 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-class-powercap | |||
| @@ -0,0 +1,152 @@ | |||
| 1 | What: /sys/class/powercap/ | ||
| 2 | Date: September 2013 | ||
| 3 | KernelVersion: 3.13 | ||
| 4 | Contact: linux-pm@vger.kernel.org | ||
| 5 | Description: | ||
| 6 | The powercap/ class sub directory belongs to the power cap | ||
| 7 | subsystem. Refer to | ||
| 8 | Documentation/power/powercap/powercap.txt for details. | ||
| 9 | |||
| 10 | What: /sys/class/powercap/<control type> | ||
| 11 | Date: September 2013 | ||
| 12 | KernelVersion: 3.13 | ||
| 13 | Contact: linux-pm@vger.kernel.org | ||
| 14 | Description: | ||
| 15 | A <control type> is a unique name under /sys/class/powercap. | ||
| 16 | Here <control type> determines how the power is going to be | ||
| 17 | controlled. A <control type> can contain multiple power zones. | ||
| 18 | |||
| 19 | What: /sys/class/powercap/<control type>/enabled | ||
| 20 | Date: September 2013 | ||
| 21 | KernelVersion: 3.13 | ||
| 22 | Contact: linux-pm@vger.kernel.org | ||
| 23 | Description: | ||
| 24 | This allows to enable/disable power capping for a "control type". | ||
| 25 | This status affects every power zone using this "control_type. | ||
| 26 | |||
| 27 | What: /sys/class/powercap/<control type>/<power zone> | ||
| 28 | Date: September 2013 | ||
| 29 | KernelVersion: 3.13 | ||
| 30 | Contact: linux-pm@vger.kernel.org | ||
| 31 | Description: | ||
| 32 | A power zone is a single or a collection of devices, which can | ||
| 33 | be independently monitored and controlled. A power zone sysfs | ||
| 34 | entry is qualified with the name of the <control type>. | ||
| 35 | E.g. intel-rapl:0:1:1. | ||
| 36 | |||
| 37 | What: /sys/class/powercap/<control type>/<power zone>/<child power zone> | ||
| 38 | Date: September 2013 | ||
| 39 | KernelVersion: 3.13 | ||
| 40 | Contact: linux-pm@vger.kernel.org | ||
| 41 | Description: | ||
| 42 | Power zones may be organized in a hierarchy in which child | ||
| 43 | power zones provide monitoring and control for a subset of | ||
| 44 | devices under the parent. For example, if there is a parent | ||
| 45 | power zone for a whole CPU package, each CPU core in it can | ||
| 46 | be a child power zone. | ||
| 47 | |||
| 48 | What: /sys/class/powercap/.../<power zone>/name | ||
| 49 | Date: September 2013 | ||
| 50 | KernelVersion: 3.13 | ||
| 51 | Contact: linux-pm@vger.kernel.org | ||
| 52 | Description: | ||
| 53 | Specifies the name of this power zone. | ||
| 54 | |||
| 55 | What: /sys/class/powercap/.../<power zone>/energy_uj | ||
| 56 | Date: September 2013 | ||
| 57 | KernelVersion: 3.13 | ||
| 58 | Contact: linux-pm@vger.kernel.org | ||
| 59 | Description: | ||
| 60 | Current energy counter in micro-joules. Write "0" to reset. | ||
| 61 | If the counter can not be reset, then this attribute is | ||
| 62 | read-only. | ||
| 63 | |||
| 64 | What: /sys/class/powercap/.../<power zone>/max_energy_range_uj | ||
| 65 | Date: September 2013 | ||
| 66 | KernelVersion: 3.13 | ||
| 67 | Contact: linux-pm@vger.kernel.org | ||
| 68 | Description: | ||
| 69 | Range of the above energy counter in micro-joules. | ||
| 70 | |||
| 71 | |||
| 72 | What: /sys/class/powercap/.../<power zone>/power_uw | ||
| 73 | Date: September 2013 | ||
| 74 | KernelVersion: 3.13 | ||
| 75 | Contact: linux-pm@vger.kernel.org | ||
| 76 | Description: | ||
| 77 | Current power in micro-watts. | ||
| 78 | |||
| 79 | What: /sys/class/powercap/.../<power zone>/max_power_range_uw | ||
| 80 | Date: September 2013 | ||
| 81 | KernelVersion: 3.13 | ||
| 82 | Contact: linux-pm@vger.kernel.org | ||
| 83 | Description: | ||
| 84 | Range of the above power value in micro-watts. | ||
| 85 | |||
| 86 | What: /sys/class/powercap/.../<power zone>/constraint_X_name | ||
| 87 | Date: September 2013 | ||
| 88 | KernelVersion: 3.13 | ||
| 89 | Contact: linux-pm@vger.kernel.org | ||
| 90 | Description: | ||
| 91 | Each power zone can define one or more constraints. Each | ||
| 92 | constraint can have an optional name. Here "X" can have values | ||
| 93 | from 0 to max integer. | ||
| 94 | |||
| 95 | What: /sys/class/powercap/.../<power zone>/constraint_X_power_limit_uw | ||
| 96 | Date: September 2013 | ||
| 97 | KernelVersion: 3.13 | ||
| 98 | Contact: linux-pm@vger.kernel.org | ||
| 99 | Description: | ||
| 100 | Power limit in micro-watts should be applicable for | ||
| 101 | the time window specified by "constraint_X_time_window_us". | ||
| 102 | Here "X" can have values from 0 to max integer. | ||
| 103 | |||
| 104 | What: /sys/class/powercap/.../<power zone>/constraint_X_time_window_us | ||
| 105 | Date: September 2013 | ||
| 106 | KernelVersion: 3.13 | ||
| 107 | Contact: linux-pm@vger.kernel.org | ||
| 108 | Description: | ||
| 109 | Time window in micro seconds. This is used along with | ||
| 110 | constraint_X_power_limit_uw to define a power constraint. | ||
| 111 | Here "X" can have values from 0 to max integer. | ||
| 112 | |||
| 113 | |||
| 114 | What: /sys/class/powercap/<control type>/.../constraint_X_max_power_uw | ||
| 115 | Date: September 2013 | ||
| 116 | KernelVersion: 3.13 | ||
| 117 | Contact: linux-pm@vger.kernel.org | ||
| 118 | Description: | ||
| 119 | Maximum allowed power in micro watts for this constraint. | ||
| 120 | Here "X" can have values from 0 to max integer. | ||
| 121 | |||
| 122 | What: /sys/class/powercap/<control type>/.../constraint_X_min_power_uw | ||
| 123 | Date: September 2013 | ||
| 124 | KernelVersion: 3.13 | ||
| 125 | Contact: linux-pm@vger.kernel.org | ||
| 126 | Description: | ||
| 127 | Minimum allowed power in micro watts for this constraint. | ||
| 128 | Here "X" can have values from 0 to max integer. | ||
| 129 | |||
| 130 | What: /sys/class/powercap/.../<power zone>/constraint_X_max_time_window_us | ||
| 131 | Date: September 2013 | ||
| 132 | KernelVersion: 3.13 | ||
| 133 | Contact: linux-pm@vger.kernel.org | ||
| 134 | Description: | ||
| 135 | Maximum allowed time window in micro seconds for this | ||
| 136 | constraint. Here "X" can have values from 0 to max integer. | ||
| 137 | |||
| 138 | What: /sys/class/powercap/.../<power zone>/constraint_X_min_time_window_us | ||
| 139 | Date: September 2013 | ||
| 140 | KernelVersion: 3.13 | ||
| 141 | Contact: linux-pm@vger.kernel.org | ||
| 142 | Description: | ||
| 143 | Minimum allowed time window in micro seconds for this | ||
| 144 | constraint. Here "X" can have values from 0 to max integer. | ||
| 145 | |||
| 146 | What: /sys/class/powercap/.../<power zone>/enabled | ||
| 147 | Date: September 2013 | ||
| 148 | KernelVersion: 3.13 | ||
| 149 | Contact: linux-pm@vger.kernel.org | ||
| 150 | Description | ||
| 151 | This allows to enable/disable power capping at power zone level. | ||
| 152 | This applies to current power zone and its children. | ||
diff --git a/Documentation/ABI/testing/sysfs-devices-power b/Documentation/ABI/testing/sysfs-devices-power index 9d43e7670841..efe449bdf811 100644 --- a/Documentation/ABI/testing/sysfs-devices-power +++ b/Documentation/ABI/testing/sysfs-devices-power | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | What: /sys/devices/.../power/ | 1 | What: /sys/devices/.../power/ |
| 2 | Date: January 2009 | 2 | Date: January 2009 |
| 3 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 3 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 4 | Description: | 4 | Description: |
| 5 | The /sys/devices/.../power directory contains attributes | 5 | The /sys/devices/.../power directory contains attributes |
| 6 | allowing the user space to check and modify some power | 6 | allowing the user space to check and modify some power |
| @@ -8,7 +8,7 @@ Description: | |||
| 8 | 8 | ||
| 9 | What: /sys/devices/.../power/wakeup | 9 | What: /sys/devices/.../power/wakeup |
| 10 | Date: January 2009 | 10 | Date: January 2009 |
| 11 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 11 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 12 | Description: | 12 | Description: |
| 13 | The /sys/devices/.../power/wakeup attribute allows the user | 13 | The /sys/devices/.../power/wakeup attribute allows the user |
| 14 | space to check if the device is enabled to wake up the system | 14 | space to check if the device is enabled to wake up the system |
| @@ -34,7 +34,7 @@ Description: | |||
| 34 | 34 | ||
| 35 | What: /sys/devices/.../power/control | 35 | What: /sys/devices/.../power/control |
| 36 | Date: January 2009 | 36 | Date: January 2009 |
| 37 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 37 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 38 | Description: | 38 | Description: |
| 39 | The /sys/devices/.../power/control attribute allows the user | 39 | The /sys/devices/.../power/control attribute allows the user |
| 40 | space to control the run-time power management of the device. | 40 | space to control the run-time power management of the device. |
| @@ -53,7 +53,7 @@ Description: | |||
| 53 | 53 | ||
| 54 | What: /sys/devices/.../power/async | 54 | What: /sys/devices/.../power/async |
| 55 | Date: January 2009 | 55 | Date: January 2009 |
| 56 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 56 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 57 | Description: | 57 | Description: |
| 58 | The /sys/devices/.../async attribute allows the user space to | 58 | The /sys/devices/.../async attribute allows the user space to |
| 59 | enable or diasble the device's suspend and resume callbacks to | 59 | enable or diasble the device's suspend and resume callbacks to |
| @@ -79,7 +79,7 @@ Description: | |||
| 79 | 79 | ||
| 80 | What: /sys/devices/.../power/wakeup_count | 80 | What: /sys/devices/.../power/wakeup_count |
| 81 | Date: September 2010 | 81 | Date: September 2010 |
| 82 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 82 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 83 | Description: | 83 | Description: |
| 84 | The /sys/devices/.../wakeup_count attribute contains the number | 84 | The /sys/devices/.../wakeup_count attribute contains the number |
| 85 | of signaled wakeup events associated with the device. This | 85 | of signaled wakeup events associated with the device. This |
| @@ -88,7 +88,7 @@ Description: | |||
| 88 | 88 | ||
| 89 | What: /sys/devices/.../power/wakeup_active_count | 89 | What: /sys/devices/.../power/wakeup_active_count |
| 90 | Date: September 2010 | 90 | Date: September 2010 |
| 91 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 91 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 92 | Description: | 92 | Description: |
| 93 | The /sys/devices/.../wakeup_active_count attribute contains the | 93 | The /sys/devices/.../wakeup_active_count attribute contains the |
| 94 | number of times the processing of wakeup events associated with | 94 | number of times the processing of wakeup events associated with |
| @@ -98,7 +98,7 @@ Description: | |||
| 98 | 98 | ||
| 99 | What: /sys/devices/.../power/wakeup_abort_count | 99 | What: /sys/devices/.../power/wakeup_abort_count |
| 100 | Date: February 2012 | 100 | Date: February 2012 |
| 101 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 101 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 102 | Description: | 102 | Description: |
| 103 | The /sys/devices/.../wakeup_abort_count attribute contains the | 103 | The /sys/devices/.../wakeup_abort_count attribute contains the |
| 104 | number of times the processing of a wakeup event associated with | 104 | number of times the processing of a wakeup event associated with |
| @@ -109,7 +109,7 @@ Description: | |||
| 109 | 109 | ||
| 110 | What: /sys/devices/.../power/wakeup_expire_count | 110 | What: /sys/devices/.../power/wakeup_expire_count |
| 111 | Date: February 2012 | 111 | Date: February 2012 |
| 112 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 112 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 113 | Description: | 113 | Description: |
| 114 | The /sys/devices/.../wakeup_expire_count attribute contains the | 114 | The /sys/devices/.../wakeup_expire_count attribute contains the |
| 115 | number of times a wakeup event associated with the device has | 115 | number of times a wakeup event associated with the device has |
| @@ -119,7 +119,7 @@ Description: | |||
| 119 | 119 | ||
| 120 | What: /sys/devices/.../power/wakeup_active | 120 | What: /sys/devices/.../power/wakeup_active |
| 121 | Date: September 2010 | 121 | Date: September 2010 |
| 122 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 122 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 123 | Description: | 123 | Description: |
| 124 | The /sys/devices/.../wakeup_active attribute contains either 1, | 124 | The /sys/devices/.../wakeup_active attribute contains either 1, |
| 125 | or 0, depending on whether or not a wakeup event associated with | 125 | or 0, depending on whether or not a wakeup event associated with |
| @@ -129,7 +129,7 @@ Description: | |||
| 129 | 129 | ||
| 130 | What: /sys/devices/.../power/wakeup_total_time_ms | 130 | What: /sys/devices/.../power/wakeup_total_time_ms |
| 131 | Date: September 2010 | 131 | Date: September 2010 |
| 132 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 132 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 133 | Description: | 133 | Description: |
| 134 | The /sys/devices/.../wakeup_total_time_ms attribute contains | 134 | The /sys/devices/.../wakeup_total_time_ms attribute contains |
| 135 | the total time of processing wakeup events associated with the | 135 | the total time of processing wakeup events associated with the |
| @@ -139,7 +139,7 @@ Description: | |||
| 139 | 139 | ||
| 140 | What: /sys/devices/.../power/wakeup_max_time_ms | 140 | What: /sys/devices/.../power/wakeup_max_time_ms |
| 141 | Date: September 2010 | 141 | Date: September 2010 |
| 142 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 142 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 143 | Description: | 143 | Description: |
| 144 | The /sys/devices/.../wakeup_max_time_ms attribute contains | 144 | The /sys/devices/.../wakeup_max_time_ms attribute contains |
| 145 | the maximum time of processing a single wakeup event associated | 145 | the maximum time of processing a single wakeup event associated |
| @@ -149,7 +149,7 @@ Description: | |||
| 149 | 149 | ||
| 150 | What: /sys/devices/.../power/wakeup_last_time_ms | 150 | What: /sys/devices/.../power/wakeup_last_time_ms |
| 151 | Date: September 2010 | 151 | Date: September 2010 |
| 152 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 152 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 153 | Description: | 153 | Description: |
| 154 | The /sys/devices/.../wakeup_last_time_ms attribute contains | 154 | The /sys/devices/.../wakeup_last_time_ms attribute contains |
| 155 | the value of the monotonic clock corresponding to the time of | 155 | the value of the monotonic clock corresponding to the time of |
| @@ -160,7 +160,7 @@ Description: | |||
| 160 | 160 | ||
| 161 | What: /sys/devices/.../power/wakeup_prevent_sleep_time_ms | 161 | What: /sys/devices/.../power/wakeup_prevent_sleep_time_ms |
| 162 | Date: February 2012 | 162 | Date: February 2012 |
| 163 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 163 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 164 | Description: | 164 | Description: |
| 165 | The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute | 165 | The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute |
| 166 | contains the total time the device has been preventing | 166 | contains the total time the device has been preventing |
| @@ -189,7 +189,7 @@ Description: | |||
| 189 | 189 | ||
| 190 | What: /sys/devices/.../power/pm_qos_latency_us | 190 | What: /sys/devices/.../power/pm_qos_latency_us |
| 191 | Date: March 2012 | 191 | Date: March 2012 |
| 192 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 192 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 193 | Description: | 193 | Description: |
| 194 | The /sys/devices/.../power/pm_qos_resume_latency_us attribute | 194 | The /sys/devices/.../power/pm_qos_resume_latency_us attribute |
| 195 | contains the PM QoS resume latency limit for the given device, | 195 | contains the PM QoS resume latency limit for the given device, |
| @@ -207,7 +207,7 @@ Description: | |||
| 207 | 207 | ||
| 208 | What: /sys/devices/.../power/pm_qos_no_power_off | 208 | What: /sys/devices/.../power/pm_qos_no_power_off |
| 209 | Date: September 2012 | 209 | Date: September 2012 |
| 210 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 210 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 211 | Description: | 211 | Description: |
| 212 | The /sys/devices/.../power/pm_qos_no_power_off attribute | 212 | The /sys/devices/.../power/pm_qos_no_power_off attribute |
| 213 | is used for manipulating the PM QoS "no power off" flag. If | 213 | is used for manipulating the PM QoS "no power off" flag. If |
| @@ -222,7 +222,7 @@ Description: | |||
| 222 | 222 | ||
| 223 | What: /sys/devices/.../power/pm_qos_remote_wakeup | 223 | What: /sys/devices/.../power/pm_qos_remote_wakeup |
| 224 | Date: September 2012 | 224 | Date: September 2012 |
| 225 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 225 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 226 | Description: | 226 | Description: |
| 227 | The /sys/devices/.../power/pm_qos_remote_wakeup attribute | 227 | The /sys/devices/.../power/pm_qos_remote_wakeup attribute |
| 228 | is used for manipulating the PM QoS "remote wakeup required" | 228 | is used for manipulating the PM QoS "remote wakeup required" |
diff --git a/Documentation/ABI/testing/sysfs-power b/Documentation/ABI/testing/sysfs-power index 217772615d02..205a73878441 100644 --- a/Documentation/ABI/testing/sysfs-power +++ b/Documentation/ABI/testing/sysfs-power | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | What: /sys/power/ | 1 | What: /sys/power/ |
| 2 | Date: August 2006 | 2 | Date: August 2006 |
| 3 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 3 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 4 | Description: | 4 | Description: |
| 5 | The /sys/power directory will contain files that will | 5 | The /sys/power directory will contain files that will |
| 6 | provide a unified interface to the power management | 6 | provide a unified interface to the power management |
| @@ -8,7 +8,7 @@ Description: | |||
| 8 | 8 | ||
| 9 | What: /sys/power/state | 9 | What: /sys/power/state |
| 10 | Date: August 2006 | 10 | Date: August 2006 |
| 11 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 11 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 12 | Description: | 12 | Description: |
| 13 | The /sys/power/state file controls the system power state. | 13 | The /sys/power/state file controls the system power state. |
| 14 | Reading from this file returns what states are supported, | 14 | Reading from this file returns what states are supported, |
| @@ -22,7 +22,7 @@ Description: | |||
| 22 | 22 | ||
| 23 | What: /sys/power/disk | 23 | What: /sys/power/disk |
| 24 | Date: September 2006 | 24 | Date: September 2006 |
| 25 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 25 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 26 | Description: | 26 | Description: |
| 27 | The /sys/power/disk file controls the operating mode of the | 27 | The /sys/power/disk file controls the operating mode of the |
| 28 | suspend-to-disk mechanism. Reading from this file returns | 28 | suspend-to-disk mechanism. Reading from this file returns |
| @@ -67,7 +67,7 @@ Description: | |||
| 67 | 67 | ||
| 68 | What: /sys/power/image_size | 68 | What: /sys/power/image_size |
| 69 | Date: August 2006 | 69 | Date: August 2006 |
| 70 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 70 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 71 | Description: | 71 | Description: |
| 72 | The /sys/power/image_size file controls the size of the image | 72 | The /sys/power/image_size file controls the size of the image |
| 73 | created by the suspend-to-disk mechanism. It can be written a | 73 | created by the suspend-to-disk mechanism. It can be written a |
| @@ -84,7 +84,7 @@ Description: | |||
| 84 | 84 | ||
| 85 | What: /sys/power/pm_trace | 85 | What: /sys/power/pm_trace |
| 86 | Date: August 2006 | 86 | Date: August 2006 |
| 87 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 87 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 88 | Description: | 88 | Description: |
| 89 | The /sys/power/pm_trace file controls the code which saves the | 89 | The /sys/power/pm_trace file controls the code which saves the |
| 90 | last PM event point in the RTC across reboots, so that you can | 90 | last PM event point in the RTC across reboots, so that you can |
| @@ -133,7 +133,7 @@ Description: | |||
| 133 | 133 | ||
| 134 | What: /sys/power/pm_async | 134 | What: /sys/power/pm_async |
| 135 | Date: January 2009 | 135 | Date: January 2009 |
| 136 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 136 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 137 | Description: | 137 | Description: |
| 138 | The /sys/power/pm_async file controls the switch allowing the | 138 | The /sys/power/pm_async file controls the switch allowing the |
| 139 | user space to enable or disable asynchronous suspend and resume | 139 | user space to enable or disable asynchronous suspend and resume |
| @@ -146,7 +146,7 @@ Description: | |||
| 146 | 146 | ||
| 147 | What: /sys/power/wakeup_count | 147 | What: /sys/power/wakeup_count |
| 148 | Date: July 2010 | 148 | Date: July 2010 |
| 149 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 149 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 150 | Description: | 150 | Description: |
| 151 | The /sys/power/wakeup_count file allows user space to put the | 151 | The /sys/power/wakeup_count file allows user space to put the |
| 152 | system into a sleep state while taking into account the | 152 | system into a sleep state while taking into account the |
| @@ -161,7 +161,7 @@ Description: | |||
| 161 | 161 | ||
| 162 | What: /sys/power/reserved_size | 162 | What: /sys/power/reserved_size |
| 163 | Date: May 2011 | 163 | Date: May 2011 |
| 164 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 164 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 165 | Description: | 165 | Description: |
| 166 | The /sys/power/reserved_size file allows user space to control | 166 | The /sys/power/reserved_size file allows user space to control |
| 167 | the amount of memory reserved for allocations made by device | 167 | the amount of memory reserved for allocations made by device |
| @@ -175,7 +175,7 @@ Description: | |||
| 175 | 175 | ||
| 176 | What: /sys/power/autosleep | 176 | What: /sys/power/autosleep |
| 177 | Date: April 2012 | 177 | Date: April 2012 |
| 178 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 178 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 179 | Description: | 179 | Description: |
| 180 | The /sys/power/autosleep file can be written one of the strings | 180 | The /sys/power/autosleep file can be written one of the strings |
| 181 | returned by reads from /sys/power/state. If that happens, a | 181 | returned by reads from /sys/power/state. If that happens, a |
| @@ -192,7 +192,7 @@ Description: | |||
| 192 | 192 | ||
| 193 | What: /sys/power/wake_lock | 193 | What: /sys/power/wake_lock |
| 194 | Date: February 2012 | 194 | Date: February 2012 |
| 195 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 195 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 196 | Description: | 196 | Description: |
| 197 | The /sys/power/wake_lock file allows user space to create | 197 | The /sys/power/wake_lock file allows user space to create |
| 198 | wakeup source objects and activate them on demand (if one of | 198 | wakeup source objects and activate them on demand (if one of |
| @@ -219,7 +219,7 @@ Description: | |||
| 219 | 219 | ||
| 220 | What: /sys/power/wake_unlock | 220 | What: /sys/power/wake_unlock |
| 221 | Date: February 2012 | 221 | Date: February 2012 |
| 222 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 222 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 223 | Description: | 223 | Description: |
| 224 | The /sys/power/wake_unlock file allows user space to deactivate | 224 | The /sys/power/wake_unlock file allows user space to deactivate |
| 225 | wakeup sources created with the help of /sys/power/wake_lock. | 225 | wakeup sources created with the help of /sys/power/wake_lock. |
diff --git a/Documentation/acpi/dsdt-override.txt b/Documentation/acpi/dsdt-override.txt index febbb1ba4d23..784841caa6e6 100644 --- a/Documentation/acpi/dsdt-override.txt +++ b/Documentation/acpi/dsdt-override.txt | |||
| @@ -4,4 +4,4 @@ CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel. | |||
| 4 | 4 | ||
| 5 | When to use this method is described in detail on the | 5 | When to use this method is described in detail on the |
| 6 | Linux/ACPI home page: | 6 | Linux/ACPI home page: |
| 7 | http://www.lesswatts.org/projects/acpi/overridingDSDT.php | 7 | https://01.org/linux-acpi/documentation/overriding-dsdt |
diff --git a/Documentation/connector/ucon.c b/Documentation/connector/ucon.c index 4848db8c71ff..8a4da64e02a8 100644 --- a/Documentation/connector/ucon.c +++ b/Documentation/connector/ucon.c | |||
| @@ -71,7 +71,7 @@ static int netlink_send(int s, struct cn_msg *msg) | |||
| 71 | nlh->nlmsg_seq = seq++; | 71 | nlh->nlmsg_seq = seq++; |
| 72 | nlh->nlmsg_pid = getpid(); | 72 | nlh->nlmsg_pid = getpid(); |
| 73 | nlh->nlmsg_type = NLMSG_DONE; | 73 | nlh->nlmsg_type = NLMSG_DONE; |
| 74 | nlh->nlmsg_len = NLMSG_LENGTH(size - sizeof(*nlh)); | 74 | nlh->nlmsg_len = size; |
| 75 | nlh->nlmsg_flags = 0; | 75 | nlh->nlmsg_flags = 0; |
| 76 | 76 | ||
| 77 | m = NLMSG_DATA(nlh); | 77 | m = NLMSG_DATA(nlh); |
diff --git a/Documentation/cpu-freq/cpu-drivers.txt b/Documentation/cpu-freq/cpu-drivers.txt index 40282e617913..8b1a4451422e 100644 --- a/Documentation/cpu-freq/cpu-drivers.txt +++ b/Documentation/cpu-freq/cpu-drivers.txt | |||
| @@ -23,8 +23,8 @@ Contents: | |||
| 23 | 1.1 Initialization | 23 | 1.1 Initialization |
| 24 | 1.2 Per-CPU Initialization | 24 | 1.2 Per-CPU Initialization |
| 25 | 1.3 verify | 25 | 1.3 verify |
| 26 | 1.4 target or setpolicy? | 26 | 1.4 target/target_index or setpolicy? |
| 27 | 1.5 target | 27 | 1.5 target/target_index |
| 28 | 1.6 setpolicy | 28 | 1.6 setpolicy |
| 29 | 2. Frequency Table Helpers | 29 | 2. Frequency Table Helpers |
| 30 | 30 | ||
| @@ -56,7 +56,8 @@ cpufreq_driver.init - A pointer to the per-CPU initialization | |||
| 56 | cpufreq_driver.verify - A pointer to a "verification" function. | 56 | cpufreq_driver.verify - A pointer to a "verification" function. |
| 57 | 57 | ||
| 58 | cpufreq_driver.setpolicy _or_ | 58 | cpufreq_driver.setpolicy _or_ |
| 59 | cpufreq_driver.target - See below on the differences. | 59 | cpufreq_driver.target/ |
| 60 | target_index - See below on the differences. | ||
| 60 | 61 | ||
| 61 | And optionally | 62 | And optionally |
| 62 | 63 | ||
| @@ -66,7 +67,7 @@ cpufreq_driver.resume - A pointer to a per-CPU resume function | |||
| 66 | which is called with interrupts disabled | 67 | which is called with interrupts disabled |
| 67 | and _before_ the pre-suspend frequency | 68 | and _before_ the pre-suspend frequency |
| 68 | and/or policy is restored by a call to | 69 | and/or policy is restored by a call to |
| 69 | ->target or ->setpolicy. | 70 | ->target/target_index or ->setpolicy. |
| 70 | 71 | ||
| 71 | cpufreq_driver.attr - A pointer to a NULL-terminated list of | 72 | cpufreq_driver.attr - A pointer to a NULL-terminated list of |
| 72 | "struct freq_attr" which allow to | 73 | "struct freq_attr" which allow to |
| @@ -103,8 +104,8 @@ policy->governor must contain the "default policy" for | |||
| 103 | this CPU. A few moments later, | 104 | this CPU. A few moments later, |
| 104 | cpufreq_driver.verify and either | 105 | cpufreq_driver.verify and either |
| 105 | cpufreq_driver.setpolicy or | 106 | cpufreq_driver.setpolicy or |
| 106 | cpufreq_driver.target is called with | 107 | cpufreq_driver.target/target_index is called |
| 107 | these values. | 108 | with these values. |
| 108 | 109 | ||
| 109 | For setting some of these values (cpuinfo.min[max]_freq, policy->min[max]), the | 110 | For setting some of these values (cpuinfo.min[max]_freq, policy->min[max]), the |
| 110 | frequency table helpers might be helpful. See the section 2 for more information | 111 | frequency table helpers might be helpful. See the section 2 for more information |
| @@ -133,20 +134,28 @@ range) is within policy->min and policy->max. If necessary, increase | |||
| 133 | policy->max first, and only if this is no solution, decrease policy->min. | 134 | policy->max first, and only if this is no solution, decrease policy->min. |
| 134 | 135 | ||
| 135 | 136 | ||
| 136 | 1.4 target or setpolicy? | 137 | 1.4 target/target_index or setpolicy? |
| 137 | ---------------------------- | 138 | ---------------------------- |
| 138 | 139 | ||
| 139 | Most cpufreq drivers or even most cpu frequency scaling algorithms | 140 | Most cpufreq drivers or even most cpu frequency scaling algorithms |
| 140 | only allow the CPU to be set to one frequency. For these, you use the | 141 | only allow the CPU to be set to one frequency. For these, you use the |
| 141 | ->target call. | 142 | ->target/target_index call. |
| 142 | 143 | ||
| 143 | Some cpufreq-capable processors switch the frequency between certain | 144 | Some cpufreq-capable processors switch the frequency between certain |
| 144 | limits on their own. These shall use the ->setpolicy call | 145 | limits on their own. These shall use the ->setpolicy call |
| 145 | 146 | ||
| 146 | 147 | ||
| 147 | 1.4. target | 148 | 1.4. target/target_index |
| 148 | ------------- | 149 | ------------- |
| 149 | 150 | ||
| 151 | The target_index call has two arguments: struct cpufreq_policy *policy, | ||
| 152 | and unsigned int index (into the exposed frequency table). | ||
| 153 | |||
| 154 | The CPUfreq driver must set the new frequency when called here. The | ||
| 155 | actual frequency must be determined by freq_table[index].frequency. | ||
| 156 | |||
| 157 | Deprecated: | ||
| 158 | ---------- | ||
| 150 | The target call has three arguments: struct cpufreq_policy *policy, | 159 | The target call has three arguments: struct cpufreq_policy *policy, |
| 151 | unsigned int target_frequency, unsigned int relation. | 160 | unsigned int target_frequency, unsigned int relation. |
| 152 | 161 | ||
diff --git a/Documentation/cpu-freq/governors.txt b/Documentation/cpu-freq/governors.txt index 219970ba54b7..77ec21574fb1 100644 --- a/Documentation/cpu-freq/governors.txt +++ b/Documentation/cpu-freq/governors.txt | |||
| @@ -40,7 +40,7 @@ Most cpufreq drivers (in fact, all except one, longrun) or even most | |||
| 40 | cpu frequency scaling algorithms only offer the CPU to be set to one | 40 | cpu frequency scaling algorithms only offer the CPU to be set to one |
| 41 | frequency. In order to offer dynamic frequency scaling, the cpufreq | 41 | frequency. In order to offer dynamic frequency scaling, the cpufreq |
| 42 | core must be able to tell these drivers of a "target frequency". So | 42 | core must be able to tell these drivers of a "target frequency". So |
| 43 | these specific drivers will be transformed to offer a "->target" | 43 | these specific drivers will be transformed to offer a "->target/target_index" |
| 44 | call instead of the existing "->setpolicy" call. For "longrun", all | 44 | call instead of the existing "->setpolicy" call. For "longrun", all |
| 45 | stays the same, though. | 45 | stays the same, though. |
| 46 | 46 | ||
| @@ -71,7 +71,7 @@ CPU can be set to switch independently | CPU can only be set | |||
| 71 | / the limits of policy->{min,max} | 71 | / the limits of policy->{min,max} |
| 72 | / \ | 72 | / \ |
| 73 | / \ | 73 | / \ |
| 74 | Using the ->setpolicy call, Using the ->target call, | 74 | Using the ->setpolicy call, Using the ->target/target_index call, |
| 75 | the limits and the the frequency closest | 75 | the limits and the the frequency closest |
| 76 | "policy" is set. to target_freq is set. | 76 | "policy" is set. to target_freq is set. |
| 77 | It is assured that it | 77 | It is assured that it |
diff --git a/Documentation/devicetree/bindings/memory.txt b/Documentation/devicetree/bindings/memory.txt deleted file mode 100644 index eb2469365593..000000000000 --- a/Documentation/devicetree/bindings/memory.txt +++ /dev/null | |||
| @@ -1,168 +0,0 @@ | |||
| 1 | *** Memory binding *** | ||
| 2 | |||
| 3 | The /memory node provides basic information about the address and size | ||
| 4 | of the physical memory. This node is usually filled or updated by the | ||
| 5 | bootloader, depending on the actual memory configuration of the given | ||
| 6 | hardware. | ||
| 7 | |||
| 8 | The memory layout is described by the following node: | ||
| 9 | |||
| 10 | / { | ||
| 11 | #address-cells = <(n)>; | ||
| 12 | #size-cells = <(m)>; | ||
| 13 | memory { | ||
| 14 | device_type = "memory"; | ||
| 15 | reg = <(baseaddr1) (size1) | ||
| 16 | (baseaddr2) (size2) | ||
| 17 | ... | ||
| 18 | (baseaddrN) (sizeN)>; | ||
| 19 | }; | ||
| 20 | ... | ||
| 21 | }; | ||
| 22 | |||
| 23 | A memory node follows the typical device tree rules for "reg" property: | ||
| 24 | n: number of cells used to store base address value | ||
| 25 | m: number of cells used to store size value | ||
| 26 | baseaddrX: defines a base address of the defined memory bank | ||
| 27 | sizeX: the size of the defined memory bank | ||
| 28 | |||
| 29 | |||
| 30 | More than one memory bank can be defined. | ||
| 31 | |||
| 32 | |||
| 33 | *** Reserved memory regions *** | ||
| 34 | |||
| 35 | In /memory/reserved-memory node one can create child nodes describing | ||
| 36 | particular reserved (excluded from normal use) memory regions. Such | ||
| 37 | memory regions are usually designed for the special usage by various | ||
| 38 | device drivers. A good example are contiguous memory allocations or | ||
| 39 | memory sharing with other operating system on the same hardware board. | ||
| 40 | Those special memory regions might depend on the board configuration and | ||
| 41 | devices used on the target system. | ||
| 42 | |||
| 43 | Parameters for each memory region can be encoded into the device tree | ||
| 44 | with the following convention: | ||
| 45 | |||
| 46 | [(label):] (name) { | ||
| 47 | compatible = "linux,contiguous-memory-region", "reserved-memory-region"; | ||
| 48 | reg = <(address) (size)>; | ||
| 49 | (linux,default-contiguous-region); | ||
| 50 | }; | ||
| 51 | |||
| 52 | compatible: one or more of: | ||
| 53 | - "linux,contiguous-memory-region" - enables binding of this | ||
| 54 | region to Contiguous Memory Allocator (special region for | ||
| 55 | contiguous memory allocations, shared with movable system | ||
| 56 | memory, Linux kernel-specific). | ||
| 57 | - "reserved-memory-region" - compatibility is defined, given | ||
| 58 | region is assigned for exclusive usage for by the respective | ||
| 59 | devices. | ||
| 60 | |||
| 61 | reg: standard property defining the base address and size of | ||
| 62 | the memory region | ||
| 63 | |||
| 64 | linux,default-contiguous-region: property indicating that the region | ||
| 65 | is the default region for all contiguous memory | ||
| 66 | allocations, Linux specific (optional) | ||
| 67 | |||
| 68 | It is optional to specify the base address, so if one wants to use | ||
| 69 | autoconfiguration of the base address, '0' can be specified as a base | ||
| 70 | address in the 'reg' property. | ||
| 71 | |||
| 72 | The /memory/reserved-memory node must contain the same #address-cells | ||
| 73 | and #size-cells value as the root node. | ||
| 74 | |||
| 75 | |||
| 76 | *** Device node's properties *** | ||
| 77 | |||
| 78 | Once regions in the /memory/reserved-memory node have been defined, they | ||
| 79 | may be referenced by other device nodes. Bindings that wish to reference | ||
| 80 | memory regions should explicitly document their use of the following | ||
| 81 | property: | ||
| 82 | |||
| 83 | memory-region = <&phandle_to_defined_region>; | ||
| 84 | |||
| 85 | This property indicates that the device driver should use the memory | ||
| 86 | region pointed by the given phandle. | ||
| 87 | |||
| 88 | |||
| 89 | *** Example *** | ||
| 90 | |||
| 91 | This example defines a memory consisting of 4 memory banks. 3 contiguous | ||
| 92 | regions are defined for Linux kernel, one default of all device drivers | ||
| 93 | (named contig_mem, placed at 0x72000000, 64MiB), one dedicated to the | ||
| 94 | framebuffer device (labelled display_mem, placed at 0x78000000, 8MiB) | ||
| 95 | and one for multimedia processing (labelled multimedia_mem, placed at | ||
| 96 | 0x77000000, 64MiB). 'display_mem' region is then assigned to fb@12300000 | ||
| 97 | device for DMA memory allocations (Linux kernel drivers will use CMA is | ||
| 98 | available or dma-exclusive usage otherwise). 'multimedia_mem' is | ||
| 99 | assigned to scaler@12500000 and codec@12600000 devices for contiguous | ||
| 100 | memory allocations when CMA driver is enabled. | ||
| 101 | |||
| 102 | The reason for creating a separate region for framebuffer device is to | ||
| 103 | match the framebuffer base address to the one configured by bootloader, | ||
| 104 | so once Linux kernel drivers starts no glitches on the displayed boot | ||
| 105 | logo appears. Scaller and codec drivers should share the memory | ||
| 106 | allocations. | ||
| 107 | |||
| 108 | / { | ||
| 109 | #address-cells = <1>; | ||
| 110 | #size-cells = <1>; | ||
| 111 | |||
| 112 | /* ... */ | ||
| 113 | |||
| 114 | memory { | ||
| 115 | reg = <0x40000000 0x10000000 | ||
| 116 | 0x50000000 0x10000000 | ||
| 117 | 0x60000000 0x10000000 | ||
| 118 | 0x70000000 0x10000000>; | ||
| 119 | |||
| 120 | reserved-memory { | ||
| 121 | #address-cells = <1>; | ||
| 122 | #size-cells = <1>; | ||
| 123 | |||
| 124 | /* | ||
| 125 | * global autoconfigured region for contiguous allocations | ||
| 126 | * (used only with Contiguous Memory Allocator) | ||
| 127 | */ | ||
| 128 | contig_region@0 { | ||
| 129 | compatible = "linux,contiguous-memory-region"; | ||
| 130 | reg = <0x0 0x4000000>; | ||
| 131 | linux,default-contiguous-region; | ||
| 132 | }; | ||
| 133 | |||
| 134 | /* | ||
| 135 | * special region for framebuffer | ||
| 136 | */ | ||
| 137 | display_region: region@78000000 { | ||
| 138 | compatible = "linux,contiguous-memory-region", "reserved-memory-region"; | ||
| 139 | reg = <0x78000000 0x800000>; | ||
| 140 | }; | ||
| 141 | |||
| 142 | /* | ||
| 143 | * special region for multimedia processing devices | ||
| 144 | */ | ||
| 145 | multimedia_region: region@77000000 { | ||
| 146 | compatible = "linux,contiguous-memory-region"; | ||
| 147 | reg = <0x77000000 0x4000000>; | ||
| 148 | }; | ||
| 149 | }; | ||
| 150 | }; | ||
| 151 | |||
| 152 | /* ... */ | ||
| 153 | |||
| 154 | fb0: fb@12300000 { | ||
| 155 | status = "okay"; | ||
| 156 | memory-region = <&display_region>; | ||
| 157 | }; | ||
| 158 | |||
| 159 | scaler: scaler@12500000 { | ||
| 160 | status = "okay"; | ||
| 161 | memory-region = <&multimedia_region>; | ||
| 162 | }; | ||
| 163 | |||
| 164 | codec: codec@12600000 { | ||
| 165 | status = "okay"; | ||
| 166 | memory-region = <&multimedia_region>; | ||
| 167 | }; | ||
| 168 | }; | ||
diff --git a/Documentation/power/opp.txt b/Documentation/power/opp.txt index 425c51d56aef..b8a907dc0169 100644 --- a/Documentation/power/opp.txt +++ b/Documentation/power/opp.txt | |||
| @@ -42,7 +42,7 @@ We can represent these as three OPPs as the following {Hz, uV} tuples: | |||
| 42 | 42 | ||
| 43 | OPP library provides a set of helper functions to organize and query the OPP | 43 | OPP library provides a set of helper functions to organize and query the OPP |
| 44 | information. The library is located in drivers/base/power/opp.c and the header | 44 | information. The library is located in drivers/base/power/opp.c and the header |
| 45 | is located in include/linux/opp.h. OPP library can be enabled by enabling | 45 | is located in include/linux/pm_opp.h. OPP library can be enabled by enabling |
| 46 | CONFIG_PM_OPP from power management menuconfig menu. OPP library depends on | 46 | CONFIG_PM_OPP from power management menuconfig menu. OPP library depends on |
| 47 | CONFIG_PM as certain SoCs such as Texas Instrument's OMAP framework allows to | 47 | CONFIG_PM as certain SoCs such as Texas Instrument's OMAP framework allows to |
| 48 | optionally boot at a certain OPP without needing cpufreq. | 48 | optionally boot at a certain OPP without needing cpufreq. |
| @@ -71,14 +71,14 @@ operations until that OPP could be re-enabled if possible. | |||
| 71 | 71 | ||
| 72 | OPP library facilitates this concept in it's implementation. The following | 72 | OPP library facilitates this concept in it's implementation. The following |
| 73 | operational functions operate only on available opps: | 73 | operational functions operate only on available opps: |
| 74 | opp_find_freq_{ceil, floor}, opp_get_voltage, opp_get_freq, opp_get_opp_count | 74 | opp_find_freq_{ceil, floor}, dev_pm_opp_get_voltage, dev_pm_opp_get_freq, dev_pm_opp_get_opp_count |
| 75 | and opp_init_cpufreq_table | 75 | and dev_pm_opp_init_cpufreq_table |
| 76 | 76 | ||
| 77 | opp_find_freq_exact is meant to be used to find the opp pointer which can then | 77 | dev_pm_opp_find_freq_exact is meant to be used to find the opp pointer which can then |
| 78 | be used for opp_enable/disable functions to make an opp available as required. | 78 | be used for dev_pm_opp_enable/disable functions to make an opp available as required. |
| 79 | 79 | ||
| 80 | WARNING: Users of OPP library should refresh their availability count using | 80 | WARNING: Users of OPP library should refresh their availability count using |
| 81 | get_opp_count if opp_enable/disable functions are invoked for a device, the | 81 | get_opp_count if dev_pm_opp_enable/disable functions are invoked for a device, the |
| 82 | exact mechanism to trigger these or the notification mechanism to other | 82 | exact mechanism to trigger these or the notification mechanism to other |
| 83 | dependent subsystems such as cpufreq are left to the discretion of the SoC | 83 | dependent subsystems such as cpufreq are left to the discretion of the SoC |
| 84 | specific framework which uses the OPP library. Similar care needs to be taken | 84 | specific framework which uses the OPP library. Similar care needs to be taken |
| @@ -96,24 +96,24 @@ using RCU read locks. The opp_find_freq_{exact,ceil,floor}, | |||
| 96 | opp_get_{voltage, freq, opp_count} fall into this category. | 96 | opp_get_{voltage, freq, opp_count} fall into this category. |
| 97 | 97 | ||
| 98 | opp_{add,enable,disable} are updaters which use mutex and implement it's own | 98 | opp_{add,enable,disable} are updaters which use mutex and implement it's own |
| 99 | RCU locking mechanisms. opp_init_cpufreq_table acts as an updater and uses | 99 | RCU locking mechanisms. dev_pm_opp_init_cpufreq_table acts as an updater and uses |
| 100 | mutex to implment RCU updater strategy. These functions should *NOT* be called | 100 | mutex to implment RCU updater strategy. These functions should *NOT* be called |
| 101 | under RCU locks and other contexts that prevent blocking functions in RCU or | 101 | under RCU locks and other contexts that prevent blocking functions in RCU or |
| 102 | mutex operations from working. | 102 | mutex operations from working. |
| 103 | 103 | ||
| 104 | 2. Initial OPP List Registration | 104 | 2. Initial OPP List Registration |
| 105 | ================================ | 105 | ================================ |
| 106 | The SoC implementation calls opp_add function iteratively to add OPPs per | 106 | The SoC implementation calls dev_pm_opp_add function iteratively to add OPPs per |
| 107 | device. It is expected that the SoC framework will register the OPP entries | 107 | device. It is expected that the SoC framework will register the OPP entries |
| 108 | optimally- typical numbers range to be less than 5. The list generated by | 108 | optimally- typical numbers range to be less than 5. The list generated by |
| 109 | registering the OPPs is maintained by OPP library throughout the device | 109 | registering the OPPs is maintained by OPP library throughout the device |
| 110 | operation. The SoC framework can subsequently control the availability of the | 110 | operation. The SoC framework can subsequently control the availability of the |
| 111 | OPPs dynamically using the opp_enable / disable functions. | 111 | OPPs dynamically using the dev_pm_opp_enable / disable functions. |
| 112 | 112 | ||
| 113 | opp_add - Add a new OPP for a specific domain represented by the device pointer. | 113 | dev_pm_opp_add - Add a new OPP for a specific domain represented by the device pointer. |
| 114 | The OPP is defined using the frequency and voltage. Once added, the OPP | 114 | The OPP is defined using the frequency and voltage. Once added, the OPP |
| 115 | is assumed to be available and control of it's availability can be done | 115 | is assumed to be available and control of it's availability can be done |
| 116 | with the opp_enable/disable functions. OPP library internally stores | 116 | with the dev_pm_opp_enable/disable functions. OPP library internally stores |
| 117 | and manages this information in the opp struct. This function may be | 117 | and manages this information in the opp struct. This function may be |
| 118 | used by SoC framework to define a optimal list as per the demands of | 118 | used by SoC framework to define a optimal list as per the demands of |
| 119 | SoC usage environment. | 119 | SoC usage environment. |
| @@ -124,7 +124,7 @@ opp_add - Add a new OPP for a specific domain represented by the device pointer. | |||
| 124 | soc_pm_init() | 124 | soc_pm_init() |
| 125 | { | 125 | { |
| 126 | /* Do things */ | 126 | /* Do things */ |
| 127 | r = opp_add(mpu_dev, 1000000, 900000); | 127 | r = dev_pm_opp_add(mpu_dev, 1000000, 900000); |
| 128 | if (!r) { | 128 | if (!r) { |
| 129 | pr_err("%s: unable to register mpu opp(%d)\n", r); | 129 | pr_err("%s: unable to register mpu opp(%d)\n", r); |
| 130 | goto no_cpufreq; | 130 | goto no_cpufreq; |
| @@ -143,44 +143,44 @@ functions return the matching pointer representing the opp if a match is | |||
| 143 | found, else returns error. These errors are expected to be handled by standard | 143 | found, else returns error. These errors are expected to be handled by standard |
| 144 | error checks such as IS_ERR() and appropriate actions taken by the caller. | 144 | error checks such as IS_ERR() and appropriate actions taken by the caller. |
| 145 | 145 | ||
| 146 | opp_find_freq_exact - Search for an OPP based on an *exact* frequency and | 146 | dev_pm_opp_find_freq_exact - Search for an OPP based on an *exact* frequency and |
| 147 | availability. This function is especially useful to enable an OPP which | 147 | availability. This function is especially useful to enable an OPP which |
| 148 | is not available by default. | 148 | is not available by default. |
| 149 | Example: In a case when SoC framework detects a situation where a | 149 | Example: In a case when SoC framework detects a situation where a |
| 150 | higher frequency could be made available, it can use this function to | 150 | higher frequency could be made available, it can use this function to |
| 151 | find the OPP prior to call the opp_enable to actually make it available. | 151 | find the OPP prior to call the dev_pm_opp_enable to actually make it available. |
| 152 | rcu_read_lock(); | 152 | rcu_read_lock(); |
| 153 | opp = opp_find_freq_exact(dev, 1000000000, false); | 153 | opp = dev_pm_opp_find_freq_exact(dev, 1000000000, false); |
| 154 | rcu_read_unlock(); | 154 | rcu_read_unlock(); |
| 155 | /* dont operate on the pointer.. just do a sanity check.. */ | 155 | /* dont operate on the pointer.. just do a sanity check.. */ |
| 156 | if (IS_ERR(opp)) { | 156 | if (IS_ERR(opp)) { |
| 157 | pr_err("frequency not disabled!\n"); | 157 | pr_err("frequency not disabled!\n"); |
| 158 | /* trigger appropriate actions.. */ | 158 | /* trigger appropriate actions.. */ |
| 159 | } else { | 159 | } else { |
| 160 | opp_enable(dev,1000000000); | 160 | dev_pm_opp_enable(dev,1000000000); |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | NOTE: This is the only search function that operates on OPPs which are | 163 | NOTE: This is the only search function that operates on OPPs which are |
| 164 | not available. | 164 | not available. |
| 165 | 165 | ||
| 166 | opp_find_freq_floor - Search for an available OPP which is *at most* the | 166 | dev_pm_opp_find_freq_floor - Search for an available OPP which is *at most* the |
| 167 | provided frequency. This function is useful while searching for a lesser | 167 | provided frequency. This function is useful while searching for a lesser |
| 168 | match OR operating on OPP information in the order of decreasing | 168 | match OR operating on OPP information in the order of decreasing |
| 169 | frequency. | 169 | frequency. |
| 170 | Example: To find the highest opp for a device: | 170 | Example: To find the highest opp for a device: |
| 171 | freq = ULONG_MAX; | 171 | freq = ULONG_MAX; |
| 172 | rcu_read_lock(); | 172 | rcu_read_lock(); |
| 173 | opp_find_freq_floor(dev, &freq); | 173 | dev_pm_opp_find_freq_floor(dev, &freq); |
| 174 | rcu_read_unlock(); | 174 | rcu_read_unlock(); |
| 175 | 175 | ||
| 176 | opp_find_freq_ceil - Search for an available OPP which is *at least* the | 176 | dev_pm_opp_find_freq_ceil - Search for an available OPP which is *at least* the |
| 177 | provided frequency. This function is useful while searching for a | 177 | provided frequency. This function is useful while searching for a |
| 178 | higher match OR operating on OPP information in the order of increasing | 178 | higher match OR operating on OPP information in the order of increasing |
| 179 | frequency. | 179 | frequency. |
| 180 | Example 1: To find the lowest opp for a device: | 180 | Example 1: To find the lowest opp for a device: |
| 181 | freq = 0; | 181 | freq = 0; |
| 182 | rcu_read_lock(); | 182 | rcu_read_lock(); |
| 183 | opp_find_freq_ceil(dev, &freq); | 183 | dev_pm_opp_find_freq_ceil(dev, &freq); |
| 184 | rcu_read_unlock(); | 184 | rcu_read_unlock(); |
| 185 | Example 2: A simplified implementation of a SoC cpufreq_driver->target: | 185 | Example 2: A simplified implementation of a SoC cpufreq_driver->target: |
| 186 | soc_cpufreq_target(..) | 186 | soc_cpufreq_target(..) |
| @@ -188,7 +188,7 @@ opp_find_freq_ceil - Search for an available OPP which is *at least* the | |||
| 188 | /* Do stuff like policy checks etc. */ | 188 | /* Do stuff like policy checks etc. */ |
| 189 | /* Find the best frequency match for the req */ | 189 | /* Find the best frequency match for the req */ |
| 190 | rcu_read_lock(); | 190 | rcu_read_lock(); |
| 191 | opp = opp_find_freq_ceil(dev, &freq); | 191 | opp = dev_pm_opp_find_freq_ceil(dev, &freq); |
| 192 | rcu_read_unlock(); | 192 | rcu_read_unlock(); |
| 193 | if (!IS_ERR(opp)) | 193 | if (!IS_ERR(opp)) |
| 194 | soc_switch_to_freq_voltage(freq); | 194 | soc_switch_to_freq_voltage(freq); |
| @@ -208,34 +208,34 @@ as thermal considerations (e.g. don't use OPPx until the temperature drops). | |||
| 208 | 208 | ||
| 209 | WARNING: Do not use these functions in interrupt context. | 209 | WARNING: Do not use these functions in interrupt context. |
| 210 | 210 | ||
| 211 | opp_enable - Make a OPP available for operation. | 211 | dev_pm_opp_enable - Make a OPP available for operation. |
| 212 | Example: Lets say that 1GHz OPP is to be made available only if the | 212 | Example: Lets say that 1GHz OPP is to be made available only if the |
| 213 | SoC temperature is lower than a certain threshold. The SoC framework | 213 | SoC temperature is lower than a certain threshold. The SoC framework |
| 214 | implementation might choose to do something as follows: | 214 | implementation might choose to do something as follows: |
| 215 | if (cur_temp < temp_low_thresh) { | 215 | if (cur_temp < temp_low_thresh) { |
| 216 | /* Enable 1GHz if it was disabled */ | 216 | /* Enable 1GHz if it was disabled */ |
| 217 | rcu_read_lock(); | 217 | rcu_read_lock(); |
| 218 | opp = opp_find_freq_exact(dev, 1000000000, false); | 218 | opp = dev_pm_opp_find_freq_exact(dev, 1000000000, false); |
| 219 | rcu_read_unlock(); | 219 | rcu_read_unlock(); |
| 220 | /* just error check */ | 220 | /* just error check */ |
| 221 | if (!IS_ERR(opp)) | 221 | if (!IS_ERR(opp)) |
| 222 | ret = opp_enable(dev, 1000000000); | 222 | ret = dev_pm_opp_enable(dev, 1000000000); |
| 223 | else | 223 | else |
| 224 | goto try_something_else; | 224 | goto try_something_else; |
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | opp_disable - Make an OPP to be not available for operation | 227 | dev_pm_opp_disable - Make an OPP to be not available for operation |
| 228 | Example: Lets say that 1GHz OPP is to be disabled if the temperature | 228 | Example: Lets say that 1GHz OPP is to be disabled if the temperature |
| 229 | exceeds a threshold value. The SoC framework implementation might | 229 | exceeds a threshold value. The SoC framework implementation might |
| 230 | choose to do something as follows: | 230 | choose to do something as follows: |
| 231 | if (cur_temp > temp_high_thresh) { | 231 | if (cur_temp > temp_high_thresh) { |
| 232 | /* Disable 1GHz if it was enabled */ | 232 | /* Disable 1GHz if it was enabled */ |
| 233 | rcu_read_lock(); | 233 | rcu_read_lock(); |
| 234 | opp = opp_find_freq_exact(dev, 1000000000, true); | 234 | opp = dev_pm_opp_find_freq_exact(dev, 1000000000, true); |
| 235 | rcu_read_unlock(); | 235 | rcu_read_unlock(); |
| 236 | /* just error check */ | 236 | /* just error check */ |
| 237 | if (!IS_ERR(opp)) | 237 | if (!IS_ERR(opp)) |
| 238 | ret = opp_disable(dev, 1000000000); | 238 | ret = dev_pm_opp_disable(dev, 1000000000); |
| 239 | else | 239 | else |
| 240 | goto try_something_else; | 240 | goto try_something_else; |
| 241 | } | 241 | } |
| @@ -247,7 +247,7 @@ information from the OPP structure is necessary. Once an OPP pointer is | |||
| 247 | retrieved using the search functions, the following functions can be used by SoC | 247 | retrieved using the search functions, the following functions can be used by SoC |
| 248 | framework to retrieve the information represented inside the OPP layer. | 248 | framework to retrieve the information represented inside the OPP layer. |
| 249 | 249 | ||
| 250 | opp_get_voltage - Retrieve the voltage represented by the opp pointer. | 250 | dev_pm_opp_get_voltage - Retrieve the voltage represented by the opp pointer. |
| 251 | Example: At a cpufreq transition to a different frequency, SoC | 251 | Example: At a cpufreq transition to a different frequency, SoC |
| 252 | framework requires to set the voltage represented by the OPP using | 252 | framework requires to set the voltage represented by the OPP using |
| 253 | the regulator framework to the Power Management chip providing the | 253 | the regulator framework to the Power Management chip providing the |
| @@ -256,15 +256,15 @@ opp_get_voltage - Retrieve the voltage represented by the opp pointer. | |||
| 256 | { | 256 | { |
| 257 | /* do things */ | 257 | /* do things */ |
| 258 | rcu_read_lock(); | 258 | rcu_read_lock(); |
| 259 | opp = opp_find_freq_ceil(dev, &freq); | 259 | opp = dev_pm_opp_find_freq_ceil(dev, &freq); |
| 260 | v = opp_get_voltage(opp); | 260 | v = dev_pm_opp_get_voltage(opp); |
| 261 | rcu_read_unlock(); | 261 | rcu_read_unlock(); |
| 262 | if (v) | 262 | if (v) |
| 263 | regulator_set_voltage(.., v); | 263 | regulator_set_voltage(.., v); |
| 264 | /* do other things */ | 264 | /* do other things */ |
| 265 | } | 265 | } |
| 266 | 266 | ||
| 267 | opp_get_freq - Retrieve the freq represented by the opp pointer. | 267 | dev_pm_opp_get_freq - Retrieve the freq represented by the opp pointer. |
| 268 | Example: Lets say the SoC framework uses a couple of helper functions | 268 | Example: Lets say the SoC framework uses a couple of helper functions |
| 269 | we could pass opp pointers instead of doing additional parameters to | 269 | we could pass opp pointers instead of doing additional parameters to |
| 270 | handle quiet a bit of data parameters. | 270 | handle quiet a bit of data parameters. |
| @@ -273,8 +273,8 @@ opp_get_freq - Retrieve the freq represented by the opp pointer. | |||
| 273 | /* do things.. */ | 273 | /* do things.. */ |
| 274 | max_freq = ULONG_MAX; | 274 | max_freq = ULONG_MAX; |
| 275 | rcu_read_lock(); | 275 | rcu_read_lock(); |
| 276 | max_opp = opp_find_freq_floor(dev,&max_freq); | 276 | max_opp = dev_pm_opp_find_freq_floor(dev,&max_freq); |
| 277 | requested_opp = opp_find_freq_ceil(dev,&freq); | 277 | requested_opp = dev_pm_opp_find_freq_ceil(dev,&freq); |
| 278 | if (!IS_ERR(max_opp) && !IS_ERR(requested_opp)) | 278 | if (!IS_ERR(max_opp) && !IS_ERR(requested_opp)) |
| 279 | r = soc_test_validity(max_opp, requested_opp); | 279 | r = soc_test_validity(max_opp, requested_opp); |
| 280 | rcu_read_unlock(); | 280 | rcu_read_unlock(); |
| @@ -282,25 +282,25 @@ opp_get_freq - Retrieve the freq represented by the opp pointer. | |||
| 282 | } | 282 | } |
| 283 | soc_test_validity(..) | 283 | soc_test_validity(..) |
| 284 | { | 284 | { |
| 285 | if(opp_get_voltage(max_opp) < opp_get_voltage(requested_opp)) | 285 | if(dev_pm_opp_get_voltage(max_opp) < dev_pm_opp_get_voltage(requested_opp)) |
| 286 | return -EINVAL; | 286 | return -EINVAL; |
| 287 | if(opp_get_freq(max_opp) < opp_get_freq(requested_opp)) | 287 | if(dev_pm_opp_get_freq(max_opp) < dev_pm_opp_get_freq(requested_opp)) |
| 288 | return -EINVAL; | 288 | return -EINVAL; |
| 289 | /* do things.. */ | 289 | /* do things.. */ |
| 290 | } | 290 | } |
| 291 | 291 | ||
| 292 | opp_get_opp_count - Retrieve the number of available opps for a device | 292 | dev_pm_opp_get_opp_count - Retrieve the number of available opps for a device |
| 293 | Example: Lets say a co-processor in the SoC needs to know the available | 293 | Example: Lets say a co-processor in the SoC needs to know the available |
| 294 | frequencies in a table, the main processor can notify as following: | 294 | frequencies in a table, the main processor can notify as following: |
| 295 | soc_notify_coproc_available_frequencies() | 295 | soc_notify_coproc_available_frequencies() |
| 296 | { | 296 | { |
| 297 | /* Do things */ | 297 | /* Do things */ |
| 298 | rcu_read_lock(); | 298 | rcu_read_lock(); |
| 299 | num_available = opp_get_opp_count(dev); | 299 | num_available = dev_pm_opp_get_opp_count(dev); |
| 300 | speeds = kzalloc(sizeof(u32) * num_available, GFP_KERNEL); | 300 | speeds = kzalloc(sizeof(u32) * num_available, GFP_KERNEL); |
| 301 | /* populate the table in increasing order */ | 301 | /* populate the table in increasing order */ |
| 302 | freq = 0; | 302 | freq = 0; |
| 303 | while (!IS_ERR(opp = opp_find_freq_ceil(dev, &freq))) { | 303 | while (!IS_ERR(opp = dev_pm_opp_find_freq_ceil(dev, &freq))) { |
| 304 | speeds[i] = freq; | 304 | speeds[i] = freq; |
| 305 | freq++; | 305 | freq++; |
| 306 | i++; | 306 | i++; |
| @@ -313,7 +313,7 @@ opp_get_opp_count - Retrieve the number of available opps for a device | |||
| 313 | 313 | ||
| 314 | 6. Cpufreq Table Generation | 314 | 6. Cpufreq Table Generation |
| 315 | =========================== | 315 | =========================== |
| 316 | opp_init_cpufreq_table - cpufreq framework typically is initialized with | 316 | dev_pm_opp_init_cpufreq_table - cpufreq framework typically is initialized with |
| 317 | cpufreq_frequency_table_cpuinfo which is provided with the list of | 317 | cpufreq_frequency_table_cpuinfo which is provided with the list of |
| 318 | frequencies that are available for operation. This function provides | 318 | frequencies that are available for operation. This function provides |
| 319 | a ready to use conversion routine to translate the OPP layer's internal | 319 | a ready to use conversion routine to translate the OPP layer's internal |
| @@ -326,7 +326,7 @@ opp_init_cpufreq_table - cpufreq framework typically is initialized with | |||
| 326 | soc_pm_init() | 326 | soc_pm_init() |
| 327 | { | 327 | { |
| 328 | /* Do things */ | 328 | /* Do things */ |
| 329 | r = opp_init_cpufreq_table(dev, &freq_table); | 329 | r = dev_pm_opp_init_cpufreq_table(dev, &freq_table); |
| 330 | if (!r) | 330 | if (!r) |
| 331 | cpufreq_frequency_table_cpuinfo(policy, freq_table); | 331 | cpufreq_frequency_table_cpuinfo(policy, freq_table); |
| 332 | /* Do other things */ | 332 | /* Do other things */ |
| @@ -336,7 +336,7 @@ opp_init_cpufreq_table - cpufreq framework typically is initialized with | |||
| 336 | addition to CONFIG_PM as power management feature is required to | 336 | addition to CONFIG_PM as power management feature is required to |
| 337 | dynamically scale voltage and frequency in a system. | 337 | dynamically scale voltage and frequency in a system. |
| 338 | 338 | ||
| 339 | opp_free_cpufreq_table - Free up the table allocated by opp_init_cpufreq_table | 339 | dev_pm_opp_free_cpufreq_table - Free up the table allocated by dev_pm_opp_init_cpufreq_table |
| 340 | 340 | ||
| 341 | 7. Data Structures | 341 | 7. Data Structures |
| 342 | ================== | 342 | ================== |
| @@ -358,16 +358,16 @@ accessed by various functions as described above. However, the structures | |||
| 358 | representing the actual OPPs and domains are internal to the OPP library itself | 358 | representing the actual OPPs and domains are internal to the OPP library itself |
| 359 | to allow for suitable abstraction reusable across systems. | 359 | to allow for suitable abstraction reusable across systems. |
| 360 | 360 | ||
| 361 | struct opp - The internal data structure of OPP library which is used to | 361 | struct dev_pm_opp - The internal data structure of OPP library which is used to |
| 362 | represent an OPP. In addition to the freq, voltage, availability | 362 | represent an OPP. In addition to the freq, voltage, availability |
| 363 | information, it also contains internal book keeping information required | 363 | information, it also contains internal book keeping information required |
| 364 | for the OPP library to operate on. Pointer to this structure is | 364 | for the OPP library to operate on. Pointer to this structure is |
| 365 | provided back to the users such as SoC framework to be used as a | 365 | provided back to the users such as SoC framework to be used as a |
| 366 | identifier for OPP in the interactions with OPP layer. | 366 | identifier for OPP in the interactions with OPP layer. |
| 367 | 367 | ||
| 368 | WARNING: The struct opp pointer should not be parsed or modified by the | 368 | WARNING: The struct dev_pm_opp pointer should not be parsed or modified by the |
| 369 | users. The defaults of for an instance is populated by opp_add, but the | 369 | users. The defaults of for an instance is populated by dev_pm_opp_add, but the |
| 370 | availability of the OPP can be modified by opp_enable/disable functions. | 370 | availability of the OPP can be modified by dev_pm_opp_enable/disable functions. |
| 371 | 371 | ||
| 372 | struct device - This is used to identify a domain to the OPP layer. The | 372 | struct device - This is used to identify a domain to the OPP layer. The |
| 373 | nature of the device and it's implementation is left to the user of | 373 | nature of the device and it's implementation is left to the user of |
| @@ -377,19 +377,19 @@ Overall, in a simplistic view, the data structure operations is represented as | |||
| 377 | following: | 377 | following: |
| 378 | 378 | ||
| 379 | Initialization / modification: | 379 | Initialization / modification: |
| 380 | +-----+ /- opp_enable | 380 | +-----+ /- dev_pm_opp_enable |
| 381 | opp_add --> | opp | <------- | 381 | dev_pm_opp_add --> | opp | <------- |
| 382 | | +-----+ \- opp_disable | 382 | | +-----+ \- dev_pm_opp_disable |
| 383 | \-------> domain_info(device) | 383 | \-------> domain_info(device) |
| 384 | 384 | ||
| 385 | Search functions: | 385 | Search functions: |
| 386 | /-- opp_find_freq_ceil ---\ +-----+ | 386 | /-- dev_pm_opp_find_freq_ceil ---\ +-----+ |
| 387 | domain_info<---- opp_find_freq_exact -----> | opp | | 387 | domain_info<---- dev_pm_opp_find_freq_exact -----> | opp | |
| 388 | \-- opp_find_freq_floor ---/ +-----+ | 388 | \-- dev_pm_opp_find_freq_floor ---/ +-----+ |
| 389 | 389 | ||
| 390 | Retrieval functions: | 390 | Retrieval functions: |
| 391 | +-----+ /- opp_get_voltage | 391 | +-----+ /- dev_pm_opp_get_voltage |
| 392 | | opp | <--- | 392 | | opp | <--- |
| 393 | +-----+ \- opp_get_freq | 393 | +-----+ \- dev_pm_opp_get_freq |
| 394 | 394 | ||
| 395 | domain_info <- opp_get_opp_count | 395 | domain_info <- dev_pm_opp_get_opp_count |
diff --git a/Documentation/power/powercap/powercap.txt b/Documentation/power/powercap/powercap.txt new file mode 100644 index 000000000000..1e6ef164e07a --- /dev/null +++ b/Documentation/power/powercap/powercap.txt | |||
| @@ -0,0 +1,236 @@ | |||
| 1 | Power Capping Framework | ||
| 2 | ================================== | ||
| 3 | |||
| 4 | The power capping framework provides a consistent interface between the kernel | ||
| 5 | and the user space that allows power capping drivers to expose the settings to | ||
| 6 | user space in a uniform way. | ||
| 7 | |||
| 8 | Terminology | ||
| 9 | ========================= | ||
| 10 | The framework exposes power capping devices to user space via sysfs in the | ||
| 11 | form of a tree of objects. The objects at the root level of the tree represent | ||
| 12 | 'control types', which correspond to different methods of power capping. For | ||
| 13 | example, the intel-rapl control type represents the Intel "Running Average | ||
| 14 | Power Limit" (RAPL) technology, whereas the 'idle-injection' control type | ||
| 15 | corresponds to the use of idle injection for controlling power. | ||
| 16 | |||
| 17 | Power zones represent different parts of the system, which can be controlled and | ||
| 18 | monitored using the power capping method determined by the control type the | ||
| 19 | given zone belongs to. They each contain attributes for monitoring power, as | ||
| 20 | well as controls represented in the form of power constraints. If the parts of | ||
| 21 | the system represented by different power zones are hierarchical (that is, one | ||
| 22 | bigger part consists of multiple smaller parts that each have their own power | ||
| 23 | controls), those power zones may also be organized in a hierarchy with one | ||
| 24 | parent power zone containing multiple subzones and so on to reflect the power | ||
| 25 | control topology of the system. In that case, it is possible to apply power | ||
| 26 | capping to a set of devices together using the parent power zone and if more | ||
| 27 | fine grained control is required, it can be applied through the subzones. | ||
| 28 | |||
| 29 | |||
| 30 | Example sysfs interface tree: | ||
| 31 | |||
| 32 | /sys/devices/virtual/powercap | ||
| 33 | ??? intel-rapl | ||
| 34 | ??? intel-rapl:0 | ||
| 35 | ?  ??? constraint_0_name | ||
| 36 | ?  ??? constraint_0_power_limit_uw | ||
| 37 | ?  ??? constraint_0_time_window_us | ||
| 38 | ?  ??? constraint_1_name | ||
| 39 | ?  ??? constraint_1_power_limit_uw | ||
| 40 | ?  ??? constraint_1_time_window_us | ||
| 41 | ?  ??? device -> ../../intel-rapl | ||
| 42 | ?  ??? energy_uj | ||
| 43 | ?  ??? intel-rapl:0:0 | ||
| 44 | ?  ?  ??? constraint_0_name | ||
| 45 | ?  ?  ??? constraint_0_power_limit_uw | ||
| 46 | ?  ?  ??? constraint_0_time_window_us | ||
| 47 | ?  ?  ??? constraint_1_name | ||
| 48 | ?  ?  ??? constraint_1_power_limit_uw | ||
| 49 | ?  ?  ??? constraint_1_time_window_us | ||
| 50 | ?  ?  ??? device -> ../../intel-rapl:0 | ||
| 51 | ?  ?  ??? energy_uj | ||
| 52 | ?  ?  ??? max_energy_range_uj | ||
| 53 | ?  ?  ??? name | ||
| 54 | ?  ?  ??? enabled | ||
| 55 | ?  ?  ??? power | ||
| 56 | ?  ?  ?  ??? async | ||
| 57 | ?  ?  ?  [] | ||
| 58 | ?  ?  ??? subsystem -> ../../../../../../class/power_cap | ||
| 59 | ?  ?  ??? uevent | ||
| 60 | ?  ??? intel-rapl:0:1 | ||
| 61 | ?  ?  ??? constraint_0_name | ||
| 62 | ?  ?  ??? constraint_0_power_limit_uw | ||
| 63 | ?  ?  ??? constraint_0_time_window_us | ||
| 64 | ?  ?  ??? constraint_1_name | ||
| 65 | ?  ?  ??? constraint_1_power_limit_uw | ||
| 66 | ?  ?  ??? constraint_1_time_window_us | ||
| 67 | ?  ?  ??? device -> ../../intel-rapl:0 | ||
| 68 | ?  ?  ??? energy_uj | ||
| 69 | ?  ?  ??? max_energy_range_uj | ||
| 70 | ?  ?  ??? name | ||
| 71 | ?  ?  ??? enabled | ||
| 72 | ?  ?  ??? power | ||
| 73 | ?  ?  ?  ??? async | ||
| 74 | ?  ?  ?  [] | ||
| 75 | ?  ?  ??? subsystem -> ../../../../../../class/power_cap | ||
| 76 | ?  ?  ??? uevent | ||
| 77 | ?  ??? max_energy_range_uj | ||
| 78 | ?  ??? max_power_range_uw | ||
| 79 | ?  ??? name | ||
| 80 | ?  ??? enabled | ||
| 81 | ?  ??? power | ||
| 82 | ?  ?  ??? async | ||
| 83 | ?  ?  [] | ||
| 84 | ?  ??? subsystem -> ../../../../../class/power_cap | ||
| 85 | ?  ??? enabled | ||
| 86 | ?  ??? uevent | ||
| 87 | ??? intel-rapl:1 | ||
| 88 | ?  ??? constraint_0_name | ||
| 89 | ?  ??? constraint_0_power_limit_uw | ||
| 90 | ?  ??? constraint_0_time_window_us | ||
| 91 | ?  ??? constraint_1_name | ||
| 92 | ?  ??? constraint_1_power_limit_uw | ||
| 93 | ?  ??? constraint_1_time_window_us | ||
| 94 | ?  ??? device -> ../../intel-rapl | ||
| 95 | ?  ??? energy_uj | ||
| 96 | ?  ??? intel-rapl:1:0 | ||
| 97 | ?  ?  ??? constraint_0_name | ||
| 98 | ?  ?  ??? constraint_0_power_limit_uw | ||
| 99 | ?  ?  ??? constraint_0_time_window_us | ||
| 100 | ?  ?  ??? constraint_1_name | ||
| 101 | ?  ?  ??? constraint_1_power_limit_uw | ||
| 102 | ?  ?  ??? constraint_1_time_window_us | ||
| 103 | ?  ?  ??? device -> ../../intel-rapl:1 | ||
| 104 | ?  ?  ??? energy_uj | ||
| 105 | ?  ?  ??? max_energy_range_uj | ||
| 106 | ?  ?  ??? name | ||
| 107 | ?  ?  ??? enabled | ||
| 108 | ?  ?  ??? power | ||
| 109 | ?  ?  ?  ??? async | ||
| 110 | ?  ?  ?  [] | ||
| 111 | ?  ?  ??? subsystem -> ../../../../../../class/power_cap | ||
| 112 | ?  ?  ??? uevent | ||
| 113 | ?  ??? intel-rapl:1:1 | ||
| 114 | ?  ?  ??? constraint_0_name | ||
| 115 | ?  ?  ??? constraint_0_power_limit_uw | ||
| 116 | ?  ?  ??? constraint_0_time_window_us | ||
| 117 | ?  ?  ??? constraint_1_name | ||
| 118 | ?  ?  ??? constraint_1_power_limit_uw | ||
| 119 | ?  ?  ??? constraint_1_time_window_us | ||
| 120 | ?  ?  ??? device -> ../../intel-rapl:1 | ||
| 121 | ?  ?  ??? energy_uj | ||
| 122 | ?  ?  ??? max_energy_range_uj | ||
| 123 | ?  ?  ??? name | ||
| 124 | ?  ?  ??? enabled | ||
| 125 | ?  ?  ??? power | ||
| 126 | ?  ?  ?  ??? async | ||
| 127 | ?  ?  ?  [] | ||
| 128 | ?  ?  ??? subsystem -> ../../../../../../class/power_cap | ||
| 129 | ?  ?  ??? uevent | ||
| 130 | ?  ??? max_energy_range_uj | ||
| 131 | ?  ??? max_power_range_uw | ||
| 132 | ?  ??? name | ||
| 133 | ?  ??? enabled | ||
| 134 | ?  ??? power | ||
| 135 | ?  ?  ??? async | ||
| 136 | ?  ?  [] | ||
| 137 | ?  ??? subsystem -> ../../../../../class/power_cap | ||
| 138 | ?  ??? uevent | ||
| 139 | ??? power | ||
| 140 | ?  ??? async | ||
| 141 | ?  [] | ||
| 142 | ??? subsystem -> ../../../../class/power_cap | ||
| 143 | ??? enabled | ||
| 144 | ??? uevent | ||
| 145 | |||
| 146 | The above example illustrates a case in which the Intel RAPL technology, | ||
| 147 | available in Intel® IA-64 and IA-32 Processor Architectures, is used. There is one | ||
| 148 | control type called intel-rapl which contains two power zones, intel-rapl:0 and | ||
| 149 | intel-rapl:1, representing CPU packages. Each of these power zones contains | ||
| 150 | two subzones, intel-rapl:j:0 and intel-rapl:j:1 (j = 0, 1), representing the | ||
| 151 | "core" and the "uncore" parts of the given CPU package, respectively. All of | ||
| 152 | the zones and subzones contain energy monitoring attributes (energy_uj, | ||
| 153 | max_energy_range_uj) and constraint attributes (constraint_*) allowing controls | ||
| 154 | to be applied (the constraints in the 'package' power zones apply to the whole | ||
| 155 | CPU packages and the subzone constraints only apply to the respective parts of | ||
| 156 | the given package individually). Since Intel RAPL doesn't provide instantaneous | ||
| 157 | power value, there is no power_uw attribute. | ||
| 158 | |||
| 159 | In addition to that, each power zone contains a name attribute, allowing the | ||
| 160 | part of the system represented by that zone to be identified. | ||
| 161 | For example: | ||
| 162 | |||
| 163 | cat /sys/class/power_cap/intel-rapl/intel-rapl:0/name | ||
| 164 | package-0 | ||
| 165 | |||
| 166 | The Intel RAPL technology allows two constraints, short term and long term, | ||
| 167 | with two different time windows to be applied to each power zone. Thus for | ||
| 168 | each zone there are 2 attributes representing the constraint names, 2 power | ||
| 169 | limits and 2 attributes representing the sizes of the time windows. Such that, | ||
| 170 | constraint_j_* attributes correspond to the jth constraint (j = 0,1). | ||
| 171 | |||
| 172 | For example: | ||
| 173 | constraint_0_name | ||
| 174 | constraint_0_power_limit_uw | ||
| 175 | constraint_0_time_window_us | ||
| 176 | constraint_1_name | ||
| 177 | constraint_1_power_limit_uw | ||
| 178 | constraint_1_time_window_us | ||
| 179 | |||
| 180 | Power Zone Attributes | ||
| 181 | ================================= | ||
| 182 | Monitoring attributes | ||
| 183 | ---------------------- | ||
| 184 | |||
| 185 | energy_uj (rw): Current energy counter in micro joules. Write "0" to reset. | ||
| 186 | If the counter can not be reset, then this attribute is read only. | ||
| 187 | |||
| 188 | max_energy_range_uj (ro): Range of the above energy counter in micro-joules. | ||
| 189 | |||
| 190 | power_uw (ro): Current power in micro watts. | ||
| 191 | |||
| 192 | max_power_range_uw (ro): Range of the above power value in micro-watts. | ||
| 193 | |||
| 194 | name (ro): Name of this power zone. | ||
| 195 | |||
| 196 | It is possible that some domains have both power ranges and energy counter ranges; | ||
| 197 | however, only one is mandatory. | ||
| 198 | |||
| 199 | Constraints | ||
| 200 | ---------------- | ||
| 201 | constraint_X_power_limit_uw (rw): Power limit in micro watts, which should be | ||
| 202 | applicable for the time window specified by "constraint_X_time_window_us". | ||
| 203 | |||
| 204 | constraint_X_time_window_us (rw): Time window in micro seconds. | ||
| 205 | |||
| 206 | constraint_X_name (ro): An optional name of the constraint | ||
| 207 | |||
| 208 | constraint_X_max_power_uw(ro): Maximum allowed power in micro watts. | ||
| 209 | |||
| 210 | constraint_X_min_power_uw(ro): Minimum allowed power in micro watts. | ||
| 211 | |||
| 212 | constraint_X_max_time_window_us(ro): Maximum allowed time window in micro seconds. | ||
| 213 | |||
| 214 | constraint_X_min_time_window_us(ro): Minimum allowed time window in micro seconds. | ||
| 215 | |||
| 216 | Except power_limit_uw and time_window_us other fields are optional. | ||
| 217 | |||
| 218 | Common zone and control type attributes | ||
| 219 | ---------------------------------------- | ||
| 220 | enabled (rw): Enable/Disable controls at zone level or for all zones using | ||
| 221 | a control type. | ||
| 222 | |||
| 223 | Power Cap Client Driver Interface | ||
| 224 | ================================== | ||
| 225 | The API summary: | ||
| 226 | |||
| 227 | Call powercap_register_control_type() to register control type object. | ||
| 228 | Call powercap_register_zone() to register a power zone (under a given | ||
| 229 | control type), either as a top-level power zone or as a subzone of another | ||
| 230 | power zone registered earlier. | ||
| 231 | The number of constraints in a power zone and the corresponding callbacks have | ||
| 232 | to be defined prior to calling powercap_register_zone() to register that zone. | ||
| 233 | |||
| 234 | To Free a power zone call powercap_unregister_zone(). | ||
| 235 | To free a control type object call powercap_unregister_control_type(). | ||
| 236 | Detailed API can be generated using kernel-doc on include/linux/powercap.h. | ||
diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt index 71d8fe4e75d3..0f54333b0ff2 100644 --- a/Documentation/power/runtime_pm.txt +++ b/Documentation/power/runtime_pm.txt | |||
| @@ -145,11 +145,13 @@ The action performed by the idle callback is totally dependent on the subsystem | |||
| 145 | if the device can be suspended (i.e. if all of the conditions necessary for | 145 | if the device can be suspended (i.e. if all of the conditions necessary for |
| 146 | suspending the device are satisfied) and to queue up a suspend request for the | 146 | suspending the device are satisfied) and to queue up a suspend request for the |
| 147 | device in that case. If there is no idle callback, or if the callback returns | 147 | device in that case. If there is no idle callback, or if the callback returns |
| 148 | 0, then the PM core will attempt to carry out a runtime suspend of the device; | 148 | 0, then the PM core will attempt to carry out a runtime suspend of the device, |
| 149 | in essence, it will call pm_runtime_suspend() directly. To prevent this (for | 149 | also respecting devices configured for autosuspend. In essence this means a |
| 150 | example, if the callback routine has started a delayed suspend), the routine | 150 | call to pm_runtime_autosuspend() (do note that drivers needs to update the |
| 151 | should return a non-zero value. Negative error return codes are ignored by the | 151 | device last busy mark, pm_runtime_mark_last_busy(), to control the delay under |
| 152 | PM core. | 152 | this circumstance). To prevent this (for example, if the callback routine has |
| 153 | started a delayed suspend), the routine must return a non-zero value. Negative | ||
| 154 | error return codes are ignored by the PM core. | ||
| 153 | 155 | ||
| 154 | The helper functions provided by the PM core, described in Section 4, guarantee | 156 | The helper functions provided by the PM core, described in Section 4, guarantee |
| 155 | that the following constraints are met with respect to runtime PM callbacks for | 157 | that the following constraints are met with respect to runtime PM callbacks for |
| @@ -308,7 +310,7 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: | |||
| 308 | - execute the subsystem-level idle callback for the device; returns an | 310 | - execute the subsystem-level idle callback for the device; returns an |
| 309 | error code on failure, where -EINPROGRESS means that ->runtime_idle() is | 311 | error code on failure, where -EINPROGRESS means that ->runtime_idle() is |
| 310 | already being executed; if there is no callback or the callback returns 0 | 312 | already being executed; if there is no callback or the callback returns 0 |
| 311 | then run pm_runtime_suspend(dev) and return its result | 313 | then run pm_runtime_autosuspend(dev) and return its result |
| 312 | 314 | ||
| 313 | int pm_runtime_suspend(struct device *dev); | 315 | int pm_runtime_suspend(struct device *dev); |
| 314 | - execute the subsystem-level suspend callback for the device; returns 0 on | 316 | - execute the subsystem-level suspend callback for the device; returns 0 on |
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index f911e3656209..85c362d8ea34 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
| @@ -28,6 +28,7 @@ ALC269/270/275/276/28x/29x | |||
| 28 | alc269-dmic Enable ALC269(VA) digital mic workaround | 28 | alc269-dmic Enable ALC269(VA) digital mic workaround |
| 29 | alc271-dmic Enable ALC271X digital mic workaround | 29 | alc271-dmic Enable ALC271X digital mic workaround |
| 30 | inv-dmic Inverted internal mic workaround | 30 | inv-dmic Inverted internal mic workaround |
| 31 | headset-mic Indicates a combined headset (headphone+mic) jack | ||
| 31 | lenovo-dock Enables docking station I/O for some Lenovos | 32 | lenovo-dock Enables docking station I/O for some Lenovos |
| 32 | dell-headset-multi Headset jack, which can also be used as mic-in | 33 | dell-headset-multi Headset jack, which can also be used as mic-in |
| 33 | dell-headset-dock Headset jack (without mic-in), and also dock I/O | 34 | dell-headset-dock Headset jack (without mic-in), and also dock I/O |
diff --git a/MAINTAINERS b/MAINTAINERS index 8a0cbf3cf2c8..45cdfa3e1067 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -237,11 +237,11 @@ F: drivers/platform/x86/acer-wmi.c | |||
| 237 | 237 | ||
| 238 | ACPI | 238 | ACPI |
| 239 | M: Len Brown <lenb@kernel.org> | 239 | M: Len Brown <lenb@kernel.org> |
| 240 | M: Rafael J. Wysocki <rjw@sisk.pl> | 240 | M: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 241 | L: linux-acpi@vger.kernel.org | 241 | L: linux-acpi@vger.kernel.org |
| 242 | W: http://www.lesswatts.org/projects/acpi/ | 242 | W: https://01.org/linux-acpi |
| 243 | Q: http://patchwork.kernel.org/project/linux-acpi/list/ | 243 | Q: https://patchwork.kernel.org/project/linux-acpi/list/ |
| 244 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux | 244 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm |
| 245 | S: Supported | 245 | S: Supported |
| 246 | F: drivers/acpi/ | 246 | F: drivers/acpi/ |
| 247 | F: drivers/pnp/pnpacpi/ | 247 | F: drivers/pnp/pnpacpi/ |
| @@ -253,24 +253,38 @@ F: drivers/pci/*acpi* | |||
| 253 | F: drivers/pci/*/*acpi* | 253 | F: drivers/pci/*/*acpi* |
| 254 | F: drivers/pci/*/*/*acpi* | 254 | F: drivers/pci/*/*/*acpi* |
| 255 | 255 | ||
| 256 | ACPI COMPONENT ARCHITECTURE (ACPICA) | ||
| 257 | M: Robert Moore <robert.moore@intel.com> | ||
| 258 | M: Lv Zheng <lv.zheng@intel.com> | ||
| 259 | M: Rafael J. Wysocki <rafael.j.wysocki@intel.com> | ||
| 260 | L: linux-acpi@vger.kernel.org | ||
| 261 | L: devel@acpica.org | ||
| 262 | W: https://acpica.org/ | ||
| 263 | W: https://github.com/acpica/acpica/ | ||
| 264 | Q: https://patchwork.kernel.org/project/linux-acpi/list/ | ||
| 265 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm | ||
| 266 | S: Supported | ||
| 267 | F: drivers/acpi/acpica/ | ||
| 268 | F: include/acpi/ | ||
| 269 | |||
| 256 | ACPI FAN DRIVER | 270 | ACPI FAN DRIVER |
| 257 | M: Zhang Rui <rui.zhang@intel.com> | 271 | M: Zhang Rui <rui.zhang@intel.com> |
| 258 | L: linux-acpi@vger.kernel.org | 272 | L: linux-acpi@vger.kernel.org |
| 259 | W: http://www.lesswatts.org/projects/acpi/ | 273 | W: https://01.org/linux-acpi |
| 260 | S: Supported | 274 | S: Supported |
| 261 | F: drivers/acpi/fan.c | 275 | F: drivers/acpi/fan.c |
| 262 | 276 | ||
| 263 | ACPI THERMAL DRIVER | 277 | ACPI THERMAL DRIVER |
| 264 | M: Zhang Rui <rui.zhang@intel.com> | 278 | M: Zhang Rui <rui.zhang@intel.com> |
| 265 | L: linux-acpi@vger.kernel.org | 279 | L: linux-acpi@vger.kernel.org |
| 266 | W: http://www.lesswatts.org/projects/acpi/ | 280 | W: https://01.org/linux-acpi |
| 267 | S: Supported | 281 | S: Supported |
| 268 | F: drivers/acpi/*thermal* | 282 | F: drivers/acpi/*thermal* |
| 269 | 283 | ||
| 270 | ACPI VIDEO DRIVER | 284 | ACPI VIDEO DRIVER |
| 271 | M: Zhang Rui <rui.zhang@intel.com> | 285 | M: Zhang Rui <rui.zhang@intel.com> |
| 272 | L: linux-acpi@vger.kernel.org | 286 | L: linux-acpi@vger.kernel.org |
| 273 | W: http://www.lesswatts.org/projects/acpi/ | 287 | W: https://01.org/linux-acpi |
| 274 | S: Supported | 288 | S: Supported |
| 275 | F: drivers/acpi/video.c | 289 | F: drivers/acpi/video.c |
| 276 | 290 | ||
| @@ -1009,6 +1023,7 @@ ARM/Marvell Armada 370 and Armada XP SOC support | |||
| 1009 | M: Jason Cooper <jason@lakedaemon.net> | 1023 | M: Jason Cooper <jason@lakedaemon.net> |
| 1010 | M: Andrew Lunn <andrew@lunn.ch> | 1024 | M: Andrew Lunn <andrew@lunn.ch> |
| 1011 | M: Gregory Clement <gregory.clement@free-electrons.com> | 1025 | M: Gregory Clement <gregory.clement@free-electrons.com> |
| 1026 | M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | ||
| 1012 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 1027 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 1013 | S: Maintained | 1028 | S: Maintained |
| 1014 | F: arch/arm/mach-mvebu/ | 1029 | F: arch/arm/mach-mvebu/ |
| @@ -1016,6 +1031,7 @@ F: arch/arm/mach-mvebu/ | |||
| 1016 | ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support | 1031 | ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support |
| 1017 | M: Jason Cooper <jason@lakedaemon.net> | 1032 | M: Jason Cooper <jason@lakedaemon.net> |
| 1018 | M: Andrew Lunn <andrew@lunn.ch> | 1033 | M: Andrew Lunn <andrew@lunn.ch> |
| 1034 | M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | ||
| 1019 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 1035 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 1020 | S: Maintained | 1036 | S: Maintained |
| 1021 | F: arch/arm/mach-dove/ | 1037 | F: arch/arm/mach-dove/ |
| @@ -1148,6 +1164,13 @@ F: drivers/net/ethernet/i825xx/ether1* | |||
| 1148 | F: drivers/net/ethernet/seeq/ether3* | 1164 | F: drivers/net/ethernet/seeq/ether3* |
| 1149 | F: drivers/scsi/arm/ | 1165 | F: drivers/scsi/arm/ |
| 1150 | 1166 | ||
| 1167 | ARM/Rockchip SoC support | ||
| 1168 | M: Heiko Stuebner <heiko@sntech.de> | ||
| 1169 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
| 1170 | S: Maintained | ||
| 1171 | F: arch/arm/mach-rockchip/ | ||
| 1172 | F: drivers/*/*rockchip* | ||
| 1173 | |||
| 1151 | ARM/SHARK MACHINE SUPPORT | 1174 | ARM/SHARK MACHINE SUPPORT |
| 1152 | M: Alexander Schulz <alex@shark-linux.de> | 1175 | M: Alexander Schulz <alex@shark-linux.de> |
| 1153 | W: http://www.shark-linux.de/shark.html | 1176 | W: http://www.shark-linux.de/shark.html |
| @@ -1791,6 +1814,7 @@ F: include/net/bluetooth/ | |||
| 1791 | 1814 | ||
| 1792 | BONDING DRIVER | 1815 | BONDING DRIVER |
| 1793 | M: Jay Vosburgh <fubar@us.ibm.com> | 1816 | M: Jay Vosburgh <fubar@us.ibm.com> |
| 1817 | M: Veaceslav Falico <vfalico@redhat.com> | ||
| 1794 | M: Andy Gospodarek <andy@greyhouse.net> | 1818 | M: Andy Gospodarek <andy@greyhouse.net> |
| 1795 | L: netdev@vger.kernel.org | 1819 | L: netdev@vger.kernel.org |
| 1796 | W: http://sourceforge.net/projects/bonding/ | 1820 | W: http://sourceforge.net/projects/bonding/ |
| @@ -2300,7 +2324,7 @@ S: Maintained | |||
| 2300 | F: drivers/net/ethernet/ti/cpmac.c | 2324 | F: drivers/net/ethernet/ti/cpmac.c |
| 2301 | 2325 | ||
| 2302 | CPU FREQUENCY DRIVERS | 2326 | CPU FREQUENCY DRIVERS |
| 2303 | M: Rafael J. Wysocki <rjw@sisk.pl> | 2327 | M: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 2304 | M: Viresh Kumar <viresh.kumar@linaro.org> | 2328 | M: Viresh Kumar <viresh.kumar@linaro.org> |
| 2305 | L: cpufreq@vger.kernel.org | 2329 | L: cpufreq@vger.kernel.org |
| 2306 | L: linux-pm@vger.kernel.org | 2330 | L: linux-pm@vger.kernel.org |
| @@ -2331,7 +2355,7 @@ S: Maintained | |||
| 2331 | F: drivers/cpuidle/cpuidle-big_little.c | 2355 | F: drivers/cpuidle/cpuidle-big_little.c |
| 2332 | 2356 | ||
| 2333 | CPUIDLE DRIVERS | 2357 | CPUIDLE DRIVERS |
| 2334 | M: Rafael J. Wysocki <rjw@sisk.pl> | 2358 | M: Rafael J. Wysocki <rjw@rjwysocki.net> |
| 2335 | M: Daniel Lezcano <daniel.lezcano@linaro.org> | 2359 | M: Daniel Lezcano <daniel.lezcano@linaro.org> |
| 2336 | L: linux-pm@vger.kernel.org | 2360 | L: linux-pm@vger.kernel.org |
| 2337 | S: Maintained | 2361 | S: Maintained |
| @@ -2718,6 +2742,8 @@ T: git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git | |||
| 2718 | DMA GENERIC OFFLOAD ENGINE SUBSYSTEM | 2742 | DMA GENERIC OFFLOAD ENGINE SUBSYSTEM |
| 2719 | M: Vinod Koul <vinod.koul@intel.com> | 2743 | M: Vinod Koul <vinod.koul@intel.com> |
| 2720 | M: Dan Williams <dan.j.williams@intel.com> | 2744 | M: Dan Williams <dan.j.williams@intel.com> |
| 2745 | L: dmaengine@vger.kernel.org | ||
| 2746 | Q: https://patchwork.kernel.org/project/linux-dmaengine/list/ | ||
| 2721 | S: Supported | 2747 | S: Supported |
| 2722 | F: drivers/dma/ | 2748 | F: drivers/dma/ |
| 2723 | F: include/linux/dma* | 2749 | F: include/linux/dma* |
| @@ -2821,7 +2847,7 @@ M: Terje Bergström <tbergstrom@nvidia.com> | |||
| 2821 | L: dri-devel@lists.freedesktop.org | 2847 | L: dri-devel@lists.freedesktop.org |
| 2822 | L: linux-tegra@vger.kernel.org | 2848 | L: linux-tegra@vger.kernel.org |
| 2823 | T: git git://anongit.freedesktop.org/tegra/linux.git | 2849 | T: git git://anongit.freedesktop.org/tegra/linux.git |
| 2824 | S: Maintained | 2850 | S: Supported |
| 2825 | F: drivers/gpu/host1x/ | 2851 | F: drivers/gpu/host1x/ |
| 2826 | F: include/uapi/drm/tegra_drm.h | 2852 | F: include/uapi/drm/tegra_drm.h |
| 2827 | F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt | 2853 | F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt |
| @@ -3553,7 +3579,7 @@ F: fs/freevxfs/ | |||
| 3553 | 3579 | ||
| 3554 | FREEZER | 3580 | FREEZER |
| 3555 | M: Pavel Machek <pavel@ucw.cz> | 3581 | M: Pavel Machek <pavel@ucw.cz> |
| 3556 | M: "Rafael J. Wysocki" <rjw@sisk.pl> | 3582 | M: "Rafael J. Wysocki" <rjw@rjwysocki.net> |
| 3557 | L: linux-pm@vger.kernel.org | 3583 | L: linux-pm@vger.kernel.org |
| 3558 | S: Supported | 3584 | S: Supported |
| 3559 | F: Documentation/power/freezing-of-tasks.txt | 3585 | F: Documentation/power/freezing-of-tasks.txt |
| @@ -3624,6 +3650,12 @@ L: linux-scsi@vger.kernel.org | |||
| 3624 | S: Odd Fixes (e.g., new signatures) | 3650 | S: Odd Fixes (e.g., new signatures) |
| 3625 | F: drivers/scsi/fdomain.* | 3651 | F: drivers/scsi/fdomain.* |
| 3626 | 3652 | ||
| 3653 | GCOV BASED KERNEL PROFILING | ||
| 3654 | M: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> | ||
| 3655 | S: Maintained | ||
| 3656 | F: kernel/gcov/ | ||
| 3657 | F: Documentation/gcov.txt | ||
| 3658 | |||
| 3627 | GDT SCSI DISK ARRAY CONTROLLER DRIVER | 3659 | GDT SCSI DISK ARRAY CONTROLLER DRIVER |
| 3628 | M: Achim Leubner <achim_leubner@adaptec.com> | 3660 | M: Achim Leubner <achim_leubner@adaptec.com> |
| 3629 | L: linux-scsi@vger.kernel.org | 3661 | L: linux-scsi@vger.kernel.org |
| @@ -3889,7 +3921,7 @@ F: drivers/video/hgafb.c | |||
| 3889 | 3921 | ||
| 3890 | HIBERNATION (aka Software Suspend, aka swsusp) | 3922 | HIBERNATION (aka Software Suspend, aka swsusp) |
| 3891 | M: Pavel Machek <pavel@ucw.cz> | 3923 | M: Pavel Machek <pavel@ucw.cz> |
| 3892 | M: "Rafael J. Wysocki" <rjw@sisk.pl> | 3924 | M: "Rafael J. Wysocki" <rjw@rjwysocki.net> |
| 3893 | L: linux-pm@vger.kernel.org | 3925 | L: linux-pm@vger.kernel.org |
| 3894 | S: Supported | 3926 | S: Supported |
| 3895 | F: arch/x86/power/ | 3927 | F: arch/x86/power/ |
| @@ -4339,7 +4371,7 @@ F: drivers/video/i810/ | |||
| 4339 | INTEL MENLOW THERMAL DRIVER | 4371 | INTEL MENLOW THERMAL DRIVER |
| 4340 | M: Sujith Thomas <sujith.thomas@intel.com> | 4372 | M: Sujith Thomas <sujith.thomas@intel.com> |
| 4341 | L: platform-driver-x86@vger.kernel.org | 4373 | L: platform-driver-x86@vger.kernel.org |
| 4342 | W: http://www.lesswatts.org/projects/acpi/ | 4374 | W: https://01.org/linux-acpi |
| 4343 | S: Supported | 4375 | S: Supported |
| 4344 | F: drivers/platform/x86/intel_menlow.c | 4376 | F: drivers/platform/x86/intel_menlow.c |
| 4345 | 4377 | ||
| @@ -4351,7 +4383,10 @@ F: arch/x86/kernel/microcode_intel.c | |||
| 4351 | 4383 | ||
| 4352 | INTEL I/OAT DMA DRIVER | 4384 | INTEL I/OAT DMA DRIVER |
| 4353 | M: Dan Williams <dan.j.williams@intel.com> | 4385 | M: Dan Williams <dan.j.williams@intel.com> |
| 4354 | S: Maintained | 4386 | M: Dave Jiang <dave.jiang@intel.com> |
| 4387 | L: dmaengine@vger.kernel.org | ||
| 4388 | Q: https://patchwork.kernel.org/project/linux-dmaengine/list/ | ||
| 4389 | S: Supported | ||
| 4355 | F: drivers/dma/ioat* | 4390 | F: drivers/dma/ioat* |
| 4356 | 4391 | ||
| 4357 | INTEL IOMMU (VT-d) | 4392 | INTEL IOMMU (VT-d) |
| @@ -7816,6 +7851,13 @@ F: Documentation/sound/alsa/soc/ | |||
| 7816 | F: sound/soc/ | 7851 | F: sound/soc/ |
| 7817 | F: include/sound/soc* | 7852 | F: include/sound/soc* |
| 7818 | 7853 | ||
| 7854 | SOUND - DMAENGINE HELPERS | ||
| 7855 | M: Lars-Peter Clausen <lars@metafoo.de> | ||
| 7856 | S: Supported | ||
| 7857 | F: include/sound/dmaengine_pcm.h | ||
| 7858 | F: sound/core/pcm_dmaengine.c | ||
| 7859 | F: sound/soc/soc-generic-dmaengine-pcm.c | ||
| 7860 | |||
| 7819 | SPARC + UltraSPARC (sparc/sparc64) | 7861 | SPARC + UltraSPARC (sparc/sparc64) |
| 7820 | M: "David S. Miller" <davem@davemloft.net> | 7862 | M: "David S. Miller" <davem@davemloft.net> |
| 7821 | L: sparclinux@vger.kernel.org | 7863 | L: sparclinux@vger.kernel.org |
| @@ -8095,7 +8137,7 @@ F: drivers/sh/ | |||
| 8095 | SUSPEND TO RAM | 8137 | SUSPEND TO RAM |
| 8096 | M: Len Brown <len.brown@intel.com> | 8138 | M: Len Brown <len.brown@intel.com> |
| 8097 | M: Pavel Machek <pavel@ucw.cz> | 8139 | M: Pavel Machek <pavel@ucw.cz> |
| 8098 | M: "Rafael J. Wysocki" <rjw@sisk.pl> | 8140 | M: "Rafael J. Wysocki" <rjw@rjwysocki.net> |
| 8099 | L: linux-pm@vger.kernel.org | 8141 | L: linux-pm@vger.kernel.org |
| 8100 | S: Supported | 8142 | S: Supported |
| 8101 | F: Documentation/power/ | 8143 | F: Documentation/power/ |
| @@ -8288,14 +8330,72 @@ L: linux-media@vger.kernel.org | |||
| 8288 | S: Maintained | 8330 | S: Maintained |
| 8289 | F: drivers/media/rc/ttusbir.c | 8331 | F: drivers/media/rc/ttusbir.c |
| 8290 | 8332 | ||
| 8291 | TEGRA SUPPORT | 8333 | TEGRA ARCHITECTURE SUPPORT |
| 8292 | M: Stephen Warren <swarren@wwwdotorg.org> | 8334 | M: Stephen Warren <swarren@wwwdotorg.org> |
| 8335 | M: Thierry Reding <thierry.reding@gmail.com> | ||
| 8293 | L: linux-tegra@vger.kernel.org | 8336 | L: linux-tegra@vger.kernel.org |
| 8294 | Q: http://patchwork.ozlabs.org/project/linux-tegra/list/ | 8337 | Q: http://patchwork.ozlabs.org/project/linux-tegra/list/ |
| 8295 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git | 8338 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git |
| 8296 | S: Supported | 8339 | S: Supported |
| 8297 | N: [^a-z]tegra | 8340 | N: [^a-z]tegra |
| 8298 | 8341 | ||
| 8342 | TEGRA ASOC DRIVER | ||
| 8343 | M: Stephen Warren <swarren@wwwdotorg.org> | ||
| 8344 | S: Supported | ||
| 8345 | F: sound/soc/tegra/ | ||
| 8346 | |||
| 8347 | TEGRA CLOCK DRIVER | ||
| 8348 | M: Peter De Schrijver <pdeschrijver@nvidia.com> | ||
| 8349 | M: Prashant Gaikwad <pgaikwad@nvidia.com> | ||
| 8350 | S: Supported | ||
| 8351 | F: drivers/clk/tegra/ | ||
| 8352 | |||
| 8353 | TEGRA DMA DRIVER | ||
| 8354 | M: Laxman Dewangan <ldewangan@nvidia.com> | ||
| 8355 | S: Supported | ||
| 8356 | F: drivers/dma/tegra20-apb-dma.c | ||
| 8357 | |||
| 8358 | TEGRA GPIO DRIVER | ||
| 8359 | M: Stephen Warren <swarren@wwwdotorg.org> | ||
| 8360 | S: Supported | ||
| 8361 | F: drivers/gpio/gpio-tegra.c | ||
| 8362 | |||
| 8363 | TEGRA I2C DRIVER | ||
| 8364 | M: Laxman Dewangan <ldewangan@nvidia.com> | ||
| 8365 | S: Supported | ||
| 8366 | F: drivers/i2c/busses/i2c-tegra.c | ||
| 8367 | |||
| 8368 | TEGRA IOMMU DRIVERS | ||
| 8369 | M: Hiroshi Doyu <hdoyu@nvidia.com> | ||
| 8370 | S: Supported | ||
| 8371 | F: drivers/iommu/tegra* | ||
| 8372 | |||
| 8373 | TEGRA KBC DRIVER | ||
| 8374 | M: Rakesh Iyer <riyer@nvidia.com> | ||
| 8375 | M: Laxman Dewangan <ldewangan@nvidia.com> | ||
| 8376 | S: Supported | ||
| 8377 | F: drivers/input/keyboard/tegra-kbc.c | ||
| 8378 | |||
| 8379 | TEGRA PINCTRL DRIVER | ||
| 8380 | M: Stephen Warren <swarren@wwwdotorg.org> | ||
| 8381 | S: Supported | ||
| 8382 | F: drivers/pinctrl/pinctrl-tegra* | ||
| 8383 | |||
| 8384 | TEGRA PWM DRIVER | ||
| 8385 | M: Thierry Reding <thierry.reding@gmail.com> | ||
| 8386 | S: Supported | ||
| 8387 | F: drivers/pwm/pwm-tegra.c | ||
| 8388 | |||
| 8389 | TEGRA SERIAL DRIVER | ||
| 8390 | M: Laxman Dewangan <ldewangan@nvidia.com> | ||
| 8391 | S: Supported | ||
| 8392 | F: drivers/tty/serial/serial-tegra.c | ||
| 8393 | |||
| 8394 | TEGRA SPI DRIVER | ||
| 8395 | M: Laxman Dewangan <ldewangan@nvidia.com> | ||
| 8396 | S: Supported | ||
| 8397 | F: drivers/spi/spi-tegra* | ||
| 8398 | |||
| 8299 | TEHUTI ETHERNET DRIVER | 8399 | TEHUTI ETHERNET DRIVER |
| 8300 | M: Andy Gospodarek <andy@greyhouse.net> | 8400 | M: Andy Gospodarek <andy@greyhouse.net> |
| 8301 | L: netdev@vger.kernel.org | 8401 | L: netdev@vger.kernel.org |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 3 | 1 | VERSION = 3 |
| 2 | PATCHLEVEL = 12 | 2 | PATCHLEVEL = 12 |
| 3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
| 4 | EXTRAVERSION = -rc4 | 4 | EXTRAVERSION = -rc7 |
| 5 | NAME = One Giant Leap for Frogkind | 5 | NAME = One Giant Leap for Frogkind |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/arc/kernel/ptrace.c b/arch/arc/kernel/ptrace.c index 333238564b67..5d76706139dd 100644 --- a/arch/arc/kernel/ptrace.c +++ b/arch/arc/kernel/ptrace.c | |||
| @@ -102,7 +102,7 @@ static int genregs_set(struct task_struct *target, | |||
| 102 | REG_IGNORE_ONE(pad2); | 102 | REG_IGNORE_ONE(pad2); |
| 103 | REG_IN_CHUNK(callee, efa, cregs); /* callee_regs[r25..r13] */ | 103 | REG_IN_CHUNK(callee, efa, cregs); /* callee_regs[r25..r13] */ |
| 104 | REG_IGNORE_ONE(efa); /* efa update invalid */ | 104 | REG_IGNORE_ONE(efa); /* efa update invalid */ |
| 105 | REG_IN_ONE(stop_pc, &ptregs->ret); /* stop_pc: PC update */ | 105 | REG_IGNORE_ONE(stop_pc); /* PC updated via @ret */ |
| 106 | 106 | ||
| 107 | return ret; | 107 | return ret; |
| 108 | } | 108 | } |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index a37a50f575a2..db50b626be98 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -296,10 +296,15 @@ archprepare: | |||
| 296 | # Convert bzImage to zImage | 296 | # Convert bzImage to zImage |
| 297 | bzImage: zImage | 297 | bzImage: zImage |
| 298 | 298 | ||
| 299 | zImage Image xipImage bootpImage uImage: vmlinux | 299 | BOOT_TARGETS = zImage Image xipImage bootpImage uImage |
| 300 | INSTALL_TARGETS = zinstall uinstall install | ||
| 301 | |||
| 302 | PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS) | ||
| 303 | |||
| 304 | $(BOOT_TARGETS): vmlinux | ||
| 300 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ | 305 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ |
| 301 | 306 | ||
| 302 | zinstall uinstall install: vmlinux | 307 | $(INSTALL_TARGETS): |
| 303 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ | 308 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ |
| 304 | 309 | ||
| 305 | %.dtb: | scripts | 310 | %.dtb: | scripts |
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index 84aa2caf07ed..ec2f8065f955 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile | |||
| @@ -95,24 +95,24 @@ initrd: | |||
| 95 | @test "$(INITRD)" != "" || \ | 95 | @test "$(INITRD)" != "" || \ |
| 96 | (echo You must specify INITRD; exit -1) | 96 | (echo You must specify INITRD; exit -1) |
| 97 | 97 | ||
| 98 | install: $(obj)/Image | 98 | install: |
| 99 | $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ | 99 | $(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \ |
| 100 | $(obj)/Image System.map "$(INSTALL_PATH)" | 100 | $(obj)/Image System.map "$(INSTALL_PATH)" |
| 101 | 101 | ||
| 102 | zinstall: $(obj)/zImage | 102 | zinstall: |
| 103 | $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ | 103 | $(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \ |
| 104 | $(obj)/zImage System.map "$(INSTALL_PATH)" | 104 | $(obj)/zImage System.map "$(INSTALL_PATH)" |
| 105 | 105 | ||
| 106 | uinstall: $(obj)/uImage | 106 | uinstall: |
| 107 | $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ | 107 | $(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \ |
| 108 | $(obj)/uImage System.map "$(INSTALL_PATH)" | 108 | $(obj)/uImage System.map "$(INSTALL_PATH)" |
| 109 | 109 | ||
| 110 | zi: | 110 | zi: |
| 111 | $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ | 111 | $(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \ |
| 112 | $(obj)/zImage System.map "$(INSTALL_PATH)" | 112 | $(obj)/zImage System.map "$(INSTALL_PATH)" |
| 113 | 113 | ||
| 114 | i: | 114 | i: |
| 115 | $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ | 115 | $(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \ |
| 116 | $(obj)/Image System.map "$(INSTALL_PATH)" | 116 | $(obj)/Image System.map "$(INSTALL_PATH)" |
| 117 | 117 | ||
| 118 | subdir- := bootp compressed dts | 118 | subdir- := bootp compressed dts |
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 7d7cc777ff7b..bbac42a78ce5 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
| @@ -96,6 +96,11 @@ | |||
| 96 | <1 14 0xf08>, | 96 | <1 14 0xf08>, |
| 97 | <1 11 0xf08>, | 97 | <1 11 0xf08>, |
| 98 | <1 10 0xf08>; | 98 | <1 10 0xf08>; |
| 99 | /* Unfortunately we need this since some versions of U-Boot | ||
| 100 | * on Exynos don't set the CNTFRQ register, so we need the | ||
| 101 | * value from DT. | ||
| 102 | */ | ||
| 103 | clock-frequency = <24000000>; | ||
| 99 | }; | 104 | }; |
| 100 | 105 | ||
| 101 | mct@101C0000 { | 106 | mct@101C0000 { |
diff --git a/arch/arm/boot/dts/integratorcp.dts b/arch/arm/boot/dts/integratorcp.dts index ff1aea0ee043..72693a69f830 100644 --- a/arch/arm/boot/dts/integratorcp.dts +++ b/arch/arm/boot/dts/integratorcp.dts | |||
| @@ -9,11 +9,6 @@ | |||
| 9 | model = "ARM Integrator/CP"; | 9 | model = "ARM Integrator/CP"; |
| 10 | compatible = "arm,integrator-cp"; | 10 | compatible = "arm,integrator-cp"; |
| 11 | 11 | ||
| 12 | aliases { | ||
| 13 | arm,timer-primary = &timer2; | ||
| 14 | arm,timer-secondary = &timer1; | ||
| 15 | }; | ||
| 16 | |||
| 17 | chosen { | 12 | chosen { |
| 18 | bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk"; | 13 | bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk"; |
| 19 | }; | 14 | }; |
| @@ -24,14 +19,18 @@ | |||
| 24 | }; | 19 | }; |
| 25 | 20 | ||
| 26 | timer0: timer@13000000 { | 21 | timer0: timer@13000000 { |
| 22 | /* TIMER0 runs @ 25MHz */ | ||
| 27 | compatible = "arm,integrator-cp-timer"; | 23 | compatible = "arm,integrator-cp-timer"; |
| 24 | status = "disabled"; | ||
| 28 | }; | 25 | }; |
| 29 | 26 | ||
| 30 | timer1: timer@13000100 { | 27 | timer1: timer@13000100 { |
| 28 | /* TIMER1 runs @ 1MHz */ | ||
| 31 | compatible = "arm,integrator-cp-timer"; | 29 | compatible = "arm,integrator-cp-timer"; |
| 32 | }; | 30 | }; |
| 33 | 31 | ||
| 34 | timer2: timer@13000200 { | 32 | timer2: timer@13000200 { |
| 33 | /* TIMER2 runs @ 1MHz */ | ||
| 35 | compatible = "arm,integrator-cp-timer"; | 34 | compatible = "arm,integrator-cp-timer"; |
| 36 | }; | 35 | }; |
| 37 | 36 | ||
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts index 0c514dc8460c..2816bf612672 100644 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | / { | 12 | / { |
| 13 | model = "TI OMAP3 BeagleBoard xM"; | 13 | model = "TI OMAP3 BeagleBoard xM"; |
| 14 | compatible = "ti,omap3-beagle-xm", "ti,omap3-beagle", "ti,omap3"; | 14 | compatible = "ti,omap3-beagle-xm", "ti,omap36xx", "ti,omap3"; |
| 15 | 15 | ||
| 16 | cpus { | 16 | cpus { |
| 17 | cpu@0 { | 17 | cpu@0 { |
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 7d95cda1fae4..b41bd57f4328 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi | |||
| @@ -108,7 +108,7 @@ | |||
| 108 | #address-cells = <1>; | 108 | #address-cells = <1>; |
| 109 | #size-cells = <0>; | 109 | #size-cells = <0>; |
| 110 | pinctrl-single,register-width = <16>; | 110 | pinctrl-single,register-width = <16>; |
| 111 | pinctrl-single,function-mask = <0x7f1f>; | 111 | pinctrl-single,function-mask = <0xff1f>; |
| 112 | }; | 112 | }; |
| 113 | 113 | ||
| 114 | omap3_pmx_wkup: pinmux@0x48002a00 { | 114 | omap3_pmx_wkup: pinmux@0x48002a00 { |
| @@ -117,7 +117,7 @@ | |||
| 117 | #address-cells = <1>; | 117 | #address-cells = <1>; |
| 118 | #size-cells = <0>; | 118 | #size-cells = <0>; |
| 119 | pinctrl-single,register-width = <16>; | 119 | pinctrl-single,register-width = <16>; |
| 120 | pinctrl-single,function-mask = <0x7f1f>; | 120 | pinctrl-single,function-mask = <0xff1f>; |
| 121 | }; | 121 | }; |
| 122 | 122 | ||
| 123 | gpio1: gpio@48310000 { | 123 | gpio1: gpio@48310000 { |
diff --git a/arch/arm/boot/install.sh b/arch/arm/boot/install.sh index 06ea7d42ce8e..2a45092a40e3 100644 --- a/arch/arm/boot/install.sh +++ b/arch/arm/boot/install.sh | |||
| @@ -20,6 +20,20 @@ | |||
| 20 | # $4 - default install path (blank if root directory) | 20 | # $4 - default install path (blank if root directory) |
| 21 | # | 21 | # |
| 22 | 22 | ||
| 23 | verify () { | ||
| 24 | if [ ! -f "$1" ]; then | ||
| 25 | echo "" 1>&2 | ||
| 26 | echo " *** Missing file: $1" 1>&2 | ||
| 27 | echo ' *** You need to run "make" before "make install".' 1>&2 | ||
| 28 | echo "" 1>&2 | ||
| 29 | exit 1 | ||
| 30 | fi | ||
| 31 | } | ||
| 32 | |||
| 33 | # Make sure the files actually exist | ||
| 34 | verify "$2" | ||
| 35 | verify "$3" | ||
| 36 | |||
| 23 | # User may have a custom install script | 37 | # User may have a custom install script |
| 24 | if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi | 38 | if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi |
| 25 | if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi | 39 | if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi |
diff --git a/arch/arm/common/mcpm_entry.c b/arch/arm/common/mcpm_entry.c index 370236dd1a03..990250965f2c 100644 --- a/arch/arm/common/mcpm_entry.c +++ b/arch/arm/common/mcpm_entry.c | |||
| @@ -51,7 +51,8 @@ void mcpm_cpu_power_down(void) | |||
| 51 | { | 51 | { |
| 52 | phys_reset_t phys_reset; | 52 | phys_reset_t phys_reset; |
| 53 | 53 | ||
| 54 | BUG_ON(!platform_ops); | 54 | if (WARN_ON_ONCE(!platform_ops || !platform_ops->power_down)) |
| 55 | return; | ||
| 55 | BUG_ON(!irqs_disabled()); | 56 | BUG_ON(!irqs_disabled()); |
| 56 | 57 | ||
| 57 | /* | 58 | /* |
| @@ -93,7 +94,8 @@ void mcpm_cpu_suspend(u64 expected_residency) | |||
| 93 | { | 94 | { |
| 94 | phys_reset_t phys_reset; | 95 | phys_reset_t phys_reset; |
| 95 | 96 | ||
| 96 | BUG_ON(!platform_ops); | 97 | if (WARN_ON_ONCE(!platform_ops || !platform_ops->suspend)) |
| 98 | return; | ||
| 97 | BUG_ON(!irqs_disabled()); | 99 | BUG_ON(!irqs_disabled()); |
| 98 | 100 | ||
| 99 | /* Very similar to mcpm_cpu_power_down() */ | 101 | /* Very similar to mcpm_cpu_power_down() */ |
diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c index d56c932580eb..025f6ce38596 100644 --- a/arch/arm/common/sharpsl_param.c +++ b/arch/arm/common/sharpsl_param.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 17 | #include <asm/mach/sharpsl_param.h> | 17 | #include <asm/mach/sharpsl_param.h> |
| 18 | #include <asm/memory.h> | ||
| 18 | 19 | ||
| 19 | /* | 20 | /* |
| 20 | * Certain hardware parameters determined at the time of device manufacture, | 21 | * Certain hardware parameters determined at the time of device manufacture, |
| @@ -25,8 +26,10 @@ | |||
| 25 | */ | 26 | */ |
| 26 | #ifdef CONFIG_ARCH_SA1100 | 27 | #ifdef CONFIG_ARCH_SA1100 |
| 27 | #define PARAM_BASE 0xe8ffc000 | 28 | #define PARAM_BASE 0xe8ffc000 |
| 29 | #define param_start(x) (void *)(x) | ||
| 28 | #else | 30 | #else |
| 29 | #define PARAM_BASE 0xa0000a00 | 31 | #define PARAM_BASE 0xa0000a00 |
| 32 | #define param_start(x) __va(x) | ||
| 30 | #endif | 33 | #endif |
| 31 | #define MAGIC_CHG(a,b,c,d) ( ( d << 24 ) | ( c << 16 ) | ( b << 8 ) | a ) | 34 | #define MAGIC_CHG(a,b,c,d) ( ( d << 24 ) | ( c << 16 ) | ( b << 8 ) | a ) |
| 32 | 35 | ||
| @@ -41,7 +44,7 @@ EXPORT_SYMBOL(sharpsl_param); | |||
| 41 | 44 | ||
| 42 | void sharpsl_save_param(void) | 45 | void sharpsl_save_param(void) |
| 43 | { | 46 | { |
| 44 | memcpy(&sharpsl_param, (void *)PARAM_BASE, sizeof(struct sharpsl_param_info)); | 47 | memcpy(&sharpsl_param, param_start(PARAM_BASE), sizeof(struct sharpsl_param_info)); |
| 45 | 48 | ||
| 46 | if (sharpsl_param.comadj_keyword != COMADJ_MAGIC) | 49 | if (sharpsl_param.comadj_keyword != COMADJ_MAGIC) |
| 47 | sharpsl_param.comadj=-1; | 50 | sharpsl_param.comadj=-1; |
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild index d3db39860b9c..59ceae8f3c95 100644 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild | |||
| @@ -31,5 +31,4 @@ generic-y += termbits.h | |||
| 31 | generic-y += termios.h | 31 | generic-y += termios.h |
| 32 | generic-y += timex.h | 32 | generic-y += timex.h |
| 33 | generic-y += trace_clock.h | 33 | generic-y += trace_clock.h |
| 34 | generic-y += types.h | ||
| 35 | generic-y += unaligned.h | 34 | generic-y += unaligned.h |
diff --git a/arch/arm/include/asm/jump_label.h b/arch/arm/include/asm/jump_label.h index bfc198c75913..863c892b4aaa 100644 --- a/arch/arm/include/asm/jump_label.h +++ b/arch/arm/include/asm/jump_label.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | static __always_inline bool arch_static_branch(struct static_key *key) | 17 | static __always_inline bool arch_static_branch(struct static_key *key) |
| 18 | { | 18 | { |
| 19 | asm goto("1:\n\t" | 19 | asm_volatile_goto("1:\n\t" |
| 20 | JUMP_LABEL_NOP "\n\t" | 20 | JUMP_LABEL_NOP "\n\t" |
| 21 | ".pushsection __jump_table, \"aw\"\n\t" | 21 | ".pushsection __jump_table, \"aw\"\n\t" |
| 22 | ".word 1b, %l[l_yes], %c0\n\t" | 22 | ".word 1b, %l[l_yes], %c0\n\t" |
diff --git a/arch/arm/include/asm/mcpm.h b/arch/arm/include/asm/mcpm.h index 0f7b7620e9a5..fc82a88f5b69 100644 --- a/arch/arm/include/asm/mcpm.h +++ b/arch/arm/include/asm/mcpm.h | |||
| @@ -76,8 +76,11 @@ int mcpm_cpu_power_up(unsigned int cpu, unsigned int cluster); | |||
| 76 | * | 76 | * |
| 77 | * This must be called with interrupts disabled. | 77 | * This must be called with interrupts disabled. |
| 78 | * | 78 | * |
| 79 | * This does not return. Re-entry in the kernel is expected via | 79 | * On success this does not return. Re-entry in the kernel is expected |
| 80 | * mcpm_entry_point. | 80 | * via mcpm_entry_point. |
| 81 | * | ||
| 82 | * This will return if mcpm_platform_register() has not been called | ||
| 83 | * previously in which case the caller should take appropriate action. | ||
| 81 | */ | 84 | */ |
| 82 | void mcpm_cpu_power_down(void); | 85 | void mcpm_cpu_power_down(void); |
| 83 | 86 | ||
| @@ -98,8 +101,11 @@ void mcpm_cpu_power_down(void); | |||
| 98 | * | 101 | * |
| 99 | * This must be called with interrupts disabled. | 102 | * This must be called with interrupts disabled. |
| 100 | * | 103 | * |
| 101 | * This does not return. Re-entry in the kernel is expected via | 104 | * On success this does not return. Re-entry in the kernel is expected |
| 102 | * mcpm_entry_point. | 105 | * via mcpm_entry_point. |
| 106 | * | ||
| 107 | * This will return if mcpm_platform_register() has not been called | ||
| 108 | * previously in which case the caller should take appropriate action. | ||
| 103 | */ | 109 | */ |
| 104 | void mcpm_cpu_suspend(u64 expected_residency); | 110 | void mcpm_cpu_suspend(u64 expected_residency); |
| 105 | 111 | ||
diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h index f1d96d4e8092..73ddd7239b33 100644 --- a/arch/arm/include/asm/syscall.h +++ b/arch/arm/include/asm/syscall.h | |||
| @@ -57,6 +57,9 @@ static inline void syscall_get_arguments(struct task_struct *task, | |||
| 57 | unsigned int i, unsigned int n, | 57 | unsigned int i, unsigned int n, |
| 58 | unsigned long *args) | 58 | unsigned long *args) |
| 59 | { | 59 | { |
| 60 | if (n == 0) | ||
| 61 | return; | ||
| 62 | |||
| 60 | if (i + n > SYSCALL_MAX_ARGS) { | 63 | if (i + n > SYSCALL_MAX_ARGS) { |
| 61 | unsigned long *args_bad = args + SYSCALL_MAX_ARGS - i; | 64 | unsigned long *args_bad = args + SYSCALL_MAX_ARGS - i; |
| 62 | unsigned int n_bad = n + i - SYSCALL_MAX_ARGS; | 65 | unsigned int n_bad = n + i - SYSCALL_MAX_ARGS; |
| @@ -81,6 +84,9 @@ static inline void syscall_set_arguments(struct task_struct *task, | |||
| 81 | unsigned int i, unsigned int n, | 84 | unsigned int i, unsigned int n, |
| 82 | const unsigned long *args) | 85 | const unsigned long *args) |
| 83 | { | 86 | { |
| 87 | if (n == 0) | ||
| 88 | return; | ||
| 89 | |||
| 84 | if (i + n > SYSCALL_MAX_ARGS) { | 90 | if (i + n > SYSCALL_MAX_ARGS) { |
| 85 | pr_warning("%s called with max args %d, handling only %d\n", | 91 | pr_warning("%s called with max args %d, handling only %d\n", |
| 86 | __func__, i + n, SYSCALL_MAX_ARGS); | 92 | __func__, i + n, SYSCALL_MAX_ARGS); |
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 2c7cc1e03473..476de57dcef2 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
| @@ -487,7 +487,26 @@ __fixup_smp: | |||
| 487 | mrc p15, 0, r0, c0, c0, 5 @ read MPIDR | 487 | mrc p15, 0, r0, c0, c0, 5 @ read MPIDR |
| 488 | and r0, r0, #0xc0000000 @ multiprocessing extensions and | 488 | and r0, r0, #0xc0000000 @ multiprocessing extensions and |
| 489 | teq r0, #0x80000000 @ not part of a uniprocessor system? | 489 | teq r0, #0x80000000 @ not part of a uniprocessor system? |
| 490 | moveq pc, lr @ yes, assume SMP | 490 | bne __fixup_smp_on_up @ no, assume UP |
| 491 | |||
| 492 | @ Core indicates it is SMP. Check for Aegis SOC where a single | ||
| 493 | @ Cortex-A9 CPU is present but SMP operations fault. | ||
| 494 | mov r4, #0x41000000 | ||
| 495 | orr r4, r4, #0x0000c000 | ||
| 496 | orr r4, r4, #0x00000090 | ||
| 497 | teq r3, r4 @ Check for ARM Cortex-A9 | ||
| 498 | movne pc, lr @ Not ARM Cortex-A9, | ||
| 499 | |||
| 500 | @ If a future SoC *does* use 0x0 as the PERIPH_BASE, then the | ||
| 501 | @ below address check will need to be #ifdef'd or equivalent | ||
| 502 | @ for the Aegis platform. | ||
| 503 | mrc p15, 4, r0, c15, c0 @ get SCU base address | ||
| 504 | teq r0, #0x0 @ '0' on actual UP A9 hardware | ||
| 505 | beq __fixup_smp_on_up @ So its an A9 UP | ||
| 506 | ldr r0, [r0, #4] @ read SCU Config | ||
| 507 | and r0, r0, #0x3 @ number of CPUs | ||
| 508 | teq r0, #0x0 @ is 1? | ||
| 509 | movne pc, lr | ||
| 491 | 510 | ||
| 492 | __fixup_smp_on_up: | 511 | __fixup_smp_on_up: |
| 493 | adr r0, 1f | 512 | adr r0, 1f |
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 3b0a9538093c..c1b737097c95 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile | |||
| @@ -98,7 +98,6 @@ obj-y += leds.o | |||
| 98 | # Power Management | 98 | # Power Management |
| 99 | obj-$(CONFIG_PM) += pm.o | 99 | obj-$(CONFIG_PM) += pm.o |
| 100 | obj-$(CONFIG_AT91_SLOW_CLOCK) += pm_slowclock.o | 100 | obj-$(CONFIG_AT91_SLOW_CLOCK) += pm_slowclock.o |
| 101 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o | ||
| 102 | 101 | ||
| 103 | ifeq ($(CONFIG_PM_DEBUG),y) | 102 | ifeq ($(CONFIG_PM_DEBUG),y) |
| 104 | CFLAGS_pm.o += -DDEBUG | 103 | CFLAGS_pm.o += -DDEBUG |
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 4aad93d54d6f..25805f2f6010 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include "generic.h" | 27 | #include "generic.h" |
| 28 | #include "clock.h" | 28 | #include "clock.h" |
| 29 | #include "sam9_smc.h" | 29 | #include "sam9_smc.h" |
| 30 | #include "pm.h" | ||
| 30 | 31 | ||
| 31 | /* -------------------------------------------------------------------- | 32 | /* -------------------------------------------------------------------- |
| 32 | * Clocks | 33 | * Clocks |
| @@ -327,6 +328,7 @@ static void __init at91rm9200_ioremap_registers(void) | |||
| 327 | { | 328 | { |
| 328 | at91rm9200_ioremap_st(AT91RM9200_BASE_ST); | 329 | at91rm9200_ioremap_st(AT91RM9200_BASE_ST); |
| 329 | at91_ioremap_ramc(0, AT91RM9200_BASE_MC, 256); | 330 | at91_ioremap_ramc(0, AT91RM9200_BASE_MC, 256); |
| 331 | at91_pm_set_standby(at91rm9200_standby); | ||
| 330 | } | 332 | } |
| 331 | 333 | ||
| 332 | static void __init at91rm9200_initialize(void) | 334 | static void __init at91rm9200_initialize(void) |
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index 5de6074b4f4f..f8629a3fa245 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include "generic.h" | 28 | #include "generic.h" |
| 29 | #include "clock.h" | 29 | #include "clock.h" |
| 30 | #include "sam9_smc.h" | 30 | #include "sam9_smc.h" |
| 31 | #include "pm.h" | ||
| 31 | 32 | ||
| 32 | /* -------------------------------------------------------------------- | 33 | /* -------------------------------------------------------------------- |
| 33 | * Clocks | 34 | * Clocks |
| @@ -342,6 +343,7 @@ static void __init at91sam9260_ioremap_registers(void) | |||
| 342 | at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT); | 343 | at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT); |
| 343 | at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC); | 344 | at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC); |
| 344 | at91_ioremap_matrix(AT91SAM9260_BASE_MATRIX); | 345 | at91_ioremap_matrix(AT91SAM9260_BASE_MATRIX); |
| 346 | at91_pm_set_standby(at91sam9_sdram_standby); | ||
| 345 | } | 347 | } |
| 346 | 348 | ||
| 347 | static void __init at91sam9260_initialize(void) | 349 | static void __init at91sam9260_initialize(void) |
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index 0e0793241ab7..1f3867a17a28 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include "generic.h" | 27 | #include "generic.h" |
| 28 | #include "clock.h" | 28 | #include "clock.h" |
| 29 | #include "sam9_smc.h" | 29 | #include "sam9_smc.h" |
| 30 | #include "pm.h" | ||
| 30 | 31 | ||
| 31 | /* -------------------------------------------------------------------- | 32 | /* -------------------------------------------------------------------- |
| 32 | * Clocks | 33 | * Clocks |
| @@ -284,6 +285,7 @@ static void __init at91sam9261_ioremap_registers(void) | |||
| 284 | at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT); | 285 | at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT); |
| 285 | at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC); | 286 | at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC); |
| 286 | at91_ioremap_matrix(AT91SAM9261_BASE_MATRIX); | 287 | at91_ioremap_matrix(AT91SAM9261_BASE_MATRIX); |
| 288 | at91_pm_set_standby(at91sam9_sdram_standby); | ||
| 287 | } | 289 | } |
| 288 | 290 | ||
| 289 | static void __init at91sam9261_initialize(void) | 291 | static void __init at91sam9261_initialize(void) |
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index 6ce7d1850893..90d455d294a1 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include "generic.h" | 26 | #include "generic.h" |
| 27 | #include "clock.h" | 27 | #include "clock.h" |
| 28 | #include "sam9_smc.h" | 28 | #include "sam9_smc.h" |
| 29 | #include "pm.h" | ||
| 29 | 30 | ||
| 30 | /* -------------------------------------------------------------------- | 31 | /* -------------------------------------------------------------------- |
| 31 | * Clocks | 32 | * Clocks |
| @@ -321,6 +322,7 @@ static void __init at91sam9263_ioremap_registers(void) | |||
| 321 | at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0); | 322 | at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0); |
| 322 | at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1); | 323 | at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1); |
| 323 | at91_ioremap_matrix(AT91SAM9263_BASE_MATRIX); | 324 | at91_ioremap_matrix(AT91SAM9263_BASE_MATRIX); |
| 325 | at91_pm_set_standby(at91sam9_sdram_standby); | ||
| 324 | } | 326 | } |
| 325 | 327 | ||
| 326 | static void __init at91sam9263_initialize(void) | 328 | static void __init at91sam9263_initialize(void) |
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index 474ee04d24b9..e9bf0b8f40eb 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include "generic.h" | 26 | #include "generic.h" |
| 27 | #include "clock.h" | 27 | #include "clock.h" |
| 28 | #include "sam9_smc.h" | 28 | #include "sam9_smc.h" |
| 29 | #include "pm.h" | ||
| 29 | 30 | ||
| 30 | /* -------------------------------------------------------------------- | 31 | /* -------------------------------------------------------------------- |
| 31 | * Clocks | 32 | * Clocks |
| @@ -370,6 +371,7 @@ static void __init at91sam9g45_ioremap_registers(void) | |||
| 370 | at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT); | 371 | at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT); |
| 371 | at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC); | 372 | at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC); |
| 372 | at91_ioremap_matrix(AT91SAM9G45_BASE_MATRIX); | 373 | at91_ioremap_matrix(AT91SAM9G45_BASE_MATRIX); |
| 374 | at91_pm_set_standby(at91_ddr_standby); | ||
| 373 | } | 375 | } |
| 374 | 376 | ||
| 375 | static void __init at91sam9g45_initialize(void) | 377 | static void __init at91sam9g45_initialize(void) |
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c index d4ec0d9a9872..88995af09c04 100644 --- a/arch/arm/mach-at91/at91sam9rl.c +++ b/arch/arm/mach-at91/at91sam9rl.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include "generic.h" | 27 | #include "generic.h" |
| 28 | #include "clock.h" | 28 | #include "clock.h" |
| 29 | #include "sam9_smc.h" | 29 | #include "sam9_smc.h" |
| 30 | #include "pm.h" | ||
| 30 | 31 | ||
| 31 | /* -------------------------------------------------------------------- | 32 | /* -------------------------------------------------------------------- |
| 32 | * Clocks | 33 | * Clocks |
| @@ -287,6 +288,7 @@ static void __init at91sam9rl_ioremap_registers(void) | |||
| 287 | at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT); | 288 | at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT); |
| 288 | at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC); | 289 | at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC); |
| 289 | at91_ioremap_matrix(AT91SAM9RL_BASE_MATRIX); | 290 | at91_ioremap_matrix(AT91SAM9RL_BASE_MATRIX); |
| 291 | at91_pm_set_standby(at91sam9_sdram_standby); | ||
| 290 | } | 292 | } |
| 291 | 293 | ||
| 292 | static void __init at91sam9rl_initialize(void) | 294 | static void __init at91sam9rl_initialize(void) |
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 15afb5d9271f..9986542e8060 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c | |||
| @@ -39,6 +39,8 @@ | |||
| 39 | #include "at91_rstc.h" | 39 | #include "at91_rstc.h" |
| 40 | #include "at91_shdwc.h" | 40 | #include "at91_shdwc.h" |
| 41 | 41 | ||
| 42 | static void (*at91_pm_standby)(void); | ||
| 43 | |||
| 42 | static void __init show_reset_status(void) | 44 | static void __init show_reset_status(void) |
| 43 | { | 45 | { |
| 44 | static char reset[] __initdata = "reset"; | 46 | static char reset[] __initdata = "reset"; |
| @@ -266,14 +268,8 @@ static int at91_pm_enter(suspend_state_t state) | |||
| 266 | * For ARM 926 based chips, this requirement is weaker | 268 | * For ARM 926 based chips, this requirement is weaker |
| 267 | * as at91sam9 can access a RAM in self-refresh mode. | 269 | * as at91sam9 can access a RAM in self-refresh mode. |
| 268 | */ | 270 | */ |
| 269 | if (cpu_is_at91rm9200()) | 271 | if (at91_pm_standby) |
| 270 | at91rm9200_standby(); | 272 | at91_pm_standby(); |
| 271 | else if (cpu_is_at91sam9g45()) | ||
| 272 | at91sam9g45_standby(); | ||
| 273 | else if (cpu_is_at91sam9263()) | ||
| 274 | at91sam9263_standby(); | ||
| 275 | else | ||
| 276 | at91sam9_standby(); | ||
| 277 | break; | 273 | break; |
| 278 | 274 | ||
| 279 | case PM_SUSPEND_ON: | 275 | case PM_SUSPEND_ON: |
| @@ -314,6 +310,18 @@ static const struct platform_suspend_ops at91_pm_ops = { | |||
| 314 | .end = at91_pm_end, | 310 | .end = at91_pm_end, |
| 315 | }; | 311 | }; |
| 316 | 312 | ||
| 313 | static struct platform_device at91_cpuidle_device = { | ||
| 314 | .name = "cpuidle-at91", | ||
| 315 | }; | ||
| 316 | |||
| 317 | void at91_pm_set_standby(void (*at91_standby)(void)) | ||
| 318 | { | ||
| 319 | if (at91_standby) { | ||
| 320 | at91_cpuidle_device.dev.platform_data = at91_standby; | ||
| 321 | at91_pm_standby = at91_standby; | ||
| 322 | } | ||
| 323 | } | ||
| 324 | |||
| 317 | static int __init at91_pm_init(void) | 325 | static int __init at91_pm_init(void) |
| 318 | { | 326 | { |
| 319 | #ifdef CONFIG_AT91_SLOW_CLOCK | 327 | #ifdef CONFIG_AT91_SLOW_CLOCK |
| @@ -325,6 +333,9 @@ static int __init at91_pm_init(void) | |||
| 325 | /* AT91RM9200 SDRAM low-power mode cannot be used with self-refresh. */ | 333 | /* AT91RM9200 SDRAM low-power mode cannot be used with self-refresh. */ |
| 326 | if (cpu_is_at91rm9200()) | 334 | if (cpu_is_at91rm9200()) |
| 327 | at91_ramc_write(0, AT91RM9200_SDRAMC_LPR, 0); | 335 | at91_ramc_write(0, AT91RM9200_SDRAMC_LPR, 0); |
| 336 | |||
| 337 | if (at91_cpuidle_device.dev.platform_data) | ||
| 338 | platform_device_register(&at91_cpuidle_device); | ||
| 328 | 339 | ||
| 329 | suspend_set_ops(&at91_pm_ops); | 340 | suspend_set_ops(&at91_pm_ops); |
| 330 | 341 | ||
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index 2f5908f0b8c5..3ed190ce062b 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h | |||
| @@ -11,9 +11,13 @@ | |||
| 11 | #ifndef __ARCH_ARM_MACH_AT91_PM | 11 | #ifndef __ARCH_ARM_MACH_AT91_PM |
| 12 | #define __ARCH_ARM_MACH_AT91_PM | 12 | #define __ARCH_ARM_MACH_AT91_PM |
| 13 | 13 | ||
| 14 | #include <asm/proc-fns.h> | ||
| 15 | |||
| 14 | #include <mach/at91_ramc.h> | 16 | #include <mach/at91_ramc.h> |
| 15 | #include <mach/at91rm9200_sdramc.h> | 17 | #include <mach/at91rm9200_sdramc.h> |
| 16 | 18 | ||
| 19 | extern void at91_pm_set_standby(void (*at91_standby)(void)); | ||
| 20 | |||
| 17 | /* | 21 | /* |
| 18 | * The AT91RM9200 goes into self-refresh mode with this command, and will | 22 | * The AT91RM9200 goes into self-refresh mode with this command, and will |
| 19 | * terminate self-refresh automatically on the next SDRAM access. | 23 | * terminate self-refresh automatically on the next SDRAM access. |
| @@ -45,16 +49,18 @@ static inline void at91rm9200_standby(void) | |||
| 45 | /* We manage both DDRAM/SDRAM controllers, we need more than one value to | 49 | /* We manage both DDRAM/SDRAM controllers, we need more than one value to |
| 46 | * remember. | 50 | * remember. |
| 47 | */ | 51 | */ |
| 48 | static inline void at91sam9g45_standby(void) | 52 | static inline void at91_ddr_standby(void) |
| 49 | { | 53 | { |
| 50 | /* Those two values allow us to delay self-refresh activation | 54 | /* Those two values allow us to delay self-refresh activation |
| 51 | * to the maximum. */ | 55 | * to the maximum. */ |
| 52 | u32 lpr0, lpr1; | 56 | u32 lpr0, lpr1 = 0; |
| 53 | u32 saved_lpr0, saved_lpr1; | 57 | u32 saved_lpr0, saved_lpr1 = 0; |
| 54 | 58 | ||
| 55 | saved_lpr1 = at91_ramc_read(1, AT91_DDRSDRC_LPR); | 59 | if (at91_ramc_base[1]) { |
| 56 | lpr1 = saved_lpr1 & ~AT91_DDRSDRC_LPCB; | 60 | saved_lpr1 = at91_ramc_read(1, AT91_DDRSDRC_LPR); |
| 57 | lpr1 |= AT91_DDRSDRC_LPCB_SELF_REFRESH; | 61 | lpr1 = saved_lpr1 & ~AT91_DDRSDRC_LPCB; |
| 62 | lpr1 |= AT91_DDRSDRC_LPCB_SELF_REFRESH; | ||
| 63 | } | ||
| 58 | 64 | ||
| 59 | saved_lpr0 = at91_ramc_read(0, AT91_DDRSDRC_LPR); | 65 | saved_lpr0 = at91_ramc_read(0, AT91_DDRSDRC_LPR); |
| 60 | lpr0 = saved_lpr0 & ~AT91_DDRSDRC_LPCB; | 66 | lpr0 = saved_lpr0 & ~AT91_DDRSDRC_LPCB; |
| @@ -62,25 +68,29 @@ static inline void at91sam9g45_standby(void) | |||
| 62 | 68 | ||
| 63 | /* self-refresh mode now */ | 69 | /* self-refresh mode now */ |
| 64 | at91_ramc_write(0, AT91_DDRSDRC_LPR, lpr0); | 70 | at91_ramc_write(0, AT91_DDRSDRC_LPR, lpr0); |
| 65 | at91_ramc_write(1, AT91_DDRSDRC_LPR, lpr1); | 71 | if (at91_ramc_base[1]) |
| 72 | at91_ramc_write(1, AT91_DDRSDRC_LPR, lpr1); | ||
| 66 | 73 | ||
| 67 | cpu_do_idle(); | 74 | cpu_do_idle(); |
| 68 | 75 | ||
| 69 | at91_ramc_write(0, AT91_DDRSDRC_LPR, saved_lpr0); | 76 | at91_ramc_write(0, AT91_DDRSDRC_LPR, saved_lpr0); |
| 70 | at91_ramc_write(1, AT91_DDRSDRC_LPR, saved_lpr1); | 77 | if (at91_ramc_base[1]) |
| 78 | at91_ramc_write(1, AT91_DDRSDRC_LPR, saved_lpr1); | ||
| 71 | } | 79 | } |
| 72 | 80 | ||
| 73 | /* We manage both DDRAM/SDRAM controllers, we need more than one value to | 81 | /* We manage both DDRAM/SDRAM controllers, we need more than one value to |
| 74 | * remember. | 82 | * remember. |
| 75 | */ | 83 | */ |
| 76 | static inline void at91sam9263_standby(void) | 84 | static inline void at91sam9_sdram_standby(void) |
| 77 | { | 85 | { |
| 78 | u32 lpr0, lpr1; | 86 | u32 lpr0, lpr1 = 0; |
| 79 | u32 saved_lpr0, saved_lpr1; | 87 | u32 saved_lpr0, saved_lpr1 = 0; |
| 80 | 88 | ||
| 81 | saved_lpr1 = at91_ramc_read(1, AT91_SDRAMC_LPR); | 89 | if (at91_ramc_base[1]) { |
| 82 | lpr1 = saved_lpr1 & ~AT91_SDRAMC_LPCB; | 90 | saved_lpr1 = at91_ramc_read(1, AT91_SDRAMC_LPR); |
| 83 | lpr1 |= AT91_SDRAMC_LPCB_SELF_REFRESH; | 91 | lpr1 = saved_lpr1 & ~AT91_SDRAMC_LPCB; |
| 92 | lpr1 |= AT91_SDRAMC_LPCB_SELF_REFRESH; | ||
| 93 | } | ||
| 84 | 94 | ||
| 85 | saved_lpr0 = at91_ramc_read(0, AT91_SDRAMC_LPR); | 95 | saved_lpr0 = at91_ramc_read(0, AT91_SDRAMC_LPR); |
| 86 | lpr0 = saved_lpr0 & ~AT91_SDRAMC_LPCB; | 96 | lpr0 = saved_lpr0 & ~AT91_SDRAMC_LPCB; |
| @@ -88,27 +98,14 @@ static inline void at91sam9263_standby(void) | |||
| 88 | 98 | ||
| 89 | /* self-refresh mode now */ | 99 | /* self-refresh mode now */ |
| 90 | at91_ramc_write(0, AT91_SDRAMC_LPR, lpr0); | 100 | at91_ramc_write(0, AT91_SDRAMC_LPR, lpr0); |
| 91 | at91_ramc_write(1, AT91_SDRAMC_LPR, lpr1); | 101 | if (at91_ramc_base[1]) |
| 102 | at91_ramc_write(1, AT91_SDRAMC_LPR, lpr1); | ||
| 92 | 103 | ||
| 93 | cpu_do_idle(); | 104 | cpu_do_idle(); |
| 94 | 105 | ||
| 95 | at91_ramc_write(0, AT91_SDRAMC_LPR, saved_lpr0); | 106 | at91_ramc_write(0, AT91_SDRAMC_LPR, saved_lpr0); |
| 96 | at91_ramc_write(1, AT91_SDRAMC_LPR, saved_lpr1); | 107 | if (at91_ramc_base[1]) |
| 97 | } | 108 | at91_ramc_write(1, AT91_SDRAMC_LPR, saved_lpr1); |
| 98 | |||
| 99 | static inline void at91sam9_standby(void) | ||
| 100 | { | ||
| 101 | u32 saved_lpr, lpr; | ||
| 102 | |||
| 103 | saved_lpr = at91_ramc_read(0, AT91_SDRAMC_LPR); | ||
| 104 | |||
| 105 | lpr = saved_lpr & ~AT91_SDRAMC_LPCB; | ||
| 106 | at91_ramc_write(0, AT91_SDRAMC_LPR, lpr | | ||
| 107 | AT91_SDRAMC_LPCB_SELF_REFRESH); | ||
| 108 | |||
| 109 | cpu_do_idle(); | ||
| 110 | |||
| 111 | at91_ramc_write(0, AT91_SDRAMC_LPR, saved_lpr); | ||
| 112 | } | 109 | } |
| 113 | 110 | ||
| 114 | #endif | 111 | #endif |
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index b17fbcf4d9e8..094b3459c288 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include "at91_shdwc.h" | 23 | #include "at91_shdwc.h" |
| 24 | #include "soc.h" | 24 | #include "soc.h" |
| 25 | #include "generic.h" | 25 | #include "generic.h" |
| 26 | #include "pm.h" | ||
| 26 | 27 | ||
| 27 | struct at91_init_soc __initdata at91_boot_soc; | 28 | struct at91_init_soc __initdata at91_boot_soc; |
| 28 | 29 | ||
| @@ -376,15 +377,16 @@ static void at91_dt_rstc(void) | |||
| 376 | } | 377 | } |
| 377 | 378 | ||
| 378 | static struct of_device_id ramc_ids[] = { | 379 | static struct of_device_id ramc_ids[] = { |
| 379 | { .compatible = "atmel,at91rm9200-sdramc" }, | 380 | { .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby }, |
| 380 | { .compatible = "atmel,at91sam9260-sdramc" }, | 381 | { .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby }, |
| 381 | { .compatible = "atmel,at91sam9g45-ddramc" }, | 382 | { .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby }, |
| 382 | { /*sentinel*/ } | 383 | { /*sentinel*/ } |
| 383 | }; | 384 | }; |
| 384 | 385 | ||
| 385 | static void at91_dt_ramc(void) | 386 | static void at91_dt_ramc(void) |
| 386 | { | 387 | { |
| 387 | struct device_node *np; | 388 | struct device_node *np; |
| 389 | const struct of_device_id *of_id; | ||
| 388 | 390 | ||
| 389 | np = of_find_matching_node(NULL, ramc_ids); | 391 | np = of_find_matching_node(NULL, ramc_ids); |
| 390 | if (!np) | 392 | if (!np) |
| @@ -396,6 +398,12 @@ static void at91_dt_ramc(void) | |||
| 396 | /* the controller may have 2 banks */ | 398 | /* the controller may have 2 banks */ |
| 397 | at91_ramc_base[1] = of_iomap(np, 1); | 399 | at91_ramc_base[1] = of_iomap(np, 1); |
| 398 | 400 | ||
| 401 | of_id = of_match_node(ramc_ids, np); | ||
| 402 | if (!of_id) | ||
| 403 | pr_warn("AT91: ramc no standby function available\n"); | ||
| 404 | else | ||
| 405 | at91_pm_set_standby(of_id->data); | ||
| 406 | |||
| 399 | of_node_put(np); | 407 | of_node_put(np); |
| 400 | } | 408 | } |
| 401 | 409 | ||
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index e026b19b23ea..a075b3e0c5c7 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig | |||
| @@ -40,7 +40,6 @@ config ARCH_DAVINCI_DA850 | |||
| 40 | bool "DA850/OMAP-L138/AM18x based system" | 40 | bool "DA850/OMAP-L138/AM18x based system" |
| 41 | select ARCH_DAVINCI_DA8XX | 41 | select ARCH_DAVINCI_DA8XX |
| 42 | select ARCH_HAS_CPUFREQ | 42 | select ARCH_HAS_CPUFREQ |
| 43 | select CPU_FREQ_TABLE | ||
| 44 | select CP_INTC | 43 | select CP_INTC |
| 45 | 44 | ||
| 46 | config ARCH_DAVINCI_DA8XX | 45 | config ARCH_DAVINCI_DA8XX |
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index ba95e5db2501..c17407b16d7c 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/clk-provider.h> | 30 | #include <linux/clk-provider.h> |
| 31 | #include <linux/irqchip/arm-gic.h> | 31 | #include <linux/irqchip/arm-gic.h> |
| 32 | #include <linux/irqchip/chained_irq.h> | 32 | #include <linux/irqchip/chained_irq.h> |
| 33 | #include <linux/platform_device.h> | ||
| 33 | 34 | ||
| 34 | #include <asm/proc-fns.h> | 35 | #include <asm/proc-fns.h> |
| 35 | #include <asm/exception.h> | 36 | #include <asm/exception.h> |
| @@ -294,6 +295,16 @@ void exynos5_restart(enum reboot_mode mode, const char *cmd) | |||
| 294 | __raw_writel(val, addr); | 295 | __raw_writel(val, addr); |
| 295 | } | 296 | } |
| 296 | 297 | ||
| 298 | static struct platform_device exynos_cpuidle = { | ||
| 299 | .name = "exynos_cpuidle", | ||
| 300 | .id = -1, | ||
| 301 | }; | ||
| 302 | |||
| 303 | void __init exynos_cpuidle_init(void) | ||
| 304 | { | ||
| 305 | platform_device_register(&exynos_cpuidle); | ||
| 306 | } | ||
| 307 | |||
| 297 | void __init exynos_init_late(void) | 308 | void __init exynos_init_late(void) |
| 298 | { | 309 | { |
| 299 | if (of_machine_is_compatible("samsung,exynos5440")) | 310 | if (of_machine_is_compatible("samsung,exynos5440")) |
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 8646a141ae46..b2ac1885d381 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h | |||
| @@ -22,6 +22,7 @@ struct map_desc; | |||
| 22 | void exynos_init_io(void); | 22 | void exynos_init_io(void); |
| 23 | void exynos4_restart(enum reboot_mode mode, const char *cmd); | 23 | void exynos4_restart(enum reboot_mode mode, const char *cmd); |
| 24 | void exynos5_restart(enum reboot_mode mode, const char *cmd); | 24 | void exynos5_restart(enum reboot_mode mode, const char *cmd); |
| 25 | void exynos_cpuidle_init(void); | ||
| 25 | void exynos_init_late(void); | 26 | void exynos_init_late(void); |
| 26 | 27 | ||
| 27 | void exynos_firmware_init(void); | 28 | void exynos_firmware_init(void); |
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index ac139226d63c..1bde6ad07d93 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 16 | #include <linux/export.h> | 16 | #include <linux/export.h> |
| 17 | #include <linux/time.h> | 17 | #include <linux/time.h> |
| 18 | #include <linux/platform_device.h> | ||
| 18 | 19 | ||
| 19 | #include <asm/proc-fns.h> | 20 | #include <asm/proc-fns.h> |
| 20 | #include <asm/smp_scu.h> | 21 | #include <asm/smp_scu.h> |
| @@ -192,7 +193,7 @@ static void __init exynos5_core_down_clk(void) | |||
| 192 | __raw_writel(tmp, EXYNOS5_PWR_CTRL2); | 193 | __raw_writel(tmp, EXYNOS5_PWR_CTRL2); |
| 193 | } | 194 | } |
| 194 | 195 | ||
| 195 | static int __init exynos4_init_cpuidle(void) | 196 | static int __init exynos_cpuidle_probe(struct platform_device *pdev) |
| 196 | { | 197 | { |
| 197 | int cpu_id, ret; | 198 | int cpu_id, ret; |
| 198 | struct cpuidle_device *device; | 199 | struct cpuidle_device *device; |
| @@ -226,4 +227,13 @@ static int __init exynos4_init_cpuidle(void) | |||
| 226 | 227 | ||
| 227 | return 0; | 228 | return 0; |
| 228 | } | 229 | } |
| 229 | device_initcall(exynos4_init_cpuidle); | 230 | |
| 231 | static struct platform_driver exynos_cpuidle_driver = { | ||
| 232 | .probe = exynos_cpuidle_probe, | ||
| 233 | .driver = { | ||
| 234 | .name = "exynos_cpuidle", | ||
| 235 | .owner = THIS_MODULE, | ||
| 236 | }, | ||
| 237 | }; | ||
| 238 | |||
| 239 | module_platform_driver(exynos_cpuidle_driver); | ||
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c index 0099c6c13bba..53a3dc37a730 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c | |||
| @@ -25,6 +25,8 @@ | |||
| 25 | 25 | ||
| 26 | static void __init exynos4_dt_machine_init(void) | 26 | static void __init exynos4_dt_machine_init(void) |
| 27 | { | 27 | { |
| 28 | exynos_cpuidle_init(); | ||
| 29 | |||
| 28 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 30 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
| 29 | } | 31 | } |
| 30 | 32 | ||
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index f874b773ca13..c9f7dd1cdc8f 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c | |||
| @@ -47,6 +47,8 @@ static void __init exynos5_dt_machine_init(void) | |||
| 47 | } | 47 | } |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | exynos_cpuidle_init(); | ||
| 51 | |||
| 50 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 52 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
| 51 | } | 53 | } |
| 52 | 54 | ||
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 90372a21087f..699aabe296e1 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <linux/of_address.h> | 25 | #include <linux/of_address.h> |
| 26 | #include <linux/of_irq.h> | 26 | #include <linux/of_irq.h> |
| 27 | #include <linux/of_platform.h> | 27 | #include <linux/of_platform.h> |
| 28 | #include <linux/opp.h> | 28 | #include <linux/pm_opp.h> |
| 29 | #include <linux/phy.h> | 29 | #include <linux/phy.h> |
| 30 | #include <linux/reboot.h> | 30 | #include <linux/reboot.h> |
| 31 | #include <linux/regmap.h> | 31 | #include <linux/regmap.h> |
| @@ -226,7 +226,7 @@ static void __init imx6q_opp_check_1p2ghz(struct device *cpu_dev) | |||
| 226 | val = readl_relaxed(base + OCOTP_CFG3); | 226 | val = readl_relaxed(base + OCOTP_CFG3); |
| 227 | val >>= OCOTP_CFG3_SPEED_SHIFT; | 227 | val >>= OCOTP_CFG3_SPEED_SHIFT; |
| 228 | if ((val & 0x3) != OCOTP_CFG3_SPEED_1P2GHZ) | 228 | if ((val & 0x3) != OCOTP_CFG3_SPEED_1P2GHZ) |
| 229 | if (opp_disable(cpu_dev, 1200000000)) | 229 | if (dev_pm_opp_disable(cpu_dev, 1200000000)) |
| 230 | pr_warn("failed to disable 1.2 GHz OPP\n"); | 230 | pr_warn("failed to disable 1.2 GHz OPP\n"); |
| 231 | 231 | ||
| 232 | put_node: | 232 | put_node: |
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 39c78387ddec..87162e1b94a5 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
| @@ -129,6 +129,24 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") | |||
| 129 | .restart = omap3xxx_restart, | 129 | .restart = omap3xxx_restart, |
| 130 | MACHINE_END | 130 | MACHINE_END |
| 131 | 131 | ||
| 132 | static const char *omap36xx_boards_compat[] __initdata = { | ||
| 133 | "ti,omap36xx", | ||
| 134 | NULL, | ||
| 135 | }; | ||
| 136 | |||
| 137 | DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)") | ||
| 138 | .reserve = omap_reserve, | ||
| 139 | .map_io = omap3_map_io, | ||
| 140 | .init_early = omap3630_init_early, | ||
| 141 | .init_irq = omap_intc_of_init, | ||
| 142 | .handle_irq = omap3_intc_handle_irq, | ||
| 143 | .init_machine = omap_generic_init, | ||
| 144 | .init_late = omap3_init_late, | ||
| 145 | .init_time = omap3_sync32k_timer_init, | ||
| 146 | .dt_compat = omap36xx_boards_compat, | ||
| 147 | .restart = omap3xxx_restart, | ||
| 148 | MACHINE_END | ||
| 149 | |||
| 132 | static const char *omap3_gp_boards_compat[] __initdata = { | 150 | static const char *omap3_gp_boards_compat[] __initdata = { |
| 133 | "ti,omap3-beagle", | 151 | "ti,omap3-beagle", |
| 134 | "timll,omap3-devkit8000", | 152 | "timll,omap3-devkit8000", |
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index f26918467efc..6432ab8d9207 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <linux/gpio.h> | 25 | #include <linux/gpio.h> |
| 26 | #include <linux/input.h> | 26 | #include <linux/input.h> |
| 27 | #include <linux/gpio_keys.h> | 27 | #include <linux/gpio_keys.h> |
| 28 | #include <linux/opp.h> | 28 | #include <linux/pm_opp.h> |
| 29 | #include <linux/cpu.h> | 29 | #include <linux/cpu.h> |
| 30 | 30 | ||
| 31 | #include <linux/mtd/mtd.h> | 31 | #include <linux/mtd/mtd.h> |
| @@ -522,11 +522,11 @@ static int __init beagle_opp_init(void) | |||
| 522 | return -ENODEV; | 522 | return -ENODEV; |
| 523 | } | 523 | } |
| 524 | /* Enable MPU 1GHz and lower opps */ | 524 | /* Enable MPU 1GHz and lower opps */ |
| 525 | r = opp_enable(mpu_dev, 800000000); | 525 | r = dev_pm_opp_enable(mpu_dev, 800000000); |
| 526 | /* TODO: MPU 1GHz needs SR and ABB */ | 526 | /* TODO: MPU 1GHz needs SR and ABB */ |
| 527 | 527 | ||
| 528 | /* Enable IVA 800MHz and lower opps */ | 528 | /* Enable IVA 800MHz and lower opps */ |
| 529 | r |= opp_enable(iva_dev, 660000000); | 529 | r |= dev_pm_opp_enable(iva_dev, 660000000); |
| 530 | /* TODO: DSP 800MHz needs SR and ABB */ | 530 | /* TODO: DSP 800MHz needs SR and ABB */ |
| 531 | if (r) { | 531 | if (r) { |
| 532 | pr_err("%s: failed to enable higher opp %d\n", | 532 | pr_err("%s: failed to enable higher opp %d\n", |
| @@ -535,8 +535,8 @@ static int __init beagle_opp_init(void) | |||
| 535 | * Cleanup - disable the higher freqs - we dont care | 535 | * Cleanup - disable the higher freqs - we dont care |
| 536 | * about the results | 536 | * about the results |
| 537 | */ | 537 | */ |
| 538 | opp_disable(mpu_dev, 800000000); | 538 | dev_pm_opp_disable(mpu_dev, 800000000); |
| 539 | opp_disable(iva_dev, 660000000); | 539 | dev_pm_opp_disable(iva_dev, 660000000); |
| 540 | } | 540 | } |
| 541 | } | 541 | } |
| 542 | return 0; | 542 | return 0; |
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index c3270c0f1fce..f6fe388af989 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
| @@ -167,38 +167,47 @@ static struct lp55xx_led_config rx51_lp5523_led_config[] = { | |||
| 167 | .name = "lp5523:kb1", | 167 | .name = "lp5523:kb1", |
| 168 | .chan_nr = 0, | 168 | .chan_nr = 0, |
| 169 | .led_current = 50, | 169 | .led_current = 50, |
| 170 | .max_current = 100, | ||
| 170 | }, { | 171 | }, { |
| 171 | .name = "lp5523:kb2", | 172 | .name = "lp5523:kb2", |
| 172 | .chan_nr = 1, | 173 | .chan_nr = 1, |
| 173 | .led_current = 50, | 174 | .led_current = 50, |
| 175 | .max_current = 100, | ||
| 174 | }, { | 176 | }, { |
| 175 | .name = "lp5523:kb3", | 177 | .name = "lp5523:kb3", |
| 176 | .chan_nr = 2, | 178 | .chan_nr = 2, |
| 177 | .led_current = 50, | 179 | .led_current = 50, |
| 180 | .max_current = 100, | ||
| 178 | }, { | 181 | }, { |
| 179 | .name = "lp5523:kb4", | 182 | .name = "lp5523:kb4", |
| 180 | .chan_nr = 3, | 183 | .chan_nr = 3, |
| 181 | .led_current = 50, | 184 | .led_current = 50, |
| 185 | .max_current = 100, | ||
| 182 | }, { | 186 | }, { |
| 183 | .name = "lp5523:b", | 187 | .name = "lp5523:b", |
| 184 | .chan_nr = 4, | 188 | .chan_nr = 4, |
| 185 | .led_current = 50, | 189 | .led_current = 50, |
| 190 | .max_current = 100, | ||
| 186 | }, { | 191 | }, { |
| 187 | .name = "lp5523:g", | 192 | .name = "lp5523:g", |
| 188 | .chan_nr = 5, | 193 | .chan_nr = 5, |
| 189 | .led_current = 50, | 194 | .led_current = 50, |
| 195 | .max_current = 100, | ||
| 190 | }, { | 196 | }, { |
| 191 | .name = "lp5523:r", | 197 | .name = "lp5523:r", |
| 192 | .chan_nr = 6, | 198 | .chan_nr = 6, |
| 193 | .led_current = 50, | 199 | .led_current = 50, |
| 200 | .max_current = 100, | ||
| 194 | }, { | 201 | }, { |
| 195 | .name = "lp5523:kb5", | 202 | .name = "lp5523:kb5", |
| 196 | .chan_nr = 7, | 203 | .chan_nr = 7, |
| 197 | .led_current = 50, | 204 | .led_current = 50, |
| 205 | .max_current = 100, | ||
| 198 | }, { | 206 | }, { |
| 199 | .name = "lp5523:kb6", | 207 | .name = "lp5523:kb6", |
| 200 | .chan_nr = 8, | 208 | .chan_nr = 8, |
| 201 | .led_current = 50, | 209 | .led_current = 50, |
| 210 | .max_current = 100, | ||
| 202 | } | 211 | } |
| 203 | }; | 212 | }; |
| 204 | 213 | ||
diff --git a/arch/arm/mach-omap2/gpmc-onenand.c b/arch/arm/mach-omap2/gpmc-onenand.c index 64b5a8346982..8b6876c98ce1 100644 --- a/arch/arm/mach-omap2/gpmc-onenand.c +++ b/arch/arm/mach-omap2/gpmc-onenand.c | |||
| @@ -272,9 +272,19 @@ static int omap2_onenand_setup_async(void __iomem *onenand_base) | |||
| 272 | struct gpmc_timings t; | 272 | struct gpmc_timings t; |
| 273 | int ret; | 273 | int ret; |
| 274 | 274 | ||
| 275 | if (gpmc_onenand_data->of_node) | 275 | if (gpmc_onenand_data->of_node) { |
| 276 | gpmc_read_settings_dt(gpmc_onenand_data->of_node, | 276 | gpmc_read_settings_dt(gpmc_onenand_data->of_node, |
| 277 | &onenand_async); | 277 | &onenand_async); |
| 278 | if (onenand_async.sync_read || onenand_async.sync_write) { | ||
| 279 | if (onenand_async.sync_write) | ||
| 280 | gpmc_onenand_data->flags |= | ||
| 281 | ONENAND_SYNC_READWRITE; | ||
| 282 | else | ||
| 283 | gpmc_onenand_data->flags |= ONENAND_SYNC_READ; | ||
| 284 | onenand_async.sync_read = false; | ||
| 285 | onenand_async.sync_write = false; | ||
| 286 | } | ||
| 287 | } | ||
| 278 | 288 | ||
| 279 | omap2_onenand_set_async_mode(onenand_base); | 289 | omap2_onenand_set_async_mode(onenand_base); |
| 280 | 290 | ||
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h index 5d2080ef7923..16f78a990d04 100644 --- a/arch/arm/mach-omap2/mux.h +++ b/arch/arm/mach-omap2/mux.h | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #define OMAP_PULL_UP (1 << 4) | 28 | #define OMAP_PULL_UP (1 << 4) |
| 29 | #define OMAP_ALTELECTRICALSEL (1 << 5) | 29 | #define OMAP_ALTELECTRICALSEL (1 << 5) |
| 30 | 30 | ||
| 31 | /* 34xx specific mux bit defines */ | 31 | /* omap3/4/5 specific mux bit defines */ |
| 32 | #define OMAP_INPUT_EN (1 << 8) | 32 | #define OMAP_INPUT_EN (1 << 8) |
| 33 | #define OMAP_OFF_EN (1 << 9) | 33 | #define OMAP_OFF_EN (1 << 9) |
| 34 | #define OMAP_OFFOUT_EN (1 << 10) | 34 | #define OMAP_OFFOUT_EN (1 << 10) |
| @@ -36,8 +36,6 @@ | |||
| 36 | #define OMAP_OFF_PULL_EN (1 << 12) | 36 | #define OMAP_OFF_PULL_EN (1 << 12) |
| 37 | #define OMAP_OFF_PULL_UP (1 << 13) | 37 | #define OMAP_OFF_PULL_UP (1 << 13) |
| 38 | #define OMAP_WAKEUP_EN (1 << 14) | 38 | #define OMAP_WAKEUP_EN (1 << 14) |
| 39 | |||
| 40 | /* 44xx specific mux bit defines */ | ||
| 41 | #define OMAP_WAKEUP_EVENT (1 << 15) | 39 | #define OMAP_WAKEUP_EVENT (1 << 15) |
| 42 | 40 | ||
| 43 | /* Active pin states */ | 41 | /* Active pin states */ |
diff --git a/arch/arm/mach-omap2/omap-pm.h b/arch/arm/mach-omap2/omap-pm.h index 67faa7b8fe92..1d777e63e05c 100644 --- a/arch/arm/mach-omap2/omap-pm.h +++ b/arch/arm/mach-omap2/omap-pm.h | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/device.h> | 17 | #include <linux/device.h> |
| 18 | #include <linux/cpufreq.h> | 18 | #include <linux/cpufreq.h> |
| 19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
| 20 | #include <linux/opp.h> | 20 | #include <linux/pm_opp.h> |
| 21 | 21 | ||
| 22 | /* | 22 | /* |
| 23 | * agent_id values for use with omap_pm_set_min_bus_tput(): | 23 | * agent_id values for use with omap_pm_set_min_bus_tput(): |
diff --git a/arch/arm/mach-omap2/opp.c b/arch/arm/mach-omap2/opp.c index bd41d59a7cab..ec21e6eb03e1 100644 --- a/arch/arm/mach-omap2/opp.c +++ b/arch/arm/mach-omap2/opp.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | * GNU General Public License for more details. | 17 | * GNU General Public License for more details. |
| 18 | */ | 18 | */ |
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/opp.h> | 20 | #include <linux/pm_opp.h> |
| 21 | #include <linux/cpu.h> | 21 | #include <linux/cpu.h> |
| 22 | 22 | ||
| 23 | #include "omap_device.h" | 23 | #include "omap_device.h" |
| @@ -81,14 +81,14 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def, | |||
| 81 | dev = &oh->od->pdev->dev; | 81 | dev = &oh->od->pdev->dev; |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | r = opp_add(dev, opp_def->freq, opp_def->u_volt); | 84 | r = dev_pm_opp_add(dev, opp_def->freq, opp_def->u_volt); |
| 85 | if (r) { | 85 | if (r) { |
| 86 | dev_err(dev, "%s: add OPP %ld failed for %s [%d] result=%d\n", | 86 | dev_err(dev, "%s: add OPP %ld failed for %s [%d] result=%d\n", |
| 87 | __func__, opp_def->freq, | 87 | __func__, opp_def->freq, |
| 88 | opp_def->hwmod_name, i, r); | 88 | opp_def->hwmod_name, i, r); |
| 89 | } else { | 89 | } else { |
| 90 | if (!opp_def->default_available) | 90 | if (!opp_def->default_available) |
| 91 | r = opp_disable(dev, opp_def->freq); | 91 | r = dev_pm_opp_disable(dev, opp_def->freq); |
| 92 | if (r) | 92 | if (r) |
| 93 | dev_err(dev, "%s: disable %ld failed for %s [%d] result=%d\n", | 93 | dev_err(dev, "%s: disable %ld failed for %s [%d] result=%d\n", |
| 94 | __func__, opp_def->freq, | 94 | __func__, opp_def->freq, |
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index e742118fcfd2..2f569b3c3092 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <linux/err.h> | 15 | #include <linux/err.h> |
| 16 | #include <linux/opp.h> | 16 | #include <linux/pm_opp.h> |
| 17 | #include <linux/export.h> | 17 | #include <linux/export.h> |
| 18 | #include <linux/suspend.h> | 18 | #include <linux/suspend.h> |
| 19 | #include <linux/cpu.h> | 19 | #include <linux/cpu.h> |
| @@ -131,7 +131,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, | |||
| 131 | { | 131 | { |
| 132 | struct voltagedomain *voltdm; | 132 | struct voltagedomain *voltdm; |
| 133 | struct clk *clk; | 133 | struct clk *clk; |
| 134 | struct opp *opp; | 134 | struct dev_pm_opp *opp; |
| 135 | unsigned long freq, bootup_volt; | 135 | unsigned long freq, bootup_volt; |
| 136 | struct device *dev; | 136 | struct device *dev; |
| 137 | 137 | ||
| @@ -172,7 +172,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, | |||
| 172 | clk_put(clk); | 172 | clk_put(clk); |
| 173 | 173 | ||
| 174 | rcu_read_lock(); | 174 | rcu_read_lock(); |
| 175 | opp = opp_find_freq_ceil(dev, &freq); | 175 | opp = dev_pm_opp_find_freq_ceil(dev, &freq); |
| 176 | if (IS_ERR(opp)) { | 176 | if (IS_ERR(opp)) { |
| 177 | rcu_read_unlock(); | 177 | rcu_read_unlock(); |
| 178 | pr_err("%s: unable to find boot up OPP for vdd_%s\n", | 178 | pr_err("%s: unable to find boot up OPP for vdd_%s\n", |
| @@ -180,7 +180,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, | |||
| 180 | goto exit; | 180 | goto exit; |
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | bootup_volt = opp_get_voltage(opp); | 183 | bootup_volt = dev_pm_opp_get_voltage(opp); |
| 184 | rcu_read_unlock(); | 184 | rcu_read_unlock(); |
| 185 | if (!bootup_volt) { | 185 | if (!bootup_volt) { |
| 186 | pr_err("%s: unable to find voltage corresponding to the bootup OPP for vdd_%s\n", | 186 | pr_err("%s: unable to find voltage corresponding to the bootup OPP for vdd_%s\n", |
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index fa74a0625da1..ead48fa5715e 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
| @@ -628,7 +628,7 @@ void __init omap4_local_timer_init(void) | |||
| 628 | #endif /* CONFIG_HAVE_ARM_TWD */ | 628 | #endif /* CONFIG_HAVE_ARM_TWD */ |
| 629 | #endif /* CONFIG_ARCH_OMAP4 */ | 629 | #endif /* CONFIG_ARCH_OMAP4 */ |
| 630 | 630 | ||
| 631 | #ifdef CONFIG_SOC_OMAP5 | 631 | #if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX) |
| 632 | void __init omap5_realtime_timer_init(void) | 632 | void __init omap5_realtime_timer_init(void) |
| 633 | { | 633 | { |
| 634 | omap4_sync32k_timer_init(); | 634 | omap4_sync32k_timer_init(); |
| @@ -636,7 +636,7 @@ void __init omap5_realtime_timer_init(void) | |||
| 636 | 636 | ||
| 637 | clocksource_of_init(); | 637 | clocksource_of_init(); |
| 638 | } | 638 | } |
| 639 | #endif /* CONFIG_SOC_OMAP5 */ | 639 | #endif /* CONFIG_SOC_OMAP5 || CONFIG_SOC_DRA7XX */ |
| 640 | 640 | ||
| 641 | /** | 641 | /** |
| 642 | * omap_timer_init - build and register timer device with an | 642 | * omap_timer_init - build and register timer device with an |
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index a8427115ee07..96100dbf5a2e 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -615,14 +615,12 @@ endmenu | |||
| 615 | config PXA25x | 615 | config PXA25x |
| 616 | bool | 616 | bool |
| 617 | select CPU_XSCALE | 617 | select CPU_XSCALE |
| 618 | select CPU_FREQ_TABLE if CPU_FREQ | ||
| 619 | help | 618 | help |
| 620 | Select code specific to PXA21x/25x/26x variants | 619 | Select code specific to PXA21x/25x/26x variants |
| 621 | 620 | ||
| 622 | config PXA27x | 621 | config PXA27x |
| 623 | bool | 622 | bool |
| 624 | select CPU_XSCALE | 623 | select CPU_XSCALE |
| 625 | select CPU_FREQ_TABLE if CPU_FREQ | ||
| 626 | help | 624 | help |
| 627 | Select code specific to PXA27x variants | 625 | Select code specific to PXA27x variants |
| 628 | 626 | ||
| @@ -635,7 +633,6 @@ config CPU_PXA26x | |||
| 635 | config PXA3xx | 633 | config PXA3xx |
| 636 | bool | 634 | bool |
| 637 | select CPU_XSC3 | 635 | select CPU_XSC3 |
| 638 | select CPU_FREQ_TABLE if CPU_FREQ | ||
| 639 | help | 636 | help |
| 640 | Select code specific to PXA3xx variants | 637 | Select code specific to PXA3xx variants |
| 641 | 638 | ||
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index f25b6119e028..d4ea142c4edd 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c | |||
| @@ -42,74 +42,31 @@ EXPORT_SYMBOL(reset_status); | |||
| 42 | /* | 42 | /* |
| 43 | * This table is setup for a 3.6864MHz Crystal. | 43 | * This table is setup for a 3.6864MHz Crystal. |
| 44 | */ | 44 | */ |
| 45 | static const unsigned short cclk_frequency_100khz[NR_FREQS] = { | 45 | struct cpufreq_frequency_table sa11x0_freq_table[NR_FREQS+1] = { |
| 46 | 590, /* 59.0 MHz */ | 46 | { .frequency = 59000, /* 59.0 MHz */}, |
| 47 | 737, /* 73.7 MHz */ | 47 | { .frequency = 73700, /* 73.7 MHz */}, |
| 48 | 885, /* 88.5 MHz */ | 48 | { .frequency = 88500, /* 88.5 MHz */}, |
| 49 | 1032, /* 103.2 MHz */ | 49 | { .frequency = 103200, /* 103.2 MHz */}, |
| 50 | 1180, /* 118.0 MHz */ | 50 | { .frequency = 118000, /* 118.0 MHz */}, |
| 51 | 1327, /* 132.7 MHz */ | 51 | { .frequency = 132700, /* 132.7 MHz */}, |
| 52 | 1475, /* 147.5 MHz */ | 52 | { .frequency = 147500, /* 147.5 MHz */}, |
| 53 | 1622, /* 162.2 MHz */ | 53 | { .frequency = 162200, /* 162.2 MHz */}, |
| 54 | 1769, /* 176.9 MHz */ | 54 | { .frequency = 176900, /* 176.9 MHz */}, |
| 55 | 1917, /* 191.7 MHz */ | 55 | { .frequency = 191700, /* 191.7 MHz */}, |
| 56 | 2064, /* 206.4 MHz */ | 56 | { .frequency = 206400, /* 206.4 MHz */}, |
| 57 | 2212, /* 221.2 MHz */ | 57 | { .frequency = 221200, /* 221.2 MHz */}, |
| 58 | 2359, /* 235.9 MHz */ | 58 | { .frequency = 235900, /* 235.9 MHz */}, |
| 59 | 2507, /* 250.7 MHz */ | 59 | { .frequency = 250700, /* 250.7 MHz */}, |
| 60 | 2654, /* 265.4 MHz */ | 60 | { .frequency = 265400, /* 265.4 MHz */}, |
| 61 | 2802 /* 280.2 MHz */ | 61 | { .frequency = 280200, /* 280.2 MHz */}, |
| 62 | { .frequency = CPUFREQ_TABLE_END, }, | ||
| 62 | }; | 63 | }; |
| 63 | 64 | ||
| 64 | /* rounds up(!) */ | ||
| 65 | unsigned int sa11x0_freq_to_ppcr(unsigned int khz) | ||
| 66 | { | ||
| 67 | int i; | ||
| 68 | |||
| 69 | khz /= 100; | ||
| 70 | |||
| 71 | for (i = 0; i < NR_FREQS; i++) | ||
| 72 | if (cclk_frequency_100khz[i] >= khz) | ||
| 73 | break; | ||
| 74 | |||
| 75 | return i; | ||
| 76 | } | ||
| 77 | |||
| 78 | unsigned int sa11x0_ppcr_to_freq(unsigned int idx) | ||
| 79 | { | ||
| 80 | unsigned int freq = 0; | ||
| 81 | if (idx < NR_FREQS) | ||
| 82 | freq = cclk_frequency_100khz[idx] * 100; | ||
| 83 | return freq; | ||
| 84 | } | ||
| 85 | |||
| 86 | |||
| 87 | /* make sure that only the "userspace" governor is run -- anything else wouldn't make sense on | ||
| 88 | * this platform, anyway. | ||
| 89 | */ | ||
| 90 | int sa11x0_verify_speed(struct cpufreq_policy *policy) | ||
| 91 | { | ||
| 92 | unsigned int tmp; | ||
| 93 | if (policy->cpu) | ||
| 94 | return -EINVAL; | ||
| 95 | |||
| 96 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, policy->cpuinfo.max_freq); | ||
| 97 | |||
| 98 | /* make sure that at least one frequency is within the policy */ | ||
| 99 | tmp = cclk_frequency_100khz[sa11x0_freq_to_ppcr(policy->min)] * 100; | ||
| 100 | if (tmp > policy->max) | ||
| 101 | policy->max = tmp; | ||
| 102 | |||
| 103 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, policy->cpuinfo.max_freq); | ||
| 104 | |||
| 105 | return 0; | ||
| 106 | } | ||
| 107 | |||
| 108 | unsigned int sa11x0_getspeed(unsigned int cpu) | 65 | unsigned int sa11x0_getspeed(unsigned int cpu) |
| 109 | { | 66 | { |
| 110 | if (cpu) | 67 | if (cpu) |
| 111 | return 0; | 68 | return 0; |
| 112 | return cclk_frequency_100khz[PPCR & 0xf] * 100; | 69 | return sa11x0_freq_table[PPCR & 0xf].frequency; |
| 113 | } | 70 | } |
| 114 | 71 | ||
| 115 | /* | 72 | /* |
diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h index 9a33695c9492..0d92e119b36b 100644 --- a/arch/arm/mach-sa1100/generic.h +++ b/arch/arm/mach-sa1100/generic.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Author: Nicolas Pitre | 4 | * Author: Nicolas Pitre |
| 5 | */ | 5 | */ |
| 6 | #include <linux/cpufreq.h> | ||
| 6 | #include <linux/reboot.h> | 7 | #include <linux/reboot.h> |
| 7 | 8 | ||
| 8 | extern void sa1100_timer_init(void); | 9 | extern void sa1100_timer_init(void); |
| @@ -19,12 +20,8 @@ extern void sa11x0_init_late(void); | |||
| 19 | extern void sa1110_mb_enable(void); | 20 | extern void sa1110_mb_enable(void); |
| 20 | extern void sa1110_mb_disable(void); | 21 | extern void sa1110_mb_disable(void); |
| 21 | 22 | ||
| 22 | struct cpufreq_policy; | 23 | extern struct cpufreq_frequency_table sa11x0_freq_table[]; |
| 23 | |||
| 24 | extern unsigned int sa11x0_freq_to_ppcr(unsigned int khz); | ||
| 25 | extern int sa11x0_verify_speed(struct cpufreq_policy *policy); | ||
| 26 | extern unsigned int sa11x0_getspeed(unsigned int cpu); | 24 | extern unsigned int sa11x0_getspeed(unsigned int cpu); |
| 27 | extern unsigned int sa11x0_ppcr_to_freq(unsigned int idx); | ||
| 28 | 25 | ||
| 29 | struct flash_platform_data; | 26 | struct flash_platform_data; |
| 30 | struct resource; | 27 | struct resource; |
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 99a28d628297..7a3fc1af6944 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig | |||
| @@ -34,7 +34,6 @@ config UX500_SOC_COMMON | |||
| 34 | 34 | ||
| 35 | config UX500_SOC_DB8500 | 35 | config UX500_SOC_DB8500 |
| 36 | bool | 36 | bool |
| 37 | select CPU_FREQ_TABLE if CPU_FREQ | ||
| 38 | select MFD_DB8500_PRCMU | 37 | select MFD_DB8500_PRCMU |
| 39 | select PINCTRL_DB8500 | 38 | select PINCTRL_DB8500 |
| 40 | select PINCTRL_DB8540 | 39 | select PINCTRL_DB8540 |
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 5f252569c689..9a7bd137c8fd 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c | |||
| @@ -44,6 +44,10 @@ static struct of_device_id zynq_of_bus_ids[] __initdata = { | |||
| 44 | {} | 44 | {} |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | static struct platform_device zynq_cpuidle_device = { | ||
| 48 | .name = "cpuidle-zynq", | ||
| 49 | }; | ||
| 50 | |||
| 47 | /** | 51 | /** |
| 48 | * zynq_init_machine - System specific initialization, intended to be | 52 | * zynq_init_machine - System specific initialization, intended to be |
| 49 | * called from board specific initialization. | 53 | * called from board specific initialization. |
| @@ -56,6 +60,8 @@ static void __init zynq_init_machine(void) | |||
| 56 | l2x0_of_init(0x02060000, 0xF0F0FFFF); | 60 | l2x0_of_init(0x02060000, 0xF0F0FFFF); |
| 57 | 61 | ||
| 58 | of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL); | 62 | of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL); |
| 63 | |||
| 64 | platform_device_register(&zynq_cpuidle_device); | ||
| 59 | } | 65 | } |
| 60 | 66 | ||
| 61 | static void __init zynq_timer_init(void) | 67 | static void __init zynq_timer_init(void) |
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index f5e1a8471714..1272ed202dde 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c | |||
| @@ -1232,7 +1232,8 @@ __iommu_create_mapping(struct device *dev, struct page **pages, size_t size) | |||
| 1232 | break; | 1232 | break; |
| 1233 | 1233 | ||
| 1234 | len = (j - i) << PAGE_SHIFT; | 1234 | len = (j - i) << PAGE_SHIFT; |
| 1235 | ret = iommu_map(mapping->domain, iova, phys, len, 0); | 1235 | ret = iommu_map(mapping->domain, iova, phys, len, |
| 1236 | IOMMU_READ|IOMMU_WRITE); | ||
| 1236 | if (ret < 0) | 1237 | if (ret < 0) |
| 1237 | goto fail; | 1238 | goto fail; |
| 1238 | iova += len; | 1239 | iova += len; |
| @@ -1431,6 +1432,27 @@ static int arm_iommu_get_sgtable(struct device *dev, struct sg_table *sgt, | |||
| 1431 | GFP_KERNEL); | 1432 | GFP_KERNEL); |
| 1432 | } | 1433 | } |
| 1433 | 1434 | ||
| 1435 | static int __dma_direction_to_prot(enum dma_data_direction dir) | ||
| 1436 | { | ||
| 1437 | int prot; | ||
| 1438 | |||
| 1439 | switch (dir) { | ||
| 1440 | case DMA_BIDIRECTIONAL: | ||
| 1441 | prot = IOMMU_READ | IOMMU_WRITE; | ||
| 1442 | break; | ||
| 1443 | case DMA_TO_DEVICE: | ||
| 1444 | prot = IOMMU_READ; | ||
| 1445 | break; | ||
| 1446 | case DMA_FROM_DEVICE: | ||
| 1447 | prot = IOMMU_WRITE; | ||
| 1448 | break; | ||
| 1449 | default: | ||
| 1450 | prot = 0; | ||
| 1451 | } | ||
| 1452 | |||
| 1453 | return prot; | ||
| 1454 | } | ||
| 1455 | |||
| 1434 | /* | 1456 | /* |
| 1435 | * Map a part of the scatter-gather list into contiguous io address space | 1457 | * Map a part of the scatter-gather list into contiguous io address space |
| 1436 | */ | 1458 | */ |
| @@ -1444,6 +1466,7 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, | |||
| 1444 | int ret = 0; | 1466 | int ret = 0; |
| 1445 | unsigned int count; | 1467 | unsigned int count; |
| 1446 | struct scatterlist *s; | 1468 | struct scatterlist *s; |
| 1469 | int prot; | ||
| 1447 | 1470 | ||
| 1448 | size = PAGE_ALIGN(size); | 1471 | size = PAGE_ALIGN(size); |
| 1449 | *handle = DMA_ERROR_CODE; | 1472 | *handle = DMA_ERROR_CODE; |
| @@ -1460,7 +1483,9 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, | |||
| 1460 | !dma_get_attr(DMA_ATTR_SKIP_CPU_SYNC, attrs)) | 1483 | !dma_get_attr(DMA_ATTR_SKIP_CPU_SYNC, attrs)) |
| 1461 | __dma_page_cpu_to_dev(sg_page(s), s->offset, s->length, dir); | 1484 | __dma_page_cpu_to_dev(sg_page(s), s->offset, s->length, dir); |
| 1462 | 1485 | ||
| 1463 | ret = iommu_map(mapping->domain, iova, phys, len, 0); | 1486 | prot = __dma_direction_to_prot(dir); |
| 1487 | |||
| 1488 | ret = iommu_map(mapping->domain, iova, phys, len, prot); | ||
| 1464 | if (ret < 0) | 1489 | if (ret < 0) |
| 1465 | goto fail; | 1490 | goto fail; |
| 1466 | count += len >> PAGE_SHIFT; | 1491 | count += len >> PAGE_SHIFT; |
| @@ -1665,19 +1690,7 @@ static dma_addr_t arm_coherent_iommu_map_page(struct device *dev, struct page *p | |||
| 1665 | if (dma_addr == DMA_ERROR_CODE) | 1690 | if (dma_addr == DMA_ERROR_CODE) |
| 1666 | return dma_addr; | 1691 | return dma_addr; |
| 1667 | 1692 | ||
| 1668 | switch (dir) { | 1693 | prot = __dma_direction_to_prot(dir); |
| 1669 | case DMA_BIDIRECTIONAL: | ||
| 1670 | prot = IOMMU_READ | IOMMU_WRITE; | ||
| 1671 | break; | ||
| 1672 | case DMA_TO_DEVICE: | ||
| 1673 | prot = IOMMU_READ; | ||
| 1674 | break; | ||
| 1675 | case DMA_FROM_DEVICE: | ||
| 1676 | prot = IOMMU_WRITE; | ||
| 1677 | break; | ||
| 1678 | default: | ||
| 1679 | prot = 0; | ||
| 1680 | } | ||
| 1681 | 1694 | ||
| 1682 | ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page), len, prot); | 1695 | ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page), len, prot); |
| 1683 | if (ret < 0) | 1696 | if (ret < 0) |
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index febaee7ca57b..18ec4c504abf 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/nodemask.h> | 17 | #include <linux/nodemask.h> |
| 18 | #include <linux/initrd.h> | 18 | #include <linux/initrd.h> |
| 19 | #include <linux/of_fdt.h> | 19 | #include <linux/of_fdt.h> |
| 20 | #include <linux/of_reserved_mem.h> | ||
| 21 | #include <linux/highmem.h> | 20 | #include <linux/highmem.h> |
| 22 | #include <linux/gfp.h> | 21 | #include <linux/gfp.h> |
| 23 | #include <linux/memblock.h> | 22 | #include <linux/memblock.h> |
| @@ -379,8 +378,6 @@ void __init arm_memblock_init(struct meminfo *mi, | |||
| 379 | if (mdesc->reserve) | 378 | if (mdesc->reserve) |
| 380 | mdesc->reserve(); | 379 | mdesc->reserve(); |
| 381 | 380 | ||
| 382 | early_init_dt_scan_reserved_mem(); | ||
| 383 | |||
| 384 | /* | 381 | /* |
| 385 | * reserve memory for DMA contigouos allocations, | 382 | * reserve memory for DMA contigouos allocations, |
| 386 | * must come from DMA area inside low memory | 383 | * must come from DMA area inside low memory |
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index f50d223a0bd3..99b44e0e8d86 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c | |||
| @@ -930,4 +930,5 @@ void bpf_jit_free(struct sk_filter *fp) | |||
| 930 | { | 930 | { |
| 931 | if (fp->bpf_func != sk_run_filter) | 931 | if (fp->bpf_func != sk_run_filter) |
| 932 | module_free(NULL, fp->bpf_func); | 932 | module_free(NULL, fp->bpf_func); |
| 933 | kfree(fp); | ||
| 933 | } | 934 | } |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index f78c9a2c7e28..eb382aedd9a2 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -1429,7 +1429,6 @@ source "drivers/cpufreq/Kconfig" | |||
| 1429 | config BFIN_CPU_FREQ | 1429 | config BFIN_CPU_FREQ |
| 1430 | bool | 1430 | bool |
| 1431 | depends on CPU_FREQ | 1431 | depends on CPU_FREQ |
| 1432 | select CPU_FREQ_TABLE | ||
| 1433 | default y | 1432 | default y |
| 1434 | 1433 | ||
| 1435 | config CPU_VOLTAGE | 1434 | config CPU_VOLTAGE |
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 02380bed189c..9c957c81c688 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
| @@ -130,13 +130,11 @@ config SVINTO_SIM | |||
| 130 | 130 | ||
| 131 | config ETRAXFS | 131 | config ETRAXFS |
| 132 | bool "ETRAX-FS-V32" | 132 | bool "ETRAX-FS-V32" |
| 133 | select CPU_FREQ_TABLE if CPU_FREQ | ||
| 134 | help | 133 | help |
| 135 | Support CRIS V32. | 134 | Support CRIS V32. |
| 136 | 135 | ||
| 137 | config CRIS_MACH_ARTPEC3 | 136 | config CRIS_MACH_ARTPEC3 |
| 138 | bool "ARTPEC-3" | 137 | bool "ARTPEC-3" |
| 139 | select CPU_FREQ_TABLE if CPU_FREQ | ||
| 140 | help | 138 | help |
| 141 | Support Axis ARTPEC-3. | 139 | Support Axis ARTPEC-3. |
| 142 | 140 | ||
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 5eb71d22c3d5..59d52e3aef12 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
| @@ -882,40 +882,10 @@ __init void prefill_possible_map(void) | |||
| 882 | set_cpu_possible(i, true); | 882 | set_cpu_possible(i, true); |
| 883 | } | 883 | } |
| 884 | 884 | ||
| 885 | static int _acpi_map_lsapic(acpi_handle handle, int *pcpu) | 885 | static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) |
| 886 | { | 886 | { |
| 887 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | ||
| 888 | union acpi_object *obj; | ||
| 889 | struct acpi_madt_local_sapic *lsapic; | ||
| 890 | cpumask_t tmp_map; | 887 | cpumask_t tmp_map; |
| 891 | int cpu, physid; | 888 | int cpu; |
| 892 | |||
| 893 | if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer))) | ||
| 894 | return -EINVAL; | ||
| 895 | |||
| 896 | if (!buffer.length || !buffer.pointer) | ||
| 897 | return -EINVAL; | ||
| 898 | |||
| 899 | obj = buffer.pointer; | ||
| 900 | if (obj->type != ACPI_TYPE_BUFFER) | ||
| 901 | { | ||
| 902 | kfree(buffer.pointer); | ||
| 903 | return -EINVAL; | ||
| 904 | } | ||
| 905 | |||
| 906 | lsapic = (struct acpi_madt_local_sapic *)obj->buffer.pointer; | ||
| 907 | |||
| 908 | if ((lsapic->header.type != ACPI_MADT_TYPE_LOCAL_SAPIC) || | ||
| 909 | (!(lsapic->lapic_flags & ACPI_MADT_ENABLED))) { | ||
| 910 | kfree(buffer.pointer); | ||
| 911 | return -EINVAL; | ||
| 912 | } | ||
| 913 | |||
| 914 | physid = ((lsapic->id << 8) | (lsapic->eid)); | ||
| 915 | |||
| 916 | kfree(buffer.pointer); | ||
| 917 | buffer.length = ACPI_ALLOCATE_BUFFER; | ||
| 918 | buffer.pointer = NULL; | ||
| 919 | 889 | ||
| 920 | cpumask_complement(&tmp_map, cpu_present_mask); | 890 | cpumask_complement(&tmp_map, cpu_present_mask); |
| 921 | cpu = cpumask_first(&tmp_map); | 891 | cpu = cpumask_first(&tmp_map); |
| @@ -934,9 +904,9 @@ static int _acpi_map_lsapic(acpi_handle handle, int *pcpu) | |||
| 934 | } | 904 | } |
| 935 | 905 | ||
| 936 | /* wrapper to silence section mismatch warning */ | 906 | /* wrapper to silence section mismatch warning */ |
| 937 | int __ref acpi_map_lsapic(acpi_handle handle, int *pcpu) | 907 | int __ref acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) |
| 938 | { | 908 | { |
| 939 | return _acpi_map_lsapic(handle, pcpu); | 909 | return _acpi_map_lsapic(handle, physid, pcpu); |
| 940 | } | 910 | } |
| 941 | EXPORT_SYMBOL(acpi_map_lsapic); | 911 | EXPORT_SYMBOL(acpi_map_lsapic); |
| 942 | 912 | ||
diff --git a/arch/mips/include/asm/jump_label.h b/arch/mips/include/asm/jump_label.h index 4d6d77ed9b9d..e194f957ca8c 100644 --- a/arch/mips/include/asm/jump_label.h +++ b/arch/mips/include/asm/jump_label.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | static __always_inline bool arch_static_branch(struct static_key *key) | 23 | static __always_inline bool arch_static_branch(struct static_key *key) |
| 24 | { | 24 | { |
| 25 | asm goto("1:\tnop\n\t" | 25 | asm_volatile_goto("1:\tnop\n\t" |
| 26 | "nop\n\t" | 26 | "nop\n\t" |
| 27 | ".pushsection __jump_table, \"aw\"\n\t" | 27 | ".pushsection __jump_table, \"aw\"\n\t" |
| 28 | WORD_INSN " 1b, %l[l_yes], %0\n\t" | 28 | WORD_INSN " 1b, %l[l_yes], %0\n\t" |
diff --git a/arch/mips/kernel/octeon_switch.S b/arch/mips/kernel/octeon_switch.S index 4204d76af854..029e002a4ea0 100644 --- a/arch/mips/kernel/octeon_switch.S +++ b/arch/mips/kernel/octeon_switch.S | |||
| @@ -73,7 +73,7 @@ | |||
| 73 | 3: | 73 | 3: |
| 74 | 74 | ||
| 75 | #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) | 75 | #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) |
| 76 | PTR_L t8, __stack_chk_guard | 76 | PTR_LA t8, __stack_chk_guard |
| 77 | LONG_L t9, TASK_STACK_CANARY(a1) | 77 | LONG_L t9, TASK_STACK_CANARY(a1) |
| 78 | LONG_S t9, 0(t8) | 78 | LONG_S t9, 0(t8) |
| 79 | #endif | 79 | #endif |
diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S index 38af83f84c4a..20b7b040e76f 100644 --- a/arch/mips/kernel/r2300_switch.S +++ b/arch/mips/kernel/r2300_switch.S | |||
| @@ -67,7 +67,7 @@ LEAF(resume) | |||
| 67 | 1: | 67 | 1: |
| 68 | 68 | ||
| 69 | #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) | 69 | #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) |
| 70 | PTR_L t8, __stack_chk_guard | 70 | PTR_LA t8, __stack_chk_guard |
| 71 | LONG_L t9, TASK_STACK_CANARY(a1) | 71 | LONG_L t9, TASK_STACK_CANARY(a1) |
| 72 | LONG_S t9, 0(t8) | 72 | LONG_S t9, 0(t8) |
| 73 | #endif | 73 | #endif |
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S index 921238a6bd26..078de5eaca8f 100644 --- a/arch/mips/kernel/r4k_switch.S +++ b/arch/mips/kernel/r4k_switch.S | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | 1: | 69 | 1: |
| 70 | 70 | ||
| 71 | #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) | 71 | #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) |
| 72 | PTR_L t8, __stack_chk_guard | 72 | PTR_LA t8, __stack_chk_guard |
| 73 | LONG_L t9, TASK_STACK_CANARY(a1) | 73 | LONG_L t9, TASK_STACK_CANARY(a1) |
| 74 | LONG_S t9, 0(t8) | 74 | LONG_S t9, 0(t8) |
| 75 | #endif | 75 | #endif |
diff --git a/arch/parisc/configs/712_defconfig b/arch/parisc/configs/712_defconfig index 0f90569b9d85..9387cc2693f6 100644 --- a/arch/parisc/configs/712_defconfig +++ b/arch/parisc/configs/712_defconfig | |||
| @@ -40,6 +40,8 @@ CONFIG_IP_NF_QUEUE=m | |||
| 40 | CONFIG_LLC2=m | 40 | CONFIG_LLC2=m |
| 41 | CONFIG_NET_PKTGEN=m | 41 | CONFIG_NET_PKTGEN=m |
| 42 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 42 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 43 | CONFIG_DEVTMPFS=y | ||
| 44 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 43 | # CONFIG_STANDALONE is not set | 45 | # CONFIG_STANDALONE is not set |
| 44 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 46 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 45 | CONFIG_PARPORT=y | 47 | CONFIG_PARPORT=y |
diff --git a/arch/parisc/configs/a500_defconfig b/arch/parisc/configs/a500_defconfig index b647b182dacc..90025322b75e 100644 --- a/arch/parisc/configs/a500_defconfig +++ b/arch/parisc/configs/a500_defconfig | |||
| @@ -79,6 +79,8 @@ CONFIG_IP_DCCP=m | |||
| 79 | CONFIG_LLC2=m | 79 | CONFIG_LLC2=m |
| 80 | CONFIG_NET_PKTGEN=m | 80 | CONFIG_NET_PKTGEN=m |
| 81 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 81 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 82 | CONFIG_DEVTMPFS=y | ||
| 83 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 82 | # CONFIG_STANDALONE is not set | 84 | # CONFIG_STANDALONE is not set |
| 83 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 85 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 84 | CONFIG_BLK_DEV_UMEM=m | 86 | CONFIG_BLK_DEV_UMEM=m |
diff --git a/arch/parisc/configs/b180_defconfig b/arch/parisc/configs/b180_defconfig index e289f5bf3148..f1a0c25bef8d 100644 --- a/arch/parisc/configs/b180_defconfig +++ b/arch/parisc/configs/b180_defconfig | |||
| @@ -4,6 +4,7 @@ CONFIG_IKCONFIG=y | |||
| 4 | CONFIG_IKCONFIG_PROC=y | 4 | CONFIG_IKCONFIG_PROC=y |
| 5 | CONFIG_LOG_BUF_SHIFT=16 | 5 | CONFIG_LOG_BUF_SHIFT=16 |
| 6 | CONFIG_SYSFS_DEPRECATED_V2=y | 6 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 7 | CONFIG_BLK_DEV_INITRD=y | ||
| 7 | CONFIG_SLAB=y | 8 | CONFIG_SLAB=y |
| 8 | CONFIG_MODULES=y | 9 | CONFIG_MODULES=y |
| 9 | CONFIG_MODVERSIONS=y | 10 | CONFIG_MODVERSIONS=y |
| @@ -27,6 +28,8 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 27 | # CONFIG_INET_LRO is not set | 28 | # CONFIG_INET_LRO is not set |
| 28 | CONFIG_IPV6=y | 29 | CONFIG_IPV6=y |
| 29 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 30 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 31 | CONFIG_DEVTMPFS=y | ||
| 32 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 30 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 33 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 31 | CONFIG_PARPORT=y | 34 | CONFIG_PARPORT=y |
| 32 | CONFIG_PARPORT_PC=y | 35 | CONFIG_PARPORT_PC=y |
diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig index 311ca367b622..ec1b014952b6 100644 --- a/arch/parisc/configs/c3000_defconfig +++ b/arch/parisc/configs/c3000_defconfig | |||
| @@ -5,6 +5,7 @@ CONFIG_IKCONFIG=y | |||
| 5 | CONFIG_IKCONFIG_PROC=y | 5 | CONFIG_IKCONFIG_PROC=y |
| 6 | CONFIG_LOG_BUF_SHIFT=16 | 6 | CONFIG_LOG_BUF_SHIFT=16 |
| 7 | CONFIG_SYSFS_DEPRECATED_V2=y | 7 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 8 | CONFIG_BLK_DEV_INITRD=y | ||
| 8 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 9 | CONFIG_EXPERT=y | 10 | CONFIG_EXPERT=y |
| 10 | CONFIG_KALLSYMS_ALL=y | 11 | CONFIG_KALLSYMS_ALL=y |
| @@ -39,6 +40,8 @@ CONFIG_NETFILTER_DEBUG=y | |||
| 39 | CONFIG_IP_NF_QUEUE=m | 40 | CONFIG_IP_NF_QUEUE=m |
| 40 | CONFIG_NET_PKTGEN=m | 41 | CONFIG_NET_PKTGEN=m |
| 41 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 42 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 43 | CONFIG_DEVTMPFS=y | ||
| 44 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 42 | # CONFIG_STANDALONE is not set | 45 | # CONFIG_STANDALONE is not set |
| 43 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 46 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 44 | CONFIG_BLK_DEV_UMEM=m | 47 | CONFIG_BLK_DEV_UMEM=m |
diff --git a/arch/parisc/configs/c8000_defconfig b/arch/parisc/configs/c8000_defconfig index f11006361297..e1c8d2015c89 100644 --- a/arch/parisc/configs/c8000_defconfig +++ b/arch/parisc/configs/c8000_defconfig | |||
| @@ -62,6 +62,8 @@ CONFIG_TIPC=m | |||
| 62 | CONFIG_LLC2=m | 62 | CONFIG_LLC2=m |
| 63 | CONFIG_DNS_RESOLVER=y | 63 | CONFIG_DNS_RESOLVER=y |
| 64 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 64 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 65 | CONFIG_DEVTMPFS=y | ||
| 66 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 65 | # CONFIG_STANDALONE is not set | 67 | # CONFIG_STANDALONE is not set |
| 66 | CONFIG_PARPORT=y | 68 | CONFIG_PARPORT=y |
| 67 | CONFIG_PARPORT_PC=y | 69 | CONFIG_PARPORT_PC=y |
diff --git a/arch/parisc/configs/default_defconfig b/arch/parisc/configs/default_defconfig index dfe88f6c95c4..ba61495e1fa4 100644 --- a/arch/parisc/configs/default_defconfig +++ b/arch/parisc/configs/default_defconfig | |||
| @@ -49,6 +49,8 @@ CONFIG_INET6_ESP=y | |||
| 49 | CONFIG_INET6_IPCOMP=y | 49 | CONFIG_INET6_IPCOMP=y |
| 50 | CONFIG_LLC2=m | 50 | CONFIG_LLC2=m |
| 51 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 51 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 52 | CONFIG_DEVTMPFS=y | ||
| 53 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 52 | # CONFIG_STANDALONE is not set | 54 | # CONFIG_STANDALONE is not set |
| 53 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 55 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 54 | CONFIG_PARPORT=y | 56 | CONFIG_PARPORT=y |
diff --git a/arch/parisc/include/asm/traps.h b/arch/parisc/include/asm/traps.h index 1945f995f2df..4736020ba5ea 100644 --- a/arch/parisc/include/asm/traps.h +++ b/arch/parisc/include/asm/traps.h | |||
| @@ -6,7 +6,7 @@ struct pt_regs; | |||
| 6 | 6 | ||
| 7 | /* traps.c */ | 7 | /* traps.c */ |
| 8 | void parisc_terminate(char *msg, struct pt_regs *regs, | 8 | void parisc_terminate(char *msg, struct pt_regs *regs, |
| 9 | int code, unsigned long offset); | 9 | int code, unsigned long offset) __noreturn __cold; |
| 10 | 10 | ||
| 11 | /* mm/fault.c */ | 11 | /* mm/fault.c */ |
| 12 | void do_page_fault(struct pt_regs *regs, unsigned long code, | 12 | void do_page_fault(struct pt_regs *regs, unsigned long code, |
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index 37aabd772fbb..d2d58258aea6 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S | |||
| @@ -195,6 +195,8 @@ common_stext: | |||
| 195 | ldw MEM_PDC_HI(%r0),%r6 | 195 | ldw MEM_PDC_HI(%r0),%r6 |
| 196 | depd %r6, 31, 32, %r3 /* move to upper word */ | 196 | depd %r6, 31, 32, %r3 /* move to upper word */ |
| 197 | 197 | ||
| 198 | mfctl %cr30,%r6 /* PCX-W2 firmware bug */ | ||
| 199 | |||
| 198 | ldo PDC_PSW(%r0),%arg0 /* 21 */ | 200 | ldo PDC_PSW(%r0),%arg0 /* 21 */ |
| 199 | ldo PDC_PSW_SET_DEFAULTS(%r0),%arg1 /* 2 */ | 201 | ldo PDC_PSW_SET_DEFAULTS(%r0),%arg1 /* 2 */ |
| 200 | ldo PDC_PSW_WIDE_BIT(%r0),%arg2 /* 2 */ | 202 | ldo PDC_PSW_WIDE_BIT(%r0),%arg2 /* 2 */ |
| @@ -203,6 +205,8 @@ common_stext: | |||
| 203 | copy %r0,%arg3 | 205 | copy %r0,%arg3 |
| 204 | 206 | ||
| 205 | stext_pdc_ret: | 207 | stext_pdc_ret: |
| 208 | mtctl %r6,%cr30 /* restore task thread info */ | ||
| 209 | |||
| 206 | /* restore rfi target address*/ | 210 | /* restore rfi target address*/ |
| 207 | ldd TI_TASK-THREAD_SZ_ALGN(%sp), %r10 | 211 | ldd TI_TASK-THREAD_SZ_ALGN(%sp), %r10 |
| 208 | tophys_r1 %r10 | 212 | tophys_r1 %r10 |
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index 8a252f2d6c08..2b96602e812f 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c | |||
| @@ -72,7 +72,6 @@ enum ipi_message_type { | |||
| 72 | IPI_NOP=0, | 72 | IPI_NOP=0, |
| 73 | IPI_RESCHEDULE=1, | 73 | IPI_RESCHEDULE=1, |
| 74 | IPI_CALL_FUNC, | 74 | IPI_CALL_FUNC, |
| 75 | IPI_CALL_FUNC_SINGLE, | ||
| 76 | IPI_CPU_START, | 75 | IPI_CPU_START, |
| 77 | IPI_CPU_STOP, | 76 | IPI_CPU_STOP, |
| 78 | IPI_CPU_TEST | 77 | IPI_CPU_TEST |
| @@ -164,11 +163,6 @@ ipi_interrupt(int irq, void *dev_id) | |||
| 164 | generic_smp_call_function_interrupt(); | 163 | generic_smp_call_function_interrupt(); |
| 165 | break; | 164 | break; |
| 166 | 165 | ||
| 167 | case IPI_CALL_FUNC_SINGLE: | ||
| 168 | smp_debug(100, KERN_DEBUG "CPU%d IPI_CALL_FUNC_SINGLE\n", this_cpu); | ||
| 169 | generic_smp_call_function_single_interrupt(); | ||
| 170 | break; | ||
| 171 | |||
| 172 | case IPI_CPU_START: | 166 | case IPI_CPU_START: |
| 173 | smp_debug(100, KERN_DEBUG "CPU%d IPI_CPU_START\n", this_cpu); | 167 | smp_debug(100, KERN_DEBUG "CPU%d IPI_CPU_START\n", this_cpu); |
| 174 | break; | 168 | break; |
| @@ -260,7 +254,7 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask) | |||
| 260 | 254 | ||
| 261 | void arch_send_call_function_single_ipi(int cpu) | 255 | void arch_send_call_function_single_ipi(int cpu) |
| 262 | { | 256 | { |
| 263 | send_IPI_single(cpu, IPI_CALL_FUNC_SINGLE); | 257 | send_IPI_single(cpu, IPI_CALL_FUNC); |
| 264 | } | 258 | } |
| 265 | 259 | ||
| 266 | /* | 260 | /* |
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 04e47c6a4562..1cd1d0c83b6d 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c | |||
| @@ -291,11 +291,6 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err) | |||
| 291 | do_exit(SIGSEGV); | 291 | do_exit(SIGSEGV); |
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | int syscall_ipi(int (*syscall) (struct pt_regs *), struct pt_regs *regs) | ||
| 295 | { | ||
| 296 | return syscall(regs); | ||
| 297 | } | ||
| 298 | |||
| 299 | /* gdb uses break 4,8 */ | 294 | /* gdb uses break 4,8 */ |
| 300 | #define GDB_BREAK_INSN 0x10004 | 295 | #define GDB_BREAK_INSN 0x10004 |
| 301 | static void handle_gdb_break(struct pt_regs *regs, int wot) | 296 | static void handle_gdb_break(struct pt_regs *regs, int wot) |
| @@ -805,14 +800,14 @@ void notrace handle_interruption(int code, struct pt_regs *regs) | |||
| 805 | else { | 800 | else { |
| 806 | 801 | ||
| 807 | /* | 802 | /* |
| 808 | * The kernel should never fault on its own address space. | 803 | * The kernel should never fault on its own address space, |
| 804 | * unless pagefault_disable() was called before. | ||
| 809 | */ | 805 | */ |
| 810 | 806 | ||
| 811 | if (fault_space == 0) | 807 | if (fault_space == 0 && !in_atomic()) |
| 812 | { | 808 | { |
| 813 | pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC); | 809 | pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC); |
| 814 | parisc_terminate("Kernel Fault", regs, code, fault_address); | 810 | parisc_terminate("Kernel Fault", regs, code, fault_address); |
| 815 | |||
| 816 | } | 811 | } |
| 817 | } | 812 | } |
| 818 | 813 | ||
diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c index ac4370b1ca40..b5507ec06b84 100644 --- a/arch/parisc/lib/memcpy.c +++ b/arch/parisc/lib/memcpy.c | |||
| @@ -56,7 +56,7 @@ | |||
| 56 | #ifdef __KERNEL__ | 56 | #ifdef __KERNEL__ |
| 57 | #include <linux/module.h> | 57 | #include <linux/module.h> |
| 58 | #include <linux/compiler.h> | 58 | #include <linux/compiler.h> |
| 59 | #include <asm/uaccess.h> | 59 | #include <linux/uaccess.h> |
| 60 | #define s_space "%%sr1" | 60 | #define s_space "%%sr1" |
| 61 | #define d_space "%%sr2" | 61 | #define d_space "%%sr2" |
| 62 | #else | 62 | #else |
| @@ -524,4 +524,17 @@ EXPORT_SYMBOL(copy_to_user); | |||
| 524 | EXPORT_SYMBOL(copy_from_user); | 524 | EXPORT_SYMBOL(copy_from_user); |
| 525 | EXPORT_SYMBOL(copy_in_user); | 525 | EXPORT_SYMBOL(copy_in_user); |
| 526 | EXPORT_SYMBOL(memcpy); | 526 | EXPORT_SYMBOL(memcpy); |
| 527 | |||
| 528 | long probe_kernel_read(void *dst, const void *src, size_t size) | ||
| 529 | { | ||
| 530 | unsigned long addr = (unsigned long)src; | ||
| 531 | |||
| 532 | if (size < 0 || addr < PAGE_SIZE) | ||
| 533 | return -EFAULT; | ||
| 534 | |||
| 535 | /* check for I/O space F_EXTEND(0xfff00000) access as well? */ | ||
| 536 | |||
| 537 | return __probe_kernel_read(dst, src, size); | ||
| 538 | } | ||
| 539 | |||
| 527 | #endif | 540 | #endif |
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index 00c0ed333a3d..0293588d5b8c 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c | |||
| @@ -171,20 +171,25 @@ void do_page_fault(struct pt_regs *regs, unsigned long code, | |||
| 171 | unsigned long address) | 171 | unsigned long address) |
| 172 | { | 172 | { |
| 173 | struct vm_area_struct *vma, *prev_vma; | 173 | struct vm_area_struct *vma, *prev_vma; |
| 174 | struct task_struct *tsk = current; | 174 | struct task_struct *tsk; |
| 175 | struct mm_struct *mm = tsk->mm; | 175 | struct mm_struct *mm; |
| 176 | unsigned long acc_type; | 176 | unsigned long acc_type; |
| 177 | int fault; | 177 | int fault; |
| 178 | unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE; | 178 | unsigned int flags; |
| 179 | 179 | ||
| 180 | if (in_atomic() || !mm) | 180 | if (in_atomic()) |
| 181 | goto no_context; | 181 | goto no_context; |
| 182 | 182 | ||
| 183 | tsk = current; | ||
| 184 | mm = tsk->mm; | ||
| 185 | if (!mm) | ||
| 186 | goto no_context; | ||
| 187 | |||
| 188 | flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE; | ||
| 183 | if (user_mode(regs)) | 189 | if (user_mode(regs)) |
| 184 | flags |= FAULT_FLAG_USER; | 190 | flags |= FAULT_FLAG_USER; |
| 185 | 191 | ||
| 186 | acc_type = parisc_acctyp(code, regs->iir); | 192 | acc_type = parisc_acctyp(code, regs->iir); |
| 187 | |||
| 188 | if (acc_type & VM_WRITE) | 193 | if (acc_type & VM_WRITE) |
| 189 | flags |= FAULT_FLAG_WRITE; | 194 | flags |= FAULT_FLAG_WRITE; |
| 190 | retry: | 195 | retry: |
diff --git a/arch/powerpc/include/asm/jump_label.h b/arch/powerpc/include/asm/jump_label.h index ae098c438f00..f016bb699b5f 100644 --- a/arch/powerpc/include/asm/jump_label.h +++ b/arch/powerpc/include/asm/jump_label.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | static __always_inline bool arch_static_branch(struct static_key *key) | 20 | static __always_inline bool arch_static_branch(struct static_key *key) |
| 21 | { | 21 | { |
| 22 | asm goto("1:\n\t" | 22 | asm_volatile_goto("1:\n\t" |
| 23 | "nop\n\t" | 23 | "nop\n\t" |
| 24 | ".pushsection __jump_table, \"aw\"\n\t" | 24 | ".pushsection __jump_table, \"aw\"\n\t" |
| 25 | JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t" | 25 | JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t" |
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 57d286a78f86..c7cb8c232d2f 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
| @@ -495,14 +495,15 @@ void __do_irq(struct pt_regs *regs) | |||
| 495 | void do_IRQ(struct pt_regs *regs) | 495 | void do_IRQ(struct pt_regs *regs) |
| 496 | { | 496 | { |
| 497 | struct pt_regs *old_regs = set_irq_regs(regs); | 497 | struct pt_regs *old_regs = set_irq_regs(regs); |
| 498 | struct thread_info *curtp, *irqtp; | 498 | struct thread_info *curtp, *irqtp, *sirqtp; |
| 499 | 499 | ||
| 500 | /* Switch to the irq stack to handle this */ | 500 | /* Switch to the irq stack to handle this */ |
| 501 | curtp = current_thread_info(); | 501 | curtp = current_thread_info(); |
| 502 | irqtp = hardirq_ctx[raw_smp_processor_id()]; | 502 | irqtp = hardirq_ctx[raw_smp_processor_id()]; |
| 503 | sirqtp = softirq_ctx[raw_smp_processor_id()]; | ||
| 503 | 504 | ||
| 504 | /* Already there ? */ | 505 | /* Already there ? */ |
| 505 | if (unlikely(curtp == irqtp)) { | 506 | if (unlikely(curtp == irqtp || curtp == sirqtp)) { |
| 506 | __do_irq(regs); | 507 | __do_irq(regs); |
| 507 | set_irq_regs(old_regs); | 508 | set_irq_regs(old_regs); |
| 508 | return; | 509 | return; |
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 8e59abc237d7..930cd8af3503 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
| @@ -844,18 +844,6 @@ void __cpu_die(unsigned int cpu) | |||
| 844 | smp_ops->cpu_die(cpu); | 844 | smp_ops->cpu_die(cpu); |
| 845 | } | 845 | } |
| 846 | 846 | ||
| 847 | static DEFINE_MUTEX(powerpc_cpu_hotplug_driver_mutex); | ||
| 848 | |||
| 849 | void cpu_hotplug_driver_lock() | ||
| 850 | { | ||
| 851 | mutex_lock(&powerpc_cpu_hotplug_driver_mutex); | ||
| 852 | } | ||
| 853 | |||
| 854 | void cpu_hotplug_driver_unlock() | ||
| 855 | { | ||
| 856 | mutex_unlock(&powerpc_cpu_hotplug_driver_mutex); | ||
| 857 | } | ||
| 858 | |||
| 859 | void cpu_die(void) | 847 | void cpu_die(void) |
| 860 | { | 848 | { |
| 861 | if (ppc_md.cpu_die) | 849 | if (ppc_md.cpu_die) |
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index 294b7af28cdd..c71103b8a748 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S | |||
| @@ -1066,7 +1066,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206) | |||
| 1066 | BEGIN_FTR_SECTION | 1066 | BEGIN_FTR_SECTION |
| 1067 | mfspr r8, SPRN_DSCR | 1067 | mfspr r8, SPRN_DSCR |
| 1068 | ld r7, HSTATE_DSCR(r13) | 1068 | ld r7, HSTATE_DSCR(r13) |
| 1069 | std r8, VCPU_DSCR(r7) | 1069 | std r8, VCPU_DSCR(r9) |
| 1070 | mtspr SPRN_DSCR, r7 | 1070 | mtspr SPRN_DSCR, r7 |
| 1071 | END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206) | 1071 | END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206) |
| 1072 | 1072 | ||
diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 1c6a9d729df4..c65593abae8e 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c | |||
| @@ -332,6 +332,13 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, | |||
| 332 | unsigned long hva; | 332 | unsigned long hva; |
| 333 | int pfnmap = 0; | 333 | int pfnmap = 0; |
| 334 | int tsize = BOOK3E_PAGESZ_4K; | 334 | int tsize = BOOK3E_PAGESZ_4K; |
| 335 | int ret = 0; | ||
| 336 | unsigned long mmu_seq; | ||
| 337 | struct kvm *kvm = vcpu_e500->vcpu.kvm; | ||
| 338 | |||
| 339 | /* used to check for invalidations in progress */ | ||
| 340 | mmu_seq = kvm->mmu_notifier_seq; | ||
| 341 | smp_rmb(); | ||
| 335 | 342 | ||
| 336 | /* | 343 | /* |
| 337 | * Translate guest physical to true physical, acquiring | 344 | * Translate guest physical to true physical, acquiring |
| @@ -449,6 +456,12 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, | |||
| 449 | gvaddr &= ~((tsize_pages << PAGE_SHIFT) - 1); | 456 | gvaddr &= ~((tsize_pages << PAGE_SHIFT) - 1); |
| 450 | } | 457 | } |
| 451 | 458 | ||
| 459 | spin_lock(&kvm->mmu_lock); | ||
| 460 | if (mmu_notifier_retry(kvm, mmu_seq)) { | ||
| 461 | ret = -EAGAIN; | ||
| 462 | goto out; | ||
| 463 | } | ||
| 464 | |||
| 452 | kvmppc_e500_ref_setup(ref, gtlbe, pfn); | 465 | kvmppc_e500_ref_setup(ref, gtlbe, pfn); |
| 453 | 466 | ||
| 454 | kvmppc_e500_setup_stlbe(&vcpu_e500->vcpu, gtlbe, tsize, | 467 | kvmppc_e500_setup_stlbe(&vcpu_e500->vcpu, gtlbe, tsize, |
| @@ -457,10 +470,13 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, | |||
| 457 | /* Clear i-cache for new pages */ | 470 | /* Clear i-cache for new pages */ |
| 458 | kvmppc_mmu_flush_icache(pfn); | 471 | kvmppc_mmu_flush_icache(pfn); |
| 459 | 472 | ||
| 473 | out: | ||
| 474 | spin_unlock(&kvm->mmu_lock); | ||
| 475 | |||
| 460 | /* Drop refcount on page, so that mmu notifiers can clear it */ | 476 | /* Drop refcount on page, so that mmu notifiers can clear it */ |
| 461 | kvm_release_pfn_clean(pfn); | 477 | kvm_release_pfn_clean(pfn); |
| 462 | 478 | ||
| 463 | return 0; | 479 | return ret; |
| 464 | } | 480 | } |
| 465 | 481 | ||
| 466 | /* XXX only map the one-one case, for now use TLB0 */ | 482 | /* XXX only map the one-one case, for now use TLB0 */ |
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c index bf56e33f8257..2345bdb4d917 100644 --- a/arch/powerpc/net/bpf_jit_comp.c +++ b/arch/powerpc/net/bpf_jit_comp.c | |||
| @@ -691,4 +691,5 @@ void bpf_jit_free(struct sk_filter *fp) | |||
| 691 | { | 691 | { |
| 692 | if (fp->bpf_func != sk_run_filter) | 692 | if (fp->bpf_func != sk_run_filter) |
| 693 | module_free(NULL, fp->bpf_func); | 693 | module_free(NULL, fp->bpf_func); |
| 694 | kfree(fp); | ||
| 694 | } | 695 | } |
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c index 7cfdaae1721a..a8fe5aa3d34f 100644 --- a/arch/powerpc/platforms/pseries/dlpar.c +++ b/arch/powerpc/platforms/pseries/dlpar.c | |||
| @@ -404,46 +404,38 @@ static ssize_t dlpar_cpu_probe(const char *buf, size_t count) | |||
| 404 | unsigned long drc_index; | 404 | unsigned long drc_index; |
| 405 | int rc; | 405 | int rc; |
| 406 | 406 | ||
| 407 | cpu_hotplug_driver_lock(); | ||
| 408 | rc = strict_strtoul(buf, 0, &drc_index); | 407 | rc = strict_strtoul(buf, 0, &drc_index); |
| 409 | if (rc) { | 408 | if (rc) |
| 410 | rc = -EINVAL; | 409 | return -EINVAL; |
| 411 | goto out; | ||
| 412 | } | ||
| 413 | 410 | ||
| 414 | parent = of_find_node_by_path("/cpus"); | 411 | parent = of_find_node_by_path("/cpus"); |
| 415 | if (!parent) { | 412 | if (!parent) |
| 416 | rc = -ENODEV; | 413 | return -ENODEV; |
| 417 | goto out; | ||
| 418 | } | ||
| 419 | 414 | ||
| 420 | dn = dlpar_configure_connector(drc_index, parent); | 415 | dn = dlpar_configure_connector(drc_index, parent); |
| 421 | if (!dn) { | 416 | if (!dn) |
| 422 | rc = -EINVAL; | 417 | return -EINVAL; |
| 423 | goto out; | ||
| 424 | } | ||
| 425 | 418 | ||
| 426 | of_node_put(parent); | 419 | of_node_put(parent); |
| 427 | 420 | ||
| 428 | rc = dlpar_acquire_drc(drc_index); | 421 | rc = dlpar_acquire_drc(drc_index); |
| 429 | if (rc) { | 422 | if (rc) { |
| 430 | dlpar_free_cc_nodes(dn); | 423 | dlpar_free_cc_nodes(dn); |
| 431 | rc = -EINVAL; | 424 | return -EINVAL; |
| 432 | goto out; | ||
| 433 | } | 425 | } |
| 434 | 426 | ||
| 435 | rc = dlpar_attach_node(dn); | 427 | rc = dlpar_attach_node(dn); |
| 436 | if (rc) { | 428 | if (rc) { |
| 437 | dlpar_release_drc(drc_index); | 429 | dlpar_release_drc(drc_index); |
| 438 | dlpar_free_cc_nodes(dn); | 430 | dlpar_free_cc_nodes(dn); |
| 439 | goto out; | 431 | return rc; |
| 440 | } | 432 | } |
| 441 | 433 | ||
| 442 | rc = dlpar_online_cpu(dn); | 434 | rc = dlpar_online_cpu(dn); |
| 443 | out: | 435 | if (rc) |
| 444 | cpu_hotplug_driver_unlock(); | 436 | return rc; |
| 445 | 437 | ||
| 446 | return rc ? rc : count; | 438 | return count; |
| 447 | } | 439 | } |
| 448 | 440 | ||
| 449 | static int dlpar_offline_cpu(struct device_node *dn) | 441 | static int dlpar_offline_cpu(struct device_node *dn) |
| @@ -516,30 +508,27 @@ static ssize_t dlpar_cpu_release(const char *buf, size_t count) | |||
| 516 | return -EINVAL; | 508 | return -EINVAL; |
| 517 | } | 509 | } |
| 518 | 510 | ||
| 519 | cpu_hotplug_driver_lock(); | ||
| 520 | rc = dlpar_offline_cpu(dn); | 511 | rc = dlpar_offline_cpu(dn); |
| 521 | if (rc) { | 512 | if (rc) { |
| 522 | of_node_put(dn); | 513 | of_node_put(dn); |
| 523 | rc = -EINVAL; | 514 | return -EINVAL; |
| 524 | goto out; | ||
| 525 | } | 515 | } |
| 526 | 516 | ||
| 527 | rc = dlpar_release_drc(*drc_index); | 517 | rc = dlpar_release_drc(*drc_index); |
| 528 | if (rc) { | 518 | if (rc) { |
| 529 | of_node_put(dn); | 519 | of_node_put(dn); |
| 530 | goto out; | 520 | return rc; |
| 531 | } | 521 | } |
| 532 | 522 | ||
| 533 | rc = dlpar_detach_node(dn); | 523 | rc = dlpar_detach_node(dn); |
| 534 | if (rc) { | 524 | if (rc) { |
| 535 | dlpar_acquire_drc(*drc_index); | 525 | dlpar_acquire_drc(*drc_index); |
| 536 | goto out; | 526 | return rc; |
| 537 | } | 527 | } |
| 538 | 528 | ||
| 539 | of_node_put(dn); | 529 | of_node_put(dn); |
| 540 | out: | 530 | |
| 541 | cpu_hotplug_driver_unlock(); | 531 | return count; |
| 542 | return rc ? rc : count; | ||
| 543 | } | 532 | } |
| 544 | 533 | ||
| 545 | static int __init pseries_dlpar_init(void) | 534 | static int __init pseries_dlpar_init(void) |
diff --git a/arch/s390/include/asm/jump_label.h b/arch/s390/include/asm/jump_label.h index 6c32190dc73e..346b1c85ffb4 100644 --- a/arch/s390/include/asm/jump_label.h +++ b/arch/s390/include/asm/jump_label.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | static __always_inline bool arch_static_branch(struct static_key *key) | 16 | static __always_inline bool arch_static_branch(struct static_key *key) |
| 17 | { | 17 | { |
| 18 | asm goto("0: brcl 0,0\n" | 18 | asm_volatile_goto("0: brcl 0,0\n" |
| 19 | ".pushsection __jump_table, \"aw\"\n" | 19 | ".pushsection __jump_table, \"aw\"\n" |
| 20 | ASM_ALIGN "\n" | 20 | ASM_ALIGN "\n" |
| 21 | ASM_PTR " 0b, %l[label], %0\n" | 21 | ASM_PTR " 0b, %l[label], %0\n" |
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index 9b60a36c348d..2204400d0bd5 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h | |||
| @@ -748,7 +748,9 @@ static inline void pgste_set_key(pte_t *ptep, pgste_t pgste, pte_t entry) | |||
| 748 | 748 | ||
| 749 | static inline void pgste_set_pte(pte_t *ptep, pte_t entry) | 749 | static inline void pgste_set_pte(pte_t *ptep, pte_t entry) |
| 750 | { | 750 | { |
| 751 | if (!MACHINE_HAS_ESOP && (pte_val(entry) & _PAGE_WRITE)) { | 751 | if (!MACHINE_HAS_ESOP && |
| 752 | (pte_val(entry) & _PAGE_PRESENT) && | ||
| 753 | (pte_val(entry) & _PAGE_WRITE)) { | ||
| 752 | /* | 754 | /* |
| 753 | * Without enhanced suppression-on-protection force | 755 | * Without enhanced suppression-on-protection force |
| 754 | * the dirty bit on for all writable ptes. | 756 | * the dirty bit on for all writable ptes. |
diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h index 8ad8af915032..819b94d22720 100644 --- a/arch/s390/include/asm/timex.h +++ b/arch/s390/include/asm/timex.h | |||
| @@ -71,30 +71,30 @@ static inline void local_tick_enable(unsigned long long comp) | |||
| 71 | 71 | ||
| 72 | typedef unsigned long long cycles_t; | 72 | typedef unsigned long long cycles_t; |
| 73 | 73 | ||
| 74 | static inline unsigned long long get_tod_clock(void) | ||
| 75 | { | ||
| 76 | unsigned long long clk; | ||
| 77 | |||
| 78 | #ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES | ||
| 79 | asm volatile(".insn s,0xb27c0000,%0" : "=Q" (clk) : : "cc"); | ||
| 80 | #else | ||
| 81 | asm volatile("stck %0" : "=Q" (clk) : : "cc"); | ||
| 82 | #endif | ||
| 83 | return clk; | ||
| 84 | } | ||
| 85 | |||
| 86 | static inline void get_tod_clock_ext(char *clk) | 74 | static inline void get_tod_clock_ext(char *clk) |
| 87 | { | 75 | { |
| 88 | asm volatile("stcke %0" : "=Q" (*clk) : : "cc"); | 76 | asm volatile("stcke %0" : "=Q" (*clk) : : "cc"); |
| 89 | } | 77 | } |
| 90 | 78 | ||
| 91 | static inline unsigned long long get_tod_clock_xt(void) | 79 | static inline unsigned long long get_tod_clock(void) |
| 92 | { | 80 | { |
| 93 | unsigned char clk[16]; | 81 | unsigned char clk[16]; |
| 94 | get_tod_clock_ext(clk); | 82 | get_tod_clock_ext(clk); |
| 95 | return *((unsigned long long *)&clk[1]); | 83 | return *((unsigned long long *)&clk[1]); |
| 96 | } | 84 | } |
| 97 | 85 | ||
| 86 | static inline unsigned long long get_tod_clock_fast(void) | ||
| 87 | { | ||
| 88 | #ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES | ||
| 89 | unsigned long long clk; | ||
| 90 | |||
| 91 | asm volatile("stckf %0" : "=Q" (clk) : : "cc"); | ||
| 92 | return clk; | ||
| 93 | #else | ||
| 94 | return get_tod_clock(); | ||
| 95 | #endif | ||
| 96 | } | ||
| 97 | |||
| 98 | static inline cycles_t get_cycles(void) | 98 | static inline cycles_t get_cycles(void) |
| 99 | { | 99 | { |
| 100 | return (cycles_t) get_tod_clock() >> 2; | 100 | return (cycles_t) get_tod_clock() >> 2; |
| @@ -125,7 +125,7 @@ extern u64 sched_clock_base_cc; | |||
| 125 | */ | 125 | */ |
| 126 | static inline unsigned long long get_tod_clock_monotonic(void) | 126 | static inline unsigned long long get_tod_clock_monotonic(void) |
| 127 | { | 127 | { |
| 128 | return get_tod_clock_xt() - sched_clock_base_cc; | 128 | return get_tod_clock() - sched_clock_base_cc; |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | /** | 131 | /** |
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c index 1389b637dae5..adaa9e9478d8 100644 --- a/arch/s390/kernel/compat_signal.c +++ b/arch/s390/kernel/compat_signal.c | |||
| @@ -99,7 +99,7 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from) | |||
| 99 | break; | 99 | break; |
| 100 | } | 100 | } |
| 101 | } | 101 | } |
| 102 | return err; | 102 | return err ? -EFAULT : 0; |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) | 105 | int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) |
| @@ -148,7 +148,7 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) | |||
| 148 | break; | 148 | break; |
| 149 | } | 149 | } |
| 150 | } | 150 | } |
| 151 | return err; | 151 | return err ? -EFAULT : 0; |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | static int save_sigregs32(struct pt_regs *regs, _sigregs32 __user *sregs) | 154 | static int save_sigregs32(struct pt_regs *regs, _sigregs32 __user *sregs) |
diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c index c84f33d51f7b..7dd21720e5b0 100644 --- a/arch/s390/kernel/crash_dump.c +++ b/arch/s390/kernel/crash_dump.c | |||
| @@ -40,28 +40,26 @@ static inline void *load_real_addr(void *addr) | |||
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | /* | 42 | /* |
| 43 | * Copy up to one page to vmalloc or real memory | 43 | * Copy real to virtual or real memory |
| 44 | */ | 44 | */ |
| 45 | static ssize_t copy_page_real(void *buf, void *src, size_t csize) | 45 | static int copy_from_realmem(void *dest, void *src, size_t count) |
| 46 | { | 46 | { |
| 47 | size_t size; | 47 | unsigned long size; |
| 48 | int rc; | ||
| 48 | 49 | ||
| 49 | if (is_vmalloc_addr(buf)) { | 50 | if (!count) |
| 50 | BUG_ON(csize >= PAGE_SIZE); | 51 | return 0; |
| 51 | /* If buf is not page aligned, copy first part */ | 52 | if (!is_vmalloc_or_module_addr(dest)) |
| 52 | size = min(roundup(__pa(buf), PAGE_SIZE) - __pa(buf), csize); | 53 | return memcpy_real(dest, src, count); |
| 53 | if (size) { | 54 | do { |
| 54 | if (memcpy_real(load_real_addr(buf), src, size)) | 55 | size = min(count, PAGE_SIZE - (__pa(dest) & ~PAGE_MASK)); |
| 55 | return -EFAULT; | 56 | if (memcpy_real(load_real_addr(dest), src, size)) |
| 56 | buf += size; | 57 | return -EFAULT; |
| 57 | src += size; | 58 | count -= size; |
| 58 | } | 59 | dest += size; |
| 59 | /* Copy second part */ | 60 | src += size; |
| 60 | size = csize - size; | 61 | } while (count); |
| 61 | return (size) ? memcpy_real(load_real_addr(buf), src, size) : 0; | 62 | return 0; |
| 62 | } else { | ||
| 63 | return memcpy_real(buf, src, csize); | ||
| 64 | } | ||
| 65 | } | 63 | } |
| 66 | 64 | ||
| 67 | /* | 65 | /* |
| @@ -114,7 +112,7 @@ static ssize_t copy_oldmem_page_kdump(char *buf, size_t csize, | |||
| 114 | rc = copy_to_user_real((void __force __user *) buf, | 112 | rc = copy_to_user_real((void __force __user *) buf, |
| 115 | (void *) src, csize); | 113 | (void *) src, csize); |
| 116 | else | 114 | else |
| 117 | rc = copy_page_real(buf, (void *) src, csize); | 115 | rc = copy_from_realmem(buf, (void *) src, csize); |
| 118 | return (rc == 0) ? rc : csize; | 116 | return (rc == 0) ? rc : csize; |
| 119 | } | 117 | } |
| 120 | 118 | ||
| @@ -210,7 +208,7 @@ int copy_from_oldmem(void *dest, void *src, size_t count) | |||
| 210 | if (OLDMEM_BASE) { | 208 | if (OLDMEM_BASE) { |
| 211 | if ((unsigned long) src < OLDMEM_SIZE) { | 209 | if ((unsigned long) src < OLDMEM_SIZE) { |
| 212 | copied = min(count, OLDMEM_SIZE - (unsigned long) src); | 210 | copied = min(count, OLDMEM_SIZE - (unsigned long) src); |
| 213 | rc = memcpy_real(dest, src + OLDMEM_BASE, copied); | 211 | rc = copy_from_realmem(dest, src + OLDMEM_BASE, copied); |
| 214 | if (rc) | 212 | if (rc) |
| 215 | return rc; | 213 | return rc; |
| 216 | } | 214 | } |
| @@ -223,7 +221,7 @@ int copy_from_oldmem(void *dest, void *src, size_t count) | |||
| 223 | return rc; | 221 | return rc; |
| 224 | } | 222 | } |
| 225 | } | 223 | } |
| 226 | return memcpy_real(dest + copied, src + copied, count - copied); | 224 | return copy_from_realmem(dest + copied, src + copied, count - copied); |
| 227 | } | 225 | } |
| 228 | 226 | ||
| 229 | /* | 227 | /* |
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index f1279dc2e1bc..17d62fe5d7b7 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c | |||
| @@ -867,7 +867,7 @@ static inline void | |||
| 867 | debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level, | 867 | debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level, |
| 868 | int exception) | 868 | int exception) |
| 869 | { | 869 | { |
| 870 | active->id.stck = get_tod_clock(); | 870 | active->id.stck = get_tod_clock_fast(); |
| 871 | active->id.fields.cpuid = smp_processor_id(); | 871 | active->id.fields.cpuid = smp_processor_id(); |
| 872 | active->caller = __builtin_return_address(0); | 872 | active->caller = __builtin_return_address(0); |
| 873 | active->id.fields.exception = exception; | 873 | active->id.fields.exception = exception; |
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index cc30d1fb000c..0dc2b6d0a1ec 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S | |||
| @@ -266,6 +266,7 @@ sysc_sigpending: | |||
| 266 | tm __TI_flags+3(%r12),_TIF_SYSCALL | 266 | tm __TI_flags+3(%r12),_TIF_SYSCALL |
| 267 | jno sysc_return | 267 | jno sysc_return |
| 268 | lm %r2,%r7,__PT_R2(%r11) # load svc arguments | 268 | lm %r2,%r7,__PT_R2(%r11) # load svc arguments |
| 269 | l %r10,__TI_sysc_table(%r12) # 31 bit system call table | ||
| 269 | xr %r8,%r8 # svc 0 returns -ENOSYS | 270 | xr %r8,%r8 # svc 0 returns -ENOSYS |
| 270 | clc __PT_INT_CODE+2(2,%r11),BASED(.Lnr_syscalls+2) | 271 | clc __PT_INT_CODE+2(2,%r11),BASED(.Lnr_syscalls+2) |
| 271 | jnl sysc_nr_ok # invalid svc number -> do svc 0 | 272 | jnl sysc_nr_ok # invalid svc number -> do svc 0 |
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S index 2b2188b97c6a..e5b43c97a834 100644 --- a/arch/s390/kernel/entry64.S +++ b/arch/s390/kernel/entry64.S | |||
| @@ -297,6 +297,7 @@ sysc_sigpending: | |||
| 297 | tm __TI_flags+7(%r12),_TIF_SYSCALL | 297 | tm __TI_flags+7(%r12),_TIF_SYSCALL |
| 298 | jno sysc_return | 298 | jno sysc_return |
| 299 | lmg %r2,%r7,__PT_R2(%r11) # load svc arguments | 299 | lmg %r2,%r7,__PT_R2(%r11) # load svc arguments |
| 300 | lg %r10,__TI_sysc_table(%r12) # address of system call table | ||
| 300 | lghi %r8,0 # svc 0 returns -ENOSYS | 301 | lghi %r8,0 # svc 0 returns -ENOSYS |
| 301 | llgh %r1,__PT_INT_CODE+2(%r11) # load new svc number | 302 | llgh %r1,__PT_INT_CODE+2(%r11) # load new svc number |
| 302 | cghi %r1,NR_syscalls | 303 | cghi %r1,NR_syscalls |
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index 0ce9fb245034..d86e64eddb42 100644 --- a/arch/s390/kernel/kprobes.c +++ b/arch/s390/kernel/kprobes.c | |||
| @@ -67,6 +67,11 @@ static int __kprobes is_prohibited_opcode(kprobe_opcode_t *insn) | |||
| 67 | case 0xac: /* stnsm */ | 67 | case 0xac: /* stnsm */ |
| 68 | case 0xad: /* stosm */ | 68 | case 0xad: /* stosm */ |
| 69 | return -EINVAL; | 69 | return -EINVAL; |
| 70 | case 0xc6: | ||
| 71 | switch (insn[0] & 0x0f) { | ||
| 72 | case 0x00: /* exrl */ | ||
| 73 | return -EINVAL; | ||
| 74 | } | ||
| 70 | } | 75 | } |
| 71 | switch (insn[0]) { | 76 | switch (insn[0]) { |
| 72 | case 0x0101: /* pr */ | 77 | case 0x0101: /* pr */ |
| @@ -180,7 +185,6 @@ static int __kprobes is_insn_relative_long(kprobe_opcode_t *insn) | |||
| 180 | break; | 185 | break; |
| 181 | case 0xc6: | 186 | case 0xc6: |
| 182 | switch (insn[0] & 0x0f) { | 187 | switch (insn[0] & 0x0f) { |
| 183 | case 0x00: /* exrl */ | ||
| 184 | case 0x02: /* pfdrl */ | 188 | case 0x02: /* pfdrl */ |
| 185 | case 0x04: /* cghrl */ | 189 | case 0x04: /* cghrl */ |
| 186 | case 0x05: /* chrl */ | 190 | case 0x05: /* chrl */ |
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 7f35cb33e510..7f1f7ac5cf7f 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c | |||
| @@ -385,7 +385,7 @@ static int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu) | |||
| 385 | } | 385 | } |
| 386 | 386 | ||
| 387 | if ((!rc) && (vcpu->arch.sie_block->ckc < | 387 | if ((!rc) && (vcpu->arch.sie_block->ckc < |
| 388 | get_tod_clock() + vcpu->arch.sie_block->epoch)) { | 388 | get_tod_clock_fast() + vcpu->arch.sie_block->epoch)) { |
| 389 | if ((!psw_extint_disabled(vcpu)) && | 389 | if ((!psw_extint_disabled(vcpu)) && |
| 390 | (vcpu->arch.sie_block->gcr[0] & 0x800ul)) | 390 | (vcpu->arch.sie_block->gcr[0] & 0x800ul)) |
| 391 | rc = 1; | 391 | rc = 1; |
| @@ -425,7 +425,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) | |||
| 425 | goto no_timer; | 425 | goto no_timer; |
| 426 | } | 426 | } |
| 427 | 427 | ||
| 428 | now = get_tod_clock() + vcpu->arch.sie_block->epoch; | 428 | now = get_tod_clock_fast() + vcpu->arch.sie_block->epoch; |
| 429 | if (vcpu->arch.sie_block->ckc < now) { | 429 | if (vcpu->arch.sie_block->ckc < now) { |
| 430 | __unset_cpu_idle(vcpu); | 430 | __unset_cpu_idle(vcpu); |
| 431 | return 0; | 431 | return 0; |
| @@ -515,7 +515,7 @@ void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu) | |||
| 515 | } | 515 | } |
| 516 | 516 | ||
| 517 | if ((vcpu->arch.sie_block->ckc < | 517 | if ((vcpu->arch.sie_block->ckc < |
| 518 | get_tod_clock() + vcpu->arch.sie_block->epoch)) | 518 | get_tod_clock_fast() + vcpu->arch.sie_block->epoch)) |
| 519 | __try_deliver_ckc_interrupt(vcpu); | 519 | __try_deliver_ckc_interrupt(vcpu); |
| 520 | 520 | ||
| 521 | if (atomic_read(&fi->active)) { | 521 | if (atomic_read(&fi->active)) { |
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c index 57c87d7d7ede..a9f3d0042d58 100644 --- a/arch/s390/lib/delay.c +++ b/arch/s390/lib/delay.c | |||
| @@ -44,7 +44,7 @@ static void __udelay_disabled(unsigned long long usecs) | |||
| 44 | do { | 44 | do { |
| 45 | set_clock_comparator(end); | 45 | set_clock_comparator(end); |
| 46 | vtime_stop_cpu(); | 46 | vtime_stop_cpu(); |
| 47 | } while (get_tod_clock() < end); | 47 | } while (get_tod_clock_fast() < end); |
| 48 | lockdep_on(); | 48 | lockdep_on(); |
| 49 | __ctl_load(cr0, 0, 0); | 49 | __ctl_load(cr0, 0, 0); |
| 50 | __ctl_load(cr6, 6, 6); | 50 | __ctl_load(cr6, 6, 6); |
| @@ -55,7 +55,7 @@ static void __udelay_enabled(unsigned long long usecs) | |||
| 55 | { | 55 | { |
| 56 | u64 clock_saved, end; | 56 | u64 clock_saved, end; |
| 57 | 57 | ||
| 58 | end = get_tod_clock() + (usecs << 12); | 58 | end = get_tod_clock_fast() + (usecs << 12); |
| 59 | do { | 59 | do { |
| 60 | clock_saved = 0; | 60 | clock_saved = 0; |
| 61 | if (end < S390_lowcore.clock_comparator) { | 61 | if (end < S390_lowcore.clock_comparator) { |
| @@ -65,7 +65,7 @@ static void __udelay_enabled(unsigned long long usecs) | |||
| 65 | vtime_stop_cpu(); | 65 | vtime_stop_cpu(); |
| 66 | if (clock_saved) | 66 | if (clock_saved) |
| 67 | local_tick_enable(clock_saved); | 67 | local_tick_enable(clock_saved); |
| 68 | } while (get_tod_clock() < end); | 68 | } while (get_tod_clock_fast() < end); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | /* | 71 | /* |
| @@ -109,8 +109,8 @@ void udelay_simple(unsigned long long usecs) | |||
| 109 | { | 109 | { |
| 110 | u64 end; | 110 | u64 end; |
| 111 | 111 | ||
| 112 | end = get_tod_clock() + (usecs << 12); | 112 | end = get_tod_clock_fast() + (usecs << 12); |
| 113 | while (get_tod_clock() < end) | 113 | while (get_tod_clock_fast() < end) |
| 114 | cpu_relax(); | 114 | cpu_relax(); |
| 115 | } | 115 | } |
| 116 | 116 | ||
| @@ -120,10 +120,10 @@ void __ndelay(unsigned long long nsecs) | |||
| 120 | 120 | ||
| 121 | nsecs <<= 9; | 121 | nsecs <<= 9; |
| 122 | do_div(nsecs, 125); | 122 | do_div(nsecs, 125); |
| 123 | end = get_tod_clock() + nsecs; | 123 | end = get_tod_clock_fast() + nsecs; |
| 124 | if (nsecs & ~0xfffUL) | 124 | if (nsecs & ~0xfffUL) |
| 125 | __udelay(nsecs >> 12); | 125 | __udelay(nsecs >> 12); |
| 126 | while (get_tod_clock() < end) | 126 | while (get_tod_clock_fast() < end) |
| 127 | barrier(); | 127 | barrier(); |
| 128 | } | 128 | } |
| 129 | EXPORT_SYMBOL(__ndelay); | 129 | EXPORT_SYMBOL(__ndelay); |
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 709239285869..a5df511e27a2 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c | |||
| @@ -881,7 +881,9 @@ void bpf_jit_free(struct sk_filter *fp) | |||
| 881 | struct bpf_binary_header *header = (void *)addr; | 881 | struct bpf_binary_header *header = (void *)addr; |
| 882 | 882 | ||
| 883 | if (fp->bpf_func == sk_run_filter) | 883 | if (fp->bpf_func == sk_run_filter) |
| 884 | return; | 884 | goto free_filter; |
| 885 | set_memory_rw(addr, header->pages); | 885 | set_memory_rw(addr, header->pages); |
| 886 | module_free(NULL, header); | 886 | module_free(NULL, header); |
| 887 | free_filter: | ||
| 888 | kfree(fp); | ||
| 887 | } | 889 | } |
diff --git a/arch/sparc/include/asm/jump_label.h b/arch/sparc/include/asm/jump_label.h index 5080d16a832f..ec2e2e2aba7d 100644 --- a/arch/sparc/include/asm/jump_label.h +++ b/arch/sparc/include/asm/jump_label.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | static __always_inline bool arch_static_branch(struct static_key *key) | 10 | static __always_inline bool arch_static_branch(struct static_key *key) |
| 11 | { | 11 | { |
| 12 | asm goto("1:\n\t" | 12 | asm_volatile_goto("1:\n\t" |
| 13 | "nop\n\t" | 13 | "nop\n\t" |
| 14 | "nop\n\t" | 14 | "nop\n\t" |
| 15 | ".pushsection __jump_table, \"aw\"\n\t" | 15 | ".pushsection __jump_table, \"aw\"\n\t" |
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c index 9c7be59e6f5a..218b6b23c378 100644 --- a/arch/sparc/net/bpf_jit_comp.c +++ b/arch/sparc/net/bpf_jit_comp.c | |||
| @@ -808,4 +808,5 @@ void bpf_jit_free(struct sk_filter *fp) | |||
| 808 | { | 808 | { |
| 809 | if (fp->bpf_func != sk_run_filter) | 809 | if (fp->bpf_func != sk_run_filter) |
| 810 | module_free(NULL, fp->bpf_func); | 810 | module_free(NULL, fp->bpf_func); |
| 811 | kfree(fp); | ||
| 811 | } | 812 | } |
diff --git a/arch/tile/include/asm/atomic.h b/arch/tile/include/asm/atomic.h index d385eaadece7..709798460763 100644 --- a/arch/tile/include/asm/atomic.h +++ b/arch/tile/include/asm/atomic.h | |||
| @@ -166,7 +166,7 @@ static inline int atomic_cmpxchg(atomic_t *v, int o, int n) | |||
| 166 | * | 166 | * |
| 167 | * Atomically sets @v to @i and returns old @v | 167 | * Atomically sets @v to @i and returns old @v |
| 168 | */ | 168 | */ |
| 169 | static inline u64 atomic64_xchg(atomic64_t *v, u64 n) | 169 | static inline long long atomic64_xchg(atomic64_t *v, long long n) |
| 170 | { | 170 | { |
| 171 | return xchg64(&v->counter, n); | 171 | return xchg64(&v->counter, n); |
| 172 | } | 172 | } |
| @@ -180,7 +180,8 @@ static inline u64 atomic64_xchg(atomic64_t *v, u64 n) | |||
| 180 | * Atomically checks if @v holds @o and replaces it with @n if so. | 180 | * Atomically checks if @v holds @o and replaces it with @n if so. |
| 181 | * Returns the old value at @v. | 181 | * Returns the old value at @v. |
| 182 | */ | 182 | */ |
| 183 | static inline u64 atomic64_cmpxchg(atomic64_t *v, u64 o, u64 n) | 183 | static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, |
| 184 | long long n) | ||
| 184 | { | 185 | { |
| 185 | return cmpxchg64(&v->counter, o, n); | 186 | return cmpxchg64(&v->counter, o, n); |
| 186 | } | 187 | } |
diff --git a/arch/tile/include/asm/atomic_32.h b/arch/tile/include/asm/atomic_32.h index 0d0395b1b152..1ad4a1f7d42b 100644 --- a/arch/tile/include/asm/atomic_32.h +++ b/arch/tile/include/asm/atomic_32.h | |||
| @@ -80,7 +80,7 @@ static inline void atomic_set(atomic_t *v, int n) | |||
| 80 | /* A 64bit atomic type */ | 80 | /* A 64bit atomic type */ |
| 81 | 81 | ||
| 82 | typedef struct { | 82 | typedef struct { |
| 83 | u64 __aligned(8) counter; | 83 | long long counter; |
| 84 | } atomic64_t; | 84 | } atomic64_t; |
| 85 | 85 | ||
| 86 | #define ATOMIC64_INIT(val) { (val) } | 86 | #define ATOMIC64_INIT(val) { (val) } |
| @@ -91,14 +91,14 @@ typedef struct { | |||
| 91 | * | 91 | * |
| 92 | * Atomically reads the value of @v. | 92 | * Atomically reads the value of @v. |
| 93 | */ | 93 | */ |
| 94 | static inline u64 atomic64_read(const atomic64_t *v) | 94 | static inline long long atomic64_read(const atomic64_t *v) |
| 95 | { | 95 | { |
| 96 | /* | 96 | /* |
| 97 | * Requires an atomic op to read both 32-bit parts consistently. | 97 | * Requires an atomic op to read both 32-bit parts consistently. |
| 98 | * Casting away const is safe since the atomic support routines | 98 | * Casting away const is safe since the atomic support routines |
| 99 | * do not write to memory if the value has not been modified. | 99 | * do not write to memory if the value has not been modified. |
| 100 | */ | 100 | */ |
| 101 | return _atomic64_xchg_add((u64 *)&v->counter, 0); | 101 | return _atomic64_xchg_add((long long *)&v->counter, 0); |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | /** | 104 | /** |
| @@ -108,7 +108,7 @@ static inline u64 atomic64_read(const atomic64_t *v) | |||
| 108 | * | 108 | * |
| 109 | * Atomically adds @i to @v. | 109 | * Atomically adds @i to @v. |
| 110 | */ | 110 | */ |
| 111 | static inline void atomic64_add(u64 i, atomic64_t *v) | 111 | static inline void atomic64_add(long long i, atomic64_t *v) |
| 112 | { | 112 | { |
| 113 | _atomic64_xchg_add(&v->counter, i); | 113 | _atomic64_xchg_add(&v->counter, i); |
| 114 | } | 114 | } |
| @@ -120,7 +120,7 @@ static inline void atomic64_add(u64 i, atomic64_t *v) | |||
| 120 | * | 120 | * |
| 121 | * Atomically adds @i to @v and returns @i + @v | 121 | * Atomically adds @i to @v and returns @i + @v |
| 122 | */ | 122 | */ |
| 123 | static inline u64 atomic64_add_return(u64 i, atomic64_t *v) | 123 | static inline long long atomic64_add_return(long long i, atomic64_t *v) |
| 124 | { | 124 | { |
| 125 | smp_mb(); /* barrier for proper semantics */ | 125 | smp_mb(); /* barrier for proper semantics */ |
| 126 | return _atomic64_xchg_add(&v->counter, i) + i; | 126 | return _atomic64_xchg_add(&v->counter, i) + i; |
| @@ -135,7 +135,8 @@ static inline u64 atomic64_add_return(u64 i, atomic64_t *v) | |||
| 135 | * Atomically adds @a to @v, so long as @v was not already @u. | 135 | * Atomically adds @a to @v, so long as @v was not already @u. |
| 136 | * Returns non-zero if @v was not @u, and zero otherwise. | 136 | * Returns non-zero if @v was not @u, and zero otherwise. |
| 137 | */ | 137 | */ |
| 138 | static inline u64 atomic64_add_unless(atomic64_t *v, u64 a, u64 u) | 138 | static inline long long atomic64_add_unless(atomic64_t *v, long long a, |
| 139 | long long u) | ||
| 139 | { | 140 | { |
| 140 | smp_mb(); /* barrier for proper semantics */ | 141 | smp_mb(); /* barrier for proper semantics */ |
| 141 | return _atomic64_xchg_add_unless(&v->counter, a, u) != u; | 142 | return _atomic64_xchg_add_unless(&v->counter, a, u) != u; |
| @@ -151,7 +152,7 @@ static inline u64 atomic64_add_unless(atomic64_t *v, u64 a, u64 u) | |||
| 151 | * atomic64_set() can't be just a raw store, since it would be lost if it | 152 | * atomic64_set() can't be just a raw store, since it would be lost if it |
| 152 | * fell between the load and store of one of the other atomic ops. | 153 | * fell between the load and store of one of the other atomic ops. |
| 153 | */ | 154 | */ |
| 154 | static inline void atomic64_set(atomic64_t *v, u64 n) | 155 | static inline void atomic64_set(atomic64_t *v, long long n) |
| 155 | { | 156 | { |
| 156 | _atomic64_xchg(&v->counter, n); | 157 | _atomic64_xchg(&v->counter, n); |
| 157 | } | 158 | } |
| @@ -236,11 +237,13 @@ extern struct __get_user __atomic_xchg_add_unless(volatile int *p, | |||
| 236 | extern struct __get_user __atomic_or(volatile int *p, int *lock, int n); | 237 | extern struct __get_user __atomic_or(volatile int *p, int *lock, int n); |
| 237 | extern struct __get_user __atomic_andn(volatile int *p, int *lock, int n); | 238 | extern struct __get_user __atomic_andn(volatile int *p, int *lock, int n); |
| 238 | extern struct __get_user __atomic_xor(volatile int *p, int *lock, int n); | 239 | extern struct __get_user __atomic_xor(volatile int *p, int *lock, int n); |
| 239 | extern u64 __atomic64_cmpxchg(volatile u64 *p, int *lock, u64 o, u64 n); | 240 | extern long long __atomic64_cmpxchg(volatile long long *p, int *lock, |
| 240 | extern u64 __atomic64_xchg(volatile u64 *p, int *lock, u64 n); | 241 | long long o, long long n); |
| 241 | extern u64 __atomic64_xchg_add(volatile u64 *p, int *lock, u64 n); | 242 | extern long long __atomic64_xchg(volatile long long *p, int *lock, long long n); |
| 242 | extern u64 __atomic64_xchg_add_unless(volatile u64 *p, | 243 | extern long long __atomic64_xchg_add(volatile long long *p, int *lock, |
| 243 | int *lock, u64 o, u64 n); | 244 | long long n); |
| 245 | extern long long __atomic64_xchg_add_unless(volatile long long *p, | ||
| 246 | int *lock, long long o, long long n); | ||
| 244 | 247 | ||
| 245 | /* Return failure from the atomic wrappers. */ | 248 | /* Return failure from the atomic wrappers. */ |
| 246 | struct __get_user __atomic_bad_address(int __user *addr); | 249 | struct __get_user __atomic_bad_address(int __user *addr); |
diff --git a/arch/tile/include/asm/cmpxchg.h b/arch/tile/include/asm/cmpxchg.h index 4001d5eab4bb..0ccda3c425be 100644 --- a/arch/tile/include/asm/cmpxchg.h +++ b/arch/tile/include/asm/cmpxchg.h | |||
| @@ -35,10 +35,10 @@ int _atomic_xchg(int *ptr, int n); | |||
| 35 | int _atomic_xchg_add(int *v, int i); | 35 | int _atomic_xchg_add(int *v, int i); |
| 36 | int _atomic_xchg_add_unless(int *v, int a, int u); | 36 | int _atomic_xchg_add_unless(int *v, int a, int u); |
| 37 | int _atomic_cmpxchg(int *ptr, int o, int n); | 37 | int _atomic_cmpxchg(int *ptr, int o, int n); |
| 38 | u64 _atomic64_xchg(u64 *v, u64 n); | 38 | long long _atomic64_xchg(long long *v, long long n); |
| 39 | u64 _atomic64_xchg_add(u64 *v, u64 i); | 39 | long long _atomic64_xchg_add(long long *v, long long i); |
| 40 | u64 _atomic64_xchg_add_unless(u64 *v, u64 a, u64 u); | 40 | long long _atomic64_xchg_add_unless(long long *v, long long a, long long u); |
| 41 | u64 _atomic64_cmpxchg(u64 *v, u64 o, u64 n); | 41 | long long _atomic64_cmpxchg(long long *v, long long o, long long n); |
| 42 | 42 | ||
| 43 | #define xchg(ptr, n) \ | 43 | #define xchg(ptr, n) \ |
| 44 | ({ \ | 44 | ({ \ |
| @@ -53,7 +53,8 @@ u64 _atomic64_cmpxchg(u64 *v, u64 o, u64 n); | |||
| 53 | if (sizeof(*(ptr)) != 4) \ | 53 | if (sizeof(*(ptr)) != 4) \ |
| 54 | __cmpxchg_called_with_bad_pointer(); \ | 54 | __cmpxchg_called_with_bad_pointer(); \ |
| 55 | smp_mb(); \ | 55 | smp_mb(); \ |
| 56 | (typeof(*(ptr)))_atomic_cmpxchg((int *)ptr, (int)o, (int)n); \ | 56 | (typeof(*(ptr)))_atomic_cmpxchg((int *)ptr, (int)o, \ |
| 57 | (int)n); \ | ||
| 57 | }) | 58 | }) |
| 58 | 59 | ||
| 59 | #define xchg64(ptr, n) \ | 60 | #define xchg64(ptr, n) \ |
| @@ -61,7 +62,8 @@ u64 _atomic64_cmpxchg(u64 *v, u64 o, u64 n); | |||
| 61 | if (sizeof(*(ptr)) != 8) \ | 62 | if (sizeof(*(ptr)) != 8) \ |
| 62 | __xchg_called_with_bad_pointer(); \ | 63 | __xchg_called_with_bad_pointer(); \ |
| 63 | smp_mb(); \ | 64 | smp_mb(); \ |
| 64 | (typeof(*(ptr)))_atomic64_xchg((u64 *)(ptr), (u64)(n)); \ | 65 | (typeof(*(ptr)))_atomic64_xchg((long long *)(ptr), \ |
| 66 | (long long)(n)); \ | ||
| 65 | }) | 67 | }) |
| 66 | 68 | ||
| 67 | #define cmpxchg64(ptr, o, n) \ | 69 | #define cmpxchg64(ptr, o, n) \ |
| @@ -69,7 +71,8 @@ u64 _atomic64_cmpxchg(u64 *v, u64 o, u64 n); | |||
| 69 | if (sizeof(*(ptr)) != 8) \ | 71 | if (sizeof(*(ptr)) != 8) \ |
| 70 | __cmpxchg_called_with_bad_pointer(); \ | 72 | __cmpxchg_called_with_bad_pointer(); \ |
| 71 | smp_mb(); \ | 73 | smp_mb(); \ |
| 72 | (typeof(*(ptr)))_atomic64_cmpxchg((u64 *)ptr, (u64)o, (u64)n); \ | 74 | (typeof(*(ptr)))_atomic64_cmpxchg((long long *)ptr, \ |
| 75 | (long long)o, (long long)n); \ | ||
| 73 | }) | 76 | }) |
| 74 | 77 | ||
| 75 | #else | 78 | #else |
| @@ -81,10 +84,11 @@ u64 _atomic64_cmpxchg(u64 *v, u64 o, u64 n); | |||
| 81 | switch (sizeof(*(ptr))) { \ | 84 | switch (sizeof(*(ptr))) { \ |
| 82 | case 4: \ | 85 | case 4: \ |
| 83 | __x = (typeof(__x))(unsigned long) \ | 86 | __x = (typeof(__x))(unsigned long) \ |
| 84 | __insn_exch4((ptr), (u32)(unsigned long)(n)); \ | 87 | __insn_exch4((ptr), \ |
| 88 | (u32)(unsigned long)(n)); \ | ||
| 85 | break; \ | 89 | break; \ |
| 86 | case 8: \ | 90 | case 8: \ |
| 87 | __x = (typeof(__x)) \ | 91 | __x = (typeof(__x)) \ |
| 88 | __insn_exch((ptr), (unsigned long)(n)); \ | 92 | __insn_exch((ptr), (unsigned long)(n)); \ |
| 89 | break; \ | 93 | break; \ |
| 90 | default: \ | 94 | default: \ |
| @@ -103,10 +107,12 @@ u64 _atomic64_cmpxchg(u64 *v, u64 o, u64 n); | |||
| 103 | switch (sizeof(*(ptr))) { \ | 107 | switch (sizeof(*(ptr))) { \ |
| 104 | case 4: \ | 108 | case 4: \ |
| 105 | __x = (typeof(__x))(unsigned long) \ | 109 | __x = (typeof(__x))(unsigned long) \ |
| 106 | __insn_cmpexch4((ptr), (u32)(unsigned long)(n)); \ | 110 | __insn_cmpexch4((ptr), \ |
| 111 | (u32)(unsigned long)(n)); \ | ||
| 107 | break; \ | 112 | break; \ |
| 108 | case 8: \ | 113 | case 8: \ |
| 109 | __x = (typeof(__x))__insn_cmpexch((ptr), (u64)(n)); \ | 114 | __x = (typeof(__x))__insn_cmpexch((ptr), \ |
| 115 | (long long)(n)); \ | ||
| 110 | break; \ | 116 | break; \ |
| 111 | default: \ | 117 | default: \ |
| 112 | __cmpxchg_called_with_bad_pointer(); \ | 118 | __cmpxchg_called_with_bad_pointer(); \ |
diff --git a/arch/tile/include/asm/percpu.h b/arch/tile/include/asm/percpu.h index 63294f5a8efb..4f7ae39fa202 100644 --- a/arch/tile/include/asm/percpu.h +++ b/arch/tile/include/asm/percpu.h | |||
| @@ -15,9 +15,37 @@ | |||
| 15 | #ifndef _ASM_TILE_PERCPU_H | 15 | #ifndef _ASM_TILE_PERCPU_H |
| 16 | #define _ASM_TILE_PERCPU_H | 16 | #define _ASM_TILE_PERCPU_H |
| 17 | 17 | ||
| 18 | register unsigned long __my_cpu_offset __asm__("tp"); | 18 | register unsigned long my_cpu_offset_reg asm("tp"); |
| 19 | #define __my_cpu_offset __my_cpu_offset | 19 | |
| 20 | #define set_my_cpu_offset(tp) (__my_cpu_offset = (tp)) | 20 | #ifdef CONFIG_PREEMPT |
| 21 | /* | ||
| 22 | * For full preemption, we can't just use the register variable | ||
| 23 | * directly, since we need barrier() to hazard against it, causing the | ||
| 24 | * compiler to reload anything computed from a previous "tp" value. | ||
| 25 | * But we also don't want to use volatile asm, since we'd like the | ||
| 26 | * compiler to be able to cache the value across multiple percpu reads. | ||
| 27 | * So we use a fake stack read as a hazard against barrier(). | ||
| 28 | * The 'U' constraint is like 'm' but disallows postincrement. | ||
| 29 | */ | ||
| 30 | static inline unsigned long __my_cpu_offset(void) | ||
| 31 | { | ||
| 32 | unsigned long tp; | ||
| 33 | register unsigned long *sp asm("sp"); | ||
| 34 | asm("move %0, tp" : "=r" (tp) : "U" (*sp)); | ||
| 35 | return tp; | ||
| 36 | } | ||
| 37 | #define __my_cpu_offset __my_cpu_offset() | ||
| 38 | #else | ||
| 39 | /* | ||
| 40 | * We don't need to hazard against barrier() since "tp" doesn't ever | ||
| 41 | * change with PREEMPT_NONE, and with PREEMPT_VOLUNTARY it only | ||
| 42 | * changes at function call points, at which we are already re-reading | ||
| 43 | * the value of "tp" due to "my_cpu_offset_reg" being a global variable. | ||
| 44 | */ | ||
| 45 | #define __my_cpu_offset my_cpu_offset_reg | ||
| 46 | #endif | ||
| 47 | |||
| 48 | #define set_my_cpu_offset(tp) (my_cpu_offset_reg = (tp)) | ||
| 21 | 49 | ||
| 22 | #include <asm-generic/percpu.h> | 50 | #include <asm-generic/percpu.h> |
| 23 | 51 | ||
diff --git a/arch/tile/kernel/hardwall.c b/arch/tile/kernel/hardwall.c index df27a1fd94a3..531f4c365351 100644 --- a/arch/tile/kernel/hardwall.c +++ b/arch/tile/kernel/hardwall.c | |||
| @@ -66,7 +66,7 @@ static struct hardwall_type hardwall_types[] = { | |||
| 66 | 0, | 66 | 0, |
| 67 | "udn", | 67 | "udn", |
| 68 | LIST_HEAD_INIT(hardwall_types[HARDWALL_UDN].list), | 68 | LIST_HEAD_INIT(hardwall_types[HARDWALL_UDN].list), |
| 69 | __SPIN_LOCK_INITIALIZER(hardwall_types[HARDWALL_UDN].lock), | 69 | __SPIN_LOCK_UNLOCKED(hardwall_types[HARDWALL_UDN].lock), |
| 70 | NULL | 70 | NULL |
| 71 | }, | 71 | }, |
| 72 | #ifndef __tilepro__ | 72 | #ifndef __tilepro__ |
| @@ -77,7 +77,7 @@ static struct hardwall_type hardwall_types[] = { | |||
| 77 | 1, /* disabled pending hypervisor support */ | 77 | 1, /* disabled pending hypervisor support */ |
| 78 | "idn", | 78 | "idn", |
| 79 | LIST_HEAD_INIT(hardwall_types[HARDWALL_IDN].list), | 79 | LIST_HEAD_INIT(hardwall_types[HARDWALL_IDN].list), |
| 80 | __SPIN_LOCK_INITIALIZER(hardwall_types[HARDWALL_IDN].lock), | 80 | __SPIN_LOCK_UNLOCKED(hardwall_types[HARDWALL_IDN].lock), |
| 81 | NULL | 81 | NULL |
| 82 | }, | 82 | }, |
| 83 | { /* access to user-space IPI */ | 83 | { /* access to user-space IPI */ |
| @@ -87,7 +87,7 @@ static struct hardwall_type hardwall_types[] = { | |||
| 87 | 0, | 87 | 0, |
| 88 | "ipi", | 88 | "ipi", |
| 89 | LIST_HEAD_INIT(hardwall_types[HARDWALL_IPI].list), | 89 | LIST_HEAD_INIT(hardwall_types[HARDWALL_IPI].list), |
| 90 | __SPIN_LOCK_INITIALIZER(hardwall_types[HARDWALL_IPI].lock), | 90 | __SPIN_LOCK_UNLOCKED(hardwall_types[HARDWALL_IPI].lock), |
| 91 | NULL | 91 | NULL |
| 92 | }, | 92 | }, |
| 93 | #endif | 93 | #endif |
diff --git a/arch/tile/kernel/intvec_32.S b/arch/tile/kernel/intvec_32.S index 088d5c141e68..2cbe6d5dd6b0 100644 --- a/arch/tile/kernel/intvec_32.S +++ b/arch/tile/kernel/intvec_32.S | |||
| @@ -815,6 +815,9 @@ STD_ENTRY(interrupt_return) | |||
| 815 | } | 815 | } |
| 816 | bzt r28, 1f | 816 | bzt r28, 1f |
| 817 | bnz r29, 1f | 817 | bnz r29, 1f |
| 818 | /* Disable interrupts explicitly for preemption. */ | ||
| 819 | IRQ_DISABLE(r20,r21) | ||
| 820 | TRACE_IRQS_OFF | ||
| 818 | jal preempt_schedule_irq | 821 | jal preempt_schedule_irq |
| 819 | FEEDBACK_REENTER(interrupt_return) | 822 | FEEDBACK_REENTER(interrupt_return) |
| 820 | 1: | 823 | 1: |
diff --git a/arch/tile/kernel/intvec_64.S b/arch/tile/kernel/intvec_64.S index ec755d3f3734..b8fc497f2437 100644 --- a/arch/tile/kernel/intvec_64.S +++ b/arch/tile/kernel/intvec_64.S | |||
| @@ -841,6 +841,9 @@ STD_ENTRY(interrupt_return) | |||
| 841 | } | 841 | } |
| 842 | beqzt r28, 1f | 842 | beqzt r28, 1f |
| 843 | bnez r29, 1f | 843 | bnez r29, 1f |
| 844 | /* Disable interrupts explicitly for preemption. */ | ||
| 845 | IRQ_DISABLE(r20,r21) | ||
| 846 | TRACE_IRQS_OFF | ||
| 844 | jal preempt_schedule_irq | 847 | jal preempt_schedule_irq |
| 845 | FEEDBACK_REENTER(interrupt_return) | 848 | FEEDBACK_REENTER(interrupt_return) |
| 846 | 1: | 849 | 1: |
diff --git a/arch/tile/kernel/stack.c b/arch/tile/kernel/stack.c index 362284af3afd..c93977a62116 100644 --- a/arch/tile/kernel/stack.c +++ b/arch/tile/kernel/stack.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/mmzone.h> | 23 | #include <linux/mmzone.h> |
| 24 | #include <linux/dcache.h> | 24 | #include <linux/dcache.h> |
| 25 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
| 26 | #include <linux/string.h> | ||
| 26 | #include <asm/backtrace.h> | 27 | #include <asm/backtrace.h> |
| 27 | #include <asm/page.h> | 28 | #include <asm/page.h> |
| 28 | #include <asm/ucontext.h> | 29 | #include <asm/ucontext.h> |
| @@ -332,21 +333,18 @@ static void describe_addr(struct KBacktraceIterator *kbt, | |||
| 332 | } | 333 | } |
| 333 | 334 | ||
| 334 | if (vma->vm_file) { | 335 | if (vma->vm_file) { |
| 335 | char *s; | ||
| 336 | p = d_path(&vma->vm_file->f_path, buf, bufsize); | 336 | p = d_path(&vma->vm_file->f_path, buf, bufsize); |
| 337 | if (IS_ERR(p)) | 337 | if (IS_ERR(p)) |
| 338 | p = "?"; | 338 | p = "?"; |
| 339 | s = strrchr(p, '/'); | 339 | name = kbasename(p); |
| 340 | if (s) | ||
| 341 | p = s+1; | ||
| 342 | } else { | 340 | } else { |
| 343 | p = "anon"; | 341 | name = "anon"; |
| 344 | } | 342 | } |
| 345 | 343 | ||
| 346 | /* Generate a string description of the vma info. */ | 344 | /* Generate a string description of the vma info. */ |
| 347 | namelen = strlen(p); | 345 | namelen = strlen(name); |
| 348 | remaining = (bufsize - 1) - namelen; | 346 | remaining = (bufsize - 1) - namelen; |
| 349 | memmove(buf, p, namelen); | 347 | memmove(buf, name, namelen); |
| 350 | snprintf(buf + namelen, remaining, "[%lx+%lx] ", | 348 | snprintf(buf + namelen, remaining, "[%lx+%lx] ", |
| 351 | vma->vm_start, vma->vm_end - vma->vm_start); | 349 | vma->vm_start, vma->vm_end - vma->vm_start); |
| 352 | } | 350 | } |
diff --git a/arch/tile/lib/atomic_32.c b/arch/tile/lib/atomic_32.c index 759efa337be8..c89b211fd9e7 100644 --- a/arch/tile/lib/atomic_32.c +++ b/arch/tile/lib/atomic_32.c | |||
| @@ -107,19 +107,19 @@ unsigned long _atomic_xor(volatile unsigned long *p, unsigned long mask) | |||
| 107 | EXPORT_SYMBOL(_atomic_xor); | 107 | EXPORT_SYMBOL(_atomic_xor); |
| 108 | 108 | ||
| 109 | 109 | ||
| 110 | u64 _atomic64_xchg(u64 *v, u64 n) | 110 | long long _atomic64_xchg(long long *v, long long n) |
| 111 | { | 111 | { |
| 112 | return __atomic64_xchg(v, __atomic_setup(v), n); | 112 | return __atomic64_xchg(v, __atomic_setup(v), n); |
| 113 | } | 113 | } |
| 114 | EXPORT_SYMBOL(_atomic64_xchg); | 114 | EXPORT_SYMBOL(_atomic64_xchg); |
| 115 | 115 | ||
| 116 | u64 _atomic64_xchg_add(u64 *v, u64 i) | 116 | long long _atomic64_xchg_add(long long *v, long long i) |
| 117 | { | 117 | { |
| 118 | return __atomic64_xchg_add(v, __atomic_setup(v), i); | 118 | return __atomic64_xchg_add(v, __atomic_setup(v), i); |
| 119 | } | 119 | } |
| 120 | EXPORT_SYMBOL(_atomic64_xchg_add); | 120 | EXPORT_SYMBOL(_atomic64_xchg_add); |
| 121 | 121 | ||
| 122 | u64 _atomic64_xchg_add_unless(u64 *v, u64 a, u64 u) | 122 | long long _atomic64_xchg_add_unless(long long *v, long long a, long long u) |
| 123 | { | 123 | { |
| 124 | /* | 124 | /* |
| 125 | * Note: argument order is switched here since it is easier | 125 | * Note: argument order is switched here since it is easier |
| @@ -130,7 +130,7 @@ u64 _atomic64_xchg_add_unless(u64 *v, u64 a, u64 u) | |||
| 130 | } | 130 | } |
| 131 | EXPORT_SYMBOL(_atomic64_xchg_add_unless); | 131 | EXPORT_SYMBOL(_atomic64_xchg_add_unless); |
| 132 | 132 | ||
| 133 | u64 _atomic64_cmpxchg(u64 *v, u64 o, u64 n) | 133 | long long _atomic64_cmpxchg(long long *v, long long o, long long n) |
| 134 | { | 134 | { |
| 135 | return __atomic64_cmpxchg(v, __atomic_setup(v), o, n); | 135 | return __atomic64_cmpxchg(v, __atomic_setup(v), o, n); |
| 136 | } | 136 | } |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ee2fb9d37745..0c11032e2e91 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -254,10 +254,6 @@ config ARCH_HWEIGHT_CFLAGS | |||
| 254 | default "-fcall-saved-ecx -fcall-saved-edx" if X86_32 | 254 | default "-fcall-saved-ecx -fcall-saved-edx" if X86_32 |
| 255 | default "-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" if X86_64 | 255 | default "-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" if X86_64 |
| 256 | 256 | ||
| 257 | config ARCH_CPU_PROBE_RELEASE | ||
| 258 | def_bool y | ||
| 259 | depends on HOTPLUG_CPU | ||
| 260 | |||
| 261 | config ARCH_SUPPORTS_UPROBES | 257 | config ARCH_SUPPORTS_UPROBES |
| 262 | def_bool y | 258 | def_bool y |
| 263 | 259 | ||
| @@ -860,7 +856,7 @@ source "kernel/Kconfig.preempt" | |||
| 860 | 856 | ||
| 861 | config X86_UP_APIC | 857 | config X86_UP_APIC |
| 862 | bool "Local APIC support on uniprocessors" | 858 | bool "Local APIC support on uniprocessors" |
| 863 | depends on X86_32 && !SMP && !X86_32_NON_STANDARD | 859 | depends on X86_32 && !SMP && !X86_32_NON_STANDARD && !PCI_MSI |
| 864 | ---help--- | 860 | ---help--- |
| 865 | A local APIC (Advanced Programmable Interrupt Controller) is an | 861 | A local APIC (Advanced Programmable Interrupt Controller) is an |
| 866 | integrated interrupt controller in the CPU. If you have a single-CPU | 862 | integrated interrupt controller in the CPU. If you have a single-CPU |
| @@ -885,11 +881,11 @@ config X86_UP_IOAPIC | |||
| 885 | 881 | ||
| 886 | config X86_LOCAL_APIC | 882 | config X86_LOCAL_APIC |
| 887 | def_bool y | 883 | def_bool y |
| 888 | depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC | 884 | depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI |
| 889 | 885 | ||
| 890 | config X86_IO_APIC | 886 | config X86_IO_APIC |
| 891 | def_bool y | 887 | def_bool y |
| 892 | depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC | 888 | depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI |
| 893 | 889 | ||
| 894 | config X86_VISWS_APIC | 890 | config X86_VISWS_APIC |
| 895 | def_bool y | 891 | def_bool y |
| @@ -1033,6 +1029,7 @@ config X86_REBOOTFIXUPS | |||
| 1033 | 1029 | ||
| 1034 | config MICROCODE | 1030 | config MICROCODE |
| 1035 | tristate "CPU microcode loading support" | 1031 | tristate "CPU microcode loading support" |
| 1032 | depends on CPU_SUP_AMD || CPU_SUP_INTEL | ||
| 1036 | select FW_LOADER | 1033 | select FW_LOADER |
| 1037 | ---help--- | 1034 | ---help--- |
| 1038 | 1035 | ||
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index b1977bad5435..c8c1e700c26e 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <acpi/pdc_intel.h> | 26 | #include <acpi/pdc_intel.h> |
| 27 | 27 | ||
| 28 | #include <asm/numa.h> | 28 | #include <asm/numa.h> |
| 29 | #include <asm/fixmap.h> | ||
| 29 | #include <asm/processor.h> | 30 | #include <asm/processor.h> |
| 30 | #include <asm/mmu.h> | 31 | #include <asm/mmu.h> |
| 31 | #include <asm/mpspec.h> | 32 | #include <asm/mpspec.h> |
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index d3f5c63078d8..89270b4318db 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h | |||
| @@ -374,7 +374,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) | |||
| 374 | * Catch too early usage of this before alternatives | 374 | * Catch too early usage of this before alternatives |
| 375 | * have run. | 375 | * have run. |
| 376 | */ | 376 | */ |
| 377 | asm goto("1: jmp %l[t_warn]\n" | 377 | asm_volatile_goto("1: jmp %l[t_warn]\n" |
| 378 | "2:\n" | 378 | "2:\n" |
| 379 | ".section .altinstructions,\"a\"\n" | 379 | ".section .altinstructions,\"a\"\n" |
| 380 | " .long 1b - .\n" | 380 | " .long 1b - .\n" |
| @@ -388,7 +388,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) | |||
| 388 | 388 | ||
| 389 | #endif | 389 | #endif |
| 390 | 390 | ||
| 391 | asm goto("1: jmp %l[t_no]\n" | 391 | asm_volatile_goto("1: jmp %l[t_no]\n" |
| 392 | "2:\n" | 392 | "2:\n" |
| 393 | ".section .altinstructions,\"a\"\n" | 393 | ".section .altinstructions,\"a\"\n" |
| 394 | " .long 1b - .\n" | 394 | " .long 1b - .\n" |
| @@ -453,7 +453,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit) | |||
| 453 | * have. Thus, we force the jump to the widest, 4-byte, signed relative | 453 | * have. Thus, we force the jump to the widest, 4-byte, signed relative |
| 454 | * offset even though the last would often fit in less bytes. | 454 | * offset even though the last would often fit in less bytes. |
| 455 | */ | 455 | */ |
| 456 | asm goto("1: .byte 0xe9\n .long %l[t_dynamic] - 2f\n" | 456 | asm_volatile_goto("1: .byte 0xe9\n .long %l[t_dynamic] - 2f\n" |
| 457 | "2:\n" | 457 | "2:\n" |
| 458 | ".section .altinstructions,\"a\"\n" | 458 | ".section .altinstructions,\"a\"\n" |
| 459 | " .long 1b - .\n" /* src offset */ | 459 | " .long 1b - .\n" /* src offset */ |
diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h index 64507f35800c..6a2cefb4395a 100644 --- a/arch/x86/include/asm/jump_label.h +++ b/arch/x86/include/asm/jump_label.h | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | static __always_inline bool arch_static_branch(struct static_key *key) | 19 | static __always_inline bool arch_static_branch(struct static_key *key) |
| 20 | { | 20 | { |
| 21 | asm goto("1:" | 21 | asm_volatile_goto("1:" |
| 22 | ".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t" | 22 | ".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t" |
| 23 | ".pushsection __jump_table, \"aw\" \n\t" | 23 | ".pushsection __jump_table, \"aw\" \n\t" |
| 24 | _ASM_ALIGN "\n\t" | 24 | _ASM_ALIGN "\n\t" |
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index 626cf70082d7..3142a94c7b4b 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h | |||
| @@ -94,7 +94,7 @@ static inline void early_reserve_e820_mpc_new(void) { } | |||
| 94 | #define default_get_smp_config x86_init_uint_noop | 94 | #define default_get_smp_config x86_init_uint_noop |
| 95 | #endif | 95 | #endif |
| 96 | 96 | ||
| 97 | void generic_processor_info(int apicid, int version); | 97 | int generic_processor_info(int apicid, int version); |
| 98 | #ifdef CONFIG_ACPI | 98 | #ifdef CONFIG_ACPI |
| 99 | extern void mp_register_ioapic(int id, u32 address, u32 gsi_base); | 99 | extern void mp_register_ioapic(int id, u32 address, u32 gsi_base); |
| 100 | extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, | 100 | extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, |
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index cb7502852acb..e139b13f2a33 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h | |||
| @@ -218,10 +218,14 @@ void msrs_free(struct msr *msrs); | |||
| 218 | #ifdef CONFIG_SMP | 218 | #ifdef CONFIG_SMP |
| 219 | int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); | 219 | int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); |
| 220 | int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); | 220 | int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); |
| 221 | int rdmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 *q); | ||
| 222 | int wrmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 q); | ||
| 221 | void rdmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs); | 223 | void rdmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs); |
| 222 | void wrmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs); | 224 | void wrmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs); |
| 223 | int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); | 225 | int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); |
| 224 | int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); | 226 | int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); |
| 227 | int rdmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 *q); | ||
| 228 | int wrmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q); | ||
| 225 | int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8]); | 229 | int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8]); |
| 226 | int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8]); | 230 | int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8]); |
| 227 | #else /* CONFIG_SMP */ | 231 | #else /* CONFIG_SMP */ |
| @@ -235,6 +239,16 @@ static inline int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) | |||
| 235 | wrmsr(msr_no, l, h); | 239 | wrmsr(msr_no, l, h); |
| 236 | return 0; | 240 | return 0; |
| 237 | } | 241 | } |
| 242 | static inline int rdmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 *q) | ||
| 243 | { | ||
| 244 | rdmsrl(msr_no, *q); | ||
| 245 | return 0; | ||
| 246 | } | ||
| 247 | static inline int wrmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 q) | ||
| 248 | { | ||
| 249 | wrmsrl(msr_no, q); | ||
| 250 | return 0; | ||
| 251 | } | ||
| 238 | static inline void rdmsr_on_cpus(const struct cpumask *m, u32 msr_no, | 252 | static inline void rdmsr_on_cpus(const struct cpumask *m, u32 msr_no, |
| 239 | struct msr *msrs) | 253 | struct msr *msrs) |
| 240 | { | 254 | { |
| @@ -254,6 +268,14 @@ static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) | |||
| 254 | { | 268 | { |
| 255 | return wrmsr_safe(msr_no, l, h); | 269 | return wrmsr_safe(msr_no, l, h); |
| 256 | } | 270 | } |
| 271 | static inline int rdmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 *q) | ||
| 272 | { | ||
| 273 | return rdmsrl_safe(msr_no, q); | ||
| 274 | } | ||
| 275 | static inline int wrmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q) | ||
| 276 | { | ||
| 277 | return wrmsrl_safe(msr_no, q); | ||
| 278 | } | ||
| 257 | static inline int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8]) | 279 | static inline int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8]) |
| 258 | { | 280 | { |
| 259 | return rdmsr_safe_regs(regs); | 281 | return rdmsr_safe_regs(regs); |
diff --git a/arch/x86/include/asm/mutex_64.h b/arch/x86/include/asm/mutex_64.h index e7e6751648ed..07537a44216e 100644 --- a/arch/x86/include/asm/mutex_64.h +++ b/arch/x86/include/asm/mutex_64.h | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | static inline void __mutex_fastpath_lock(atomic_t *v, | 20 | static inline void __mutex_fastpath_lock(atomic_t *v, |
| 21 | void (*fail_fn)(atomic_t *)) | 21 | void (*fail_fn)(atomic_t *)) |
| 22 | { | 22 | { |
| 23 | asm volatile goto(LOCK_PREFIX " decl %0\n" | 23 | asm_volatile_goto(LOCK_PREFIX " decl %0\n" |
| 24 | " jns %l[exit]\n" | 24 | " jns %l[exit]\n" |
| 25 | : : "m" (v->counter) | 25 | : : "m" (v->counter) |
| 26 | : "memory", "cc" | 26 | : "memory", "cc" |
| @@ -75,7 +75,7 @@ static inline int __mutex_fastpath_lock_retval(atomic_t *count) | |||
| 75 | static inline void __mutex_fastpath_unlock(atomic_t *v, | 75 | static inline void __mutex_fastpath_unlock(atomic_t *v, |
| 76 | void (*fail_fn)(atomic_t *)) | 76 | void (*fail_fn)(atomic_t *)) |
| 77 | { | 77 | { |
| 78 | asm volatile goto(LOCK_PREFIX " incl %0\n" | 78 | asm_volatile_goto(LOCK_PREFIX " incl %0\n" |
| 79 | " jg %l[exit]\n" | 79 | " jg %l[exit]\n" |
| 80 | : : "m" (v->counter) | 80 | : : "m" (v->counter) |
| 81 | : "memory", "cc" | 81 | : "memory", "cc" |
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index d00db60a5e04..6c0b43bd024b 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
| @@ -189,24 +189,31 @@ static int __init acpi_parse_madt(struct acpi_table_header *table) | |||
| 189 | return 0; | 189 | return 0; |
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | static void acpi_register_lapic(int id, u8 enabled) | 192 | /** |
| 193 | * acpi_register_lapic - register a local apic and generates a logic cpu number | ||
| 194 | * @id: local apic id to register | ||
| 195 | * @enabled: this cpu is enabled or not | ||
| 196 | * | ||
| 197 | * Returns the logic cpu number which maps to the local apic | ||
| 198 | */ | ||
| 199 | static int acpi_register_lapic(int id, u8 enabled) | ||
| 193 | { | 200 | { |
| 194 | unsigned int ver = 0; | 201 | unsigned int ver = 0; |
| 195 | 202 | ||
| 196 | if (id >= MAX_LOCAL_APIC) { | 203 | if (id >= MAX_LOCAL_APIC) { |
| 197 | printk(KERN_INFO PREFIX "skipped apicid that is too big\n"); | 204 | printk(KERN_INFO PREFIX "skipped apicid that is too big\n"); |
| 198 | return; | 205 | return -EINVAL; |
| 199 | } | 206 | } |
| 200 | 207 | ||
| 201 | if (!enabled) { | 208 | if (!enabled) { |
| 202 | ++disabled_cpus; | 209 | ++disabled_cpus; |
| 203 | return; | 210 | return -EINVAL; |
| 204 | } | 211 | } |
| 205 | 212 | ||
| 206 | if (boot_cpu_physical_apicid != -1U) | 213 | if (boot_cpu_physical_apicid != -1U) |
| 207 | ver = apic_version[boot_cpu_physical_apicid]; | 214 | ver = apic_version[boot_cpu_physical_apicid]; |
| 208 | 215 | ||
| 209 | generic_processor_info(id, ver); | 216 | return generic_processor_info(id, ver); |
| 210 | } | 217 | } |
| 211 | 218 | ||
| 212 | static int __init | 219 | static int __init |
| @@ -614,84 +621,27 @@ static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid) | |||
| 614 | #endif | 621 | #endif |
| 615 | } | 622 | } |
| 616 | 623 | ||
| 617 | static int _acpi_map_lsapic(acpi_handle handle, int *pcpu) | 624 | static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) |
| 618 | { | 625 | { |
| 619 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | ||
| 620 | union acpi_object *obj; | ||
| 621 | struct acpi_madt_local_apic *lapic; | ||
| 622 | cpumask_var_t tmp_map, new_map; | ||
| 623 | u8 physid; | ||
| 624 | int cpu; | 626 | int cpu; |
| 625 | int retval = -ENOMEM; | ||
| 626 | |||
| 627 | if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer))) | ||
| 628 | return -EINVAL; | ||
| 629 | |||
| 630 | if (!buffer.length || !buffer.pointer) | ||
| 631 | return -EINVAL; | ||
| 632 | |||
| 633 | obj = buffer.pointer; | ||
| 634 | if (obj->type != ACPI_TYPE_BUFFER || | ||
| 635 | obj->buffer.length < sizeof(*lapic)) { | ||
| 636 | kfree(buffer.pointer); | ||
| 637 | return -EINVAL; | ||
| 638 | } | ||
| 639 | 627 | ||
| 640 | lapic = (struct acpi_madt_local_apic *)obj->buffer.pointer; | 628 | cpu = acpi_register_lapic(physid, ACPI_MADT_ENABLED); |
| 641 | 629 | if (cpu < 0) { | |
| 642 | if (lapic->header.type != ACPI_MADT_TYPE_LOCAL_APIC || | 630 | pr_info(PREFIX "Unable to map lapic to logical cpu number\n"); |
| 643 | !(lapic->lapic_flags & ACPI_MADT_ENABLED)) { | 631 | return cpu; |
| 644 | kfree(buffer.pointer); | ||
| 645 | return -EINVAL; | ||
| 646 | } | ||
| 647 | |||
| 648 | physid = lapic->id; | ||
| 649 | |||
| 650 | kfree(buffer.pointer); | ||
| 651 | buffer.length = ACPI_ALLOCATE_BUFFER; | ||
| 652 | buffer.pointer = NULL; | ||
| 653 | lapic = NULL; | ||
| 654 | |||
| 655 | if (!alloc_cpumask_var(&tmp_map, GFP_KERNEL)) | ||
| 656 | goto out; | ||
| 657 | |||
| 658 | if (!alloc_cpumask_var(&new_map, GFP_KERNEL)) | ||
| 659 | goto free_tmp_map; | ||
| 660 | |||
| 661 | cpumask_copy(tmp_map, cpu_present_mask); | ||
| 662 | acpi_register_lapic(physid, ACPI_MADT_ENABLED); | ||
| 663 | |||
| 664 | /* | ||
| 665 | * If acpi_register_lapic successfully generates a new logical cpu | ||
| 666 | * number, then the following will get us exactly what was mapped | ||
| 667 | */ | ||
| 668 | cpumask_andnot(new_map, cpu_present_mask, tmp_map); | ||
| 669 | if (cpumask_empty(new_map)) { | ||
| 670 | printk ("Unable to map lapic to logical cpu number\n"); | ||
| 671 | retval = -EINVAL; | ||
| 672 | goto free_new_map; | ||
| 673 | } | 632 | } |
| 674 | 633 | ||
| 675 | acpi_processor_set_pdc(handle); | 634 | acpi_processor_set_pdc(handle); |
| 676 | |||
| 677 | cpu = cpumask_first(new_map); | ||
| 678 | acpi_map_cpu2node(handle, cpu, physid); | 635 | acpi_map_cpu2node(handle, cpu, physid); |
| 679 | 636 | ||
| 680 | *pcpu = cpu; | 637 | *pcpu = cpu; |
| 681 | retval = 0; | 638 | return 0; |
| 682 | |||
| 683 | free_new_map: | ||
| 684 | free_cpumask_var(new_map); | ||
| 685 | free_tmp_map: | ||
| 686 | free_cpumask_var(tmp_map); | ||
| 687 | out: | ||
| 688 | return retval; | ||
| 689 | } | 639 | } |
| 690 | 640 | ||
| 691 | /* wrapper to silence section mismatch warning */ | 641 | /* wrapper to silence section mismatch warning */ |
| 692 | int __ref acpi_map_lsapic(acpi_handle handle, int *pcpu) | 642 | int __ref acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) |
| 693 | { | 643 | { |
| 694 | return _acpi_map_lsapic(handle, pcpu); | 644 | return _acpi_map_lsapic(handle, physid, pcpu); |
| 695 | } | 645 | } |
| 696 | EXPORT_SYMBOL(acpi_map_lsapic); | 646 | EXPORT_SYMBOL(acpi_map_lsapic); |
| 697 | 647 | ||
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index a7eb82d9b012..ed165d657380 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
| @@ -2107,7 +2107,7 @@ void disconnect_bsp_APIC(int virt_wire_setup) | |||
| 2107 | apic_write(APIC_LVT1, value); | 2107 | apic_write(APIC_LVT1, value); |
| 2108 | } | 2108 | } |
| 2109 | 2109 | ||
| 2110 | void generic_processor_info(int apicid, int version) | 2110 | int generic_processor_info(int apicid, int version) |
| 2111 | { | 2111 | { |
| 2112 | int cpu, max = nr_cpu_ids; | 2112 | int cpu, max = nr_cpu_ids; |
| 2113 | bool boot_cpu_detected = physid_isset(boot_cpu_physical_apicid, | 2113 | bool boot_cpu_detected = physid_isset(boot_cpu_physical_apicid, |
| @@ -2127,7 +2127,7 @@ void generic_processor_info(int apicid, int version) | |||
| 2127 | " Processor %d/0x%x ignored.\n", max, thiscpu, apicid); | 2127 | " Processor %d/0x%x ignored.\n", max, thiscpu, apicid); |
| 2128 | 2128 | ||
| 2129 | disabled_cpus++; | 2129 | disabled_cpus++; |
| 2130 | return; | 2130 | return -ENODEV; |
| 2131 | } | 2131 | } |
| 2132 | 2132 | ||
| 2133 | if (num_processors >= nr_cpu_ids) { | 2133 | if (num_processors >= nr_cpu_ids) { |
| @@ -2138,7 +2138,7 @@ void generic_processor_info(int apicid, int version) | |||
| 2138 | " Processor %d/0x%x ignored.\n", max, thiscpu, apicid); | 2138 | " Processor %d/0x%x ignored.\n", max, thiscpu, apicid); |
| 2139 | 2139 | ||
| 2140 | disabled_cpus++; | 2140 | disabled_cpus++; |
| 2141 | return; | 2141 | return -EINVAL; |
| 2142 | } | 2142 | } |
| 2143 | 2143 | ||
| 2144 | num_processors++; | 2144 | num_processors++; |
| @@ -2183,6 +2183,8 @@ void generic_processor_info(int apicid, int version) | |||
| 2183 | #endif | 2183 | #endif |
| 2184 | set_cpu_possible(cpu, true); | 2184 | set_cpu_possible(cpu, true); |
| 2185 | set_cpu_present(cpu, true); | 2185 | set_cpu_present(cpu, true); |
| 2186 | |||
| 2187 | return cpu; | ||
| 2186 | } | 2188 | } |
| 2187 | 2189 | ||
| 2188 | int hard_smp_processor_id(void) | 2190 | int hard_smp_processor_id(void) |
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 1191ac1c9d25..a419814cea57 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c | |||
| @@ -113,7 +113,7 @@ static int __init early_get_pnodeid(void) | |||
| 113 | break; | 113 | break; |
| 114 | case UV3_HUB_PART_NUMBER: | 114 | case UV3_HUB_PART_NUMBER: |
| 115 | case UV3_HUB_PART_NUMBER_X: | 115 | case UV3_HUB_PART_NUMBER_X: |
| 116 | uv_min_hub_revision_id += UV3_HUB_REVISION_BASE - 1; | 116 | uv_min_hub_revision_id += UV3_HUB_REVISION_BASE; |
| 117 | break; | 117 | break; |
| 118 | } | 118 | } |
| 119 | 119 | ||
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 897783b3302a..9d8449158cf9 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
| @@ -1888,10 +1888,7 @@ void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now) | |||
| 1888 | userpg->cap_user_rdpmc = x86_pmu.attr_rdpmc; | 1888 | userpg->cap_user_rdpmc = x86_pmu.attr_rdpmc; |
| 1889 | userpg->pmc_width = x86_pmu.cntval_bits; | 1889 | userpg->pmc_width = x86_pmu.cntval_bits; |
| 1890 | 1890 | ||
| 1891 | if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) | 1891 | if (!sched_clock_stable) |
| 1892 | return; | ||
| 1893 | |||
| 1894 | if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC)) | ||
| 1895 | return; | 1892 | return; |
| 1896 | 1893 | ||
| 1897 | userpg->cap_user_time = 1; | 1894 | userpg->cap_user_time = 1; |
| @@ -1899,10 +1896,8 @@ void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now) | |||
| 1899 | userpg->time_shift = CYC2NS_SCALE_FACTOR; | 1896 | userpg->time_shift = CYC2NS_SCALE_FACTOR; |
| 1900 | userpg->time_offset = this_cpu_read(cyc2ns_offset) - now; | 1897 | userpg->time_offset = this_cpu_read(cyc2ns_offset) - now; |
| 1901 | 1898 | ||
| 1902 | if (sched_clock_stable && !check_tsc_disabled()) { | 1899 | userpg->cap_user_time_zero = 1; |
| 1903 | userpg->cap_user_time_zero = 1; | 1900 | userpg->time_zero = this_cpu_read(cyc2ns_offset); |
| 1904 | userpg->time_zero = this_cpu_read(cyc2ns_offset); | ||
| 1905 | } | ||
| 1906 | } | 1901 | } |
| 1907 | 1902 | ||
| 1908 | /* | 1903 | /* |
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 697b93af02dd..a0e2a8a80c94 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c | |||
| @@ -775,11 +775,22 @@ void __init kvm_spinlock_init(void) | |||
| 775 | if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT)) | 775 | if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT)) |
| 776 | return; | 776 | return; |
| 777 | 777 | ||
| 778 | printk(KERN_INFO "KVM setup paravirtual spinlock\n"); | 778 | pv_lock_ops.lock_spinning = PV_CALLEE_SAVE(kvm_lock_spinning); |
| 779 | pv_lock_ops.unlock_kick = kvm_unlock_kick; | ||
| 780 | } | ||
| 781 | |||
| 782 | static __init int kvm_spinlock_init_jump(void) | ||
| 783 | { | ||
| 784 | if (!kvm_para_available()) | ||
| 785 | return 0; | ||
| 786 | if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT)) | ||
| 787 | return 0; | ||
| 779 | 788 | ||
| 780 | static_key_slow_inc(¶virt_ticketlocks_enabled); | 789 | static_key_slow_inc(¶virt_ticketlocks_enabled); |
| 790 | printk(KERN_INFO "KVM setup paravirtual spinlock\n"); | ||
| 781 | 791 | ||
| 782 | pv_lock_ops.lock_spinning = PV_CALLEE_SAVE(kvm_lock_spinning); | 792 | return 0; |
| 783 | pv_lock_ops.unlock_kick = kvm_unlock_kick; | ||
| 784 | } | 793 | } |
| 794 | early_initcall(kvm_spinlock_init_jump); | ||
| 795 | |||
| 785 | #endif /* CONFIG_PARAVIRT_SPINLOCKS */ | 796 | #endif /* CONFIG_PARAVIRT_SPINLOCKS */ |
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index e643e744e4d8..7e920bff99a3 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
| @@ -326,6 +326,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { | |||
| 326 | DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"), | 326 | DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"), |
| 327 | }, | 327 | }, |
| 328 | }, | 328 | }, |
| 329 | { /* Handle problems with rebooting on the Latitude E5410. */ | ||
| 330 | .callback = set_pci_reboot, | ||
| 331 | .ident = "Dell Latitude E5410", | ||
| 332 | .matches = { | ||
| 333 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 334 | DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5410"), | ||
| 335 | }, | ||
| 336 | }, | ||
| 329 | { /* Handle problems with rebooting on the Latitude E5420. */ | 337 | { /* Handle problems with rebooting on the Latitude E5420. */ |
| 330 | .callback = set_pci_reboot, | 338 | .callback = set_pci_reboot, |
| 331 | .ident = "Dell Latitude E5420", | 339 | .ident = "Dell Latitude E5420", |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 6cacab671f9b..e73b3f53310c 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -82,27 +82,6 @@ | |||
| 82 | /* State of each CPU */ | 82 | /* State of each CPU */ |
| 83 | DEFINE_PER_CPU(int, cpu_state) = { 0 }; | 83 | DEFINE_PER_CPU(int, cpu_state) = { 0 }; |
| 84 | 84 | ||
| 85 | #ifdef CONFIG_HOTPLUG_CPU | ||
| 86 | /* | ||
| 87 | * We need this for trampoline_base protection from concurrent accesses when | ||
| 88 | * off- and onlining cores wildly. | ||
| 89 | */ | ||
| 90 | static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex); | ||
| 91 | |||
| 92 | void cpu_hotplug_driver_lock(void) | ||
| 93 | { | ||
| 94 | mutex_lock(&x86_cpu_hotplug_driver_mutex); | ||
| 95 | } | ||
| 96 | |||
| 97 | void cpu_hotplug_driver_unlock(void) | ||
| 98 | { | ||
| 99 | mutex_unlock(&x86_cpu_hotplug_driver_mutex); | ||
| 100 | } | ||
| 101 | |||
| 102 | ssize_t arch_cpu_probe(const char *buf, size_t count) { return -1; } | ||
| 103 | ssize_t arch_cpu_release(const char *buf, size_t count) { return -1; } | ||
| 104 | #endif | ||
| 105 | |||
| 106 | /* Number of siblings per CPU package */ | 85 | /* Number of siblings per CPU package */ |
| 107 | int smp_num_siblings = 1; | 86 | int smp_num_siblings = 1; |
| 108 | EXPORT_SYMBOL(smp_num_siblings); | 87 | EXPORT_SYMBOL(smp_num_siblings); |
diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c index 6e60b5fe2244..649b010da00b 100644 --- a/arch/x86/kernel/topology.c +++ b/arch/x86/kernel/topology.c | |||
| @@ -65,29 +65,32 @@ int __ref _debug_hotplug_cpu(int cpu, int action) | |||
| 65 | if (!cpu_is_hotpluggable(cpu)) | 65 | if (!cpu_is_hotpluggable(cpu)) |
| 66 | return -EINVAL; | 66 | return -EINVAL; |
| 67 | 67 | ||
| 68 | cpu_hotplug_driver_lock(); | 68 | lock_device_hotplug(); |
| 69 | 69 | ||
| 70 | switch (action) { | 70 | switch (action) { |
| 71 | case 0: | 71 | case 0: |
| 72 | ret = cpu_down(cpu); | 72 | ret = cpu_down(cpu); |
| 73 | if (!ret) { | 73 | if (!ret) { |
| 74 | pr_info("CPU %u is now offline\n", cpu); | 74 | pr_info("CPU %u is now offline\n", cpu); |
| 75 | dev->offline = true; | ||
| 75 | kobject_uevent(&dev->kobj, KOBJ_OFFLINE); | 76 | kobject_uevent(&dev->kobj, KOBJ_OFFLINE); |
| 76 | } else | 77 | } else |
| 77 | pr_debug("Can't offline CPU%d.\n", cpu); | 78 | pr_debug("Can't offline CPU%d.\n", cpu); |
| 78 | break; | 79 | break; |
| 79 | case 1: | 80 | case 1: |
| 80 | ret = cpu_up(cpu); | 81 | ret = cpu_up(cpu); |
| 81 | if (!ret) | 82 | if (!ret) { |
| 83 | dev->offline = false; | ||
| 82 | kobject_uevent(&dev->kobj, KOBJ_ONLINE); | 84 | kobject_uevent(&dev->kobj, KOBJ_ONLINE); |
| 83 | else | 85 | } else { |
| 84 | pr_debug("Can't online CPU%d.\n", cpu); | 86 | pr_debug("Can't online CPU%d.\n", cpu); |
| 87 | } | ||
| 85 | break; | 88 | break; |
| 86 | default: | 89 | default: |
| 87 | ret = -EINVAL; | 90 | ret = -EINVAL; |
| 88 | } | 91 | } |
| 89 | 92 | ||
| 90 | cpu_hotplug_driver_unlock(); | 93 | unlock_device_hotplug(); |
| 91 | 94 | ||
| 92 | return ret; | 95 | return ret; |
| 93 | } | 96 | } |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 3b8e7459dd4d..2b2fce1b2009 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
| @@ -3255,25 +3255,29 @@ static void vmx_decache_cr4_guest_bits(struct kvm_vcpu *vcpu) | |||
| 3255 | 3255 | ||
| 3256 | static void ept_load_pdptrs(struct kvm_vcpu *vcpu) | 3256 | static void ept_load_pdptrs(struct kvm_vcpu *vcpu) |
| 3257 | { | 3257 | { |
| 3258 | struct kvm_mmu *mmu = vcpu->arch.walk_mmu; | ||
| 3259 | |||
| 3258 | if (!test_bit(VCPU_EXREG_PDPTR, | 3260 | if (!test_bit(VCPU_EXREG_PDPTR, |
| 3259 | (unsigned long *)&vcpu->arch.regs_dirty)) | 3261 | (unsigned long *)&vcpu->arch.regs_dirty)) |
| 3260 | return; | 3262 | return; |
| 3261 | 3263 | ||
| 3262 | if (is_paging(vcpu) && is_pae(vcpu) && !is_long_mode(vcpu)) { | 3264 | if (is_paging(vcpu) && is_pae(vcpu) && !is_long_mode(vcpu)) { |
| 3263 | vmcs_write64(GUEST_PDPTR0, vcpu->arch.mmu.pdptrs[0]); | 3265 | vmcs_write64(GUEST_PDPTR0, mmu->pdptrs[0]); |
| 3264 | vmcs_write64(GUEST_PDPTR1, vcpu->arch.mmu.pdptrs[1]); | 3266 | vmcs_write64(GUEST_PDPTR1, mmu->pdptrs[1]); |
| 3265 | vmcs_write64(GUEST_PDPTR2, vcpu->arch.mmu.pdptrs[2]); | 3267 | vmcs_write64(GUEST_PDPTR2, mmu->pdptrs[2]); |
| 3266 | vmcs_write64(GUEST_PDPTR3, vcpu->arch.mmu.pdptrs[3]); | 3268 | vmcs_write64(GUEST_PDPTR3, mmu->pdptrs[3]); |
| 3267 | } | 3269 | } |
| 3268 | } | 3270 | } |
| 3269 | 3271 | ||
| 3270 | static void ept_save_pdptrs(struct kvm_vcpu *vcpu) | 3272 | static void ept_save_pdptrs(struct kvm_vcpu *vcpu) |
| 3271 | { | 3273 | { |
| 3274 | struct kvm_mmu *mmu = vcpu->arch.walk_mmu; | ||
| 3275 | |||
| 3272 | if (is_paging(vcpu) && is_pae(vcpu) && !is_long_mode(vcpu)) { | 3276 | if (is_paging(vcpu) && is_pae(vcpu) && !is_long_mode(vcpu)) { |
| 3273 | vcpu->arch.mmu.pdptrs[0] = vmcs_read64(GUEST_PDPTR0); | 3277 | mmu->pdptrs[0] = vmcs_read64(GUEST_PDPTR0); |
| 3274 | vcpu->arch.mmu.pdptrs[1] = vmcs_read64(GUEST_PDPTR1); | 3278 | mmu->pdptrs[1] = vmcs_read64(GUEST_PDPTR1); |
| 3275 | vcpu->arch.mmu.pdptrs[2] = vmcs_read64(GUEST_PDPTR2); | 3279 | mmu->pdptrs[2] = vmcs_read64(GUEST_PDPTR2); |
| 3276 | vcpu->arch.mmu.pdptrs[3] = vmcs_read64(GUEST_PDPTR3); | 3280 | mmu->pdptrs[3] = vmcs_read64(GUEST_PDPTR3); |
| 3277 | } | 3281 | } |
| 3278 | 3282 | ||
| 3279 | __set_bit(VCPU_EXREG_PDPTR, | 3283 | __set_bit(VCPU_EXREG_PDPTR, |
| @@ -7777,10 +7781,6 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) | |||
| 7777 | vmcs_write64(GUEST_PDPTR1, vmcs12->guest_pdptr1); | 7781 | vmcs_write64(GUEST_PDPTR1, vmcs12->guest_pdptr1); |
| 7778 | vmcs_write64(GUEST_PDPTR2, vmcs12->guest_pdptr2); | 7782 | vmcs_write64(GUEST_PDPTR2, vmcs12->guest_pdptr2); |
| 7779 | vmcs_write64(GUEST_PDPTR3, vmcs12->guest_pdptr3); | 7783 | vmcs_write64(GUEST_PDPTR3, vmcs12->guest_pdptr3); |
| 7780 | __clear_bit(VCPU_EXREG_PDPTR, | ||
| 7781 | (unsigned long *)&vcpu->arch.regs_avail); | ||
| 7782 | __clear_bit(VCPU_EXREG_PDPTR, | ||
| 7783 | (unsigned long *)&vcpu->arch.regs_dirty); | ||
| 7784 | } | 7784 | } |
| 7785 | 7785 | ||
| 7786 | kvm_register_write(vcpu, VCPU_REGS_RSP, vmcs12->guest_rsp); | 7786 | kvm_register_write(vcpu, VCPU_REGS_RSP, vmcs12->guest_rsp); |
diff --git a/arch/x86/lib/msr-smp.c b/arch/x86/lib/msr-smp.c index a6b1b86d2253..518532e6a3fa 100644 --- a/arch/x86/lib/msr-smp.c +++ b/arch/x86/lib/msr-smp.c | |||
| @@ -47,6 +47,21 @@ int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h) | |||
| 47 | } | 47 | } |
| 48 | EXPORT_SYMBOL(rdmsr_on_cpu); | 48 | EXPORT_SYMBOL(rdmsr_on_cpu); |
| 49 | 49 | ||
| 50 | int rdmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 *q) | ||
| 51 | { | ||
| 52 | int err; | ||
| 53 | struct msr_info rv; | ||
| 54 | |||
| 55 | memset(&rv, 0, sizeof(rv)); | ||
| 56 | |||
| 57 | rv.msr_no = msr_no; | ||
| 58 | err = smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 1); | ||
| 59 | *q = rv.reg.q; | ||
| 60 | |||
| 61 | return err; | ||
| 62 | } | ||
| 63 | EXPORT_SYMBOL(rdmsrl_on_cpu); | ||
| 64 | |||
| 50 | int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) | 65 | int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) |
| 51 | { | 66 | { |
| 52 | int err; | 67 | int err; |
| @@ -63,6 +78,22 @@ int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) | |||
| 63 | } | 78 | } |
| 64 | EXPORT_SYMBOL(wrmsr_on_cpu); | 79 | EXPORT_SYMBOL(wrmsr_on_cpu); |
| 65 | 80 | ||
| 81 | int wrmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 q) | ||
| 82 | { | ||
| 83 | int err; | ||
| 84 | struct msr_info rv; | ||
| 85 | |||
| 86 | memset(&rv, 0, sizeof(rv)); | ||
| 87 | |||
| 88 | rv.msr_no = msr_no; | ||
| 89 | rv.reg.q = q; | ||
| 90 | |||
| 91 | err = smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 1); | ||
| 92 | |||
| 93 | return err; | ||
| 94 | } | ||
| 95 | EXPORT_SYMBOL(wrmsrl_on_cpu); | ||
| 96 | |||
| 66 | static void __rwmsr_on_cpus(const struct cpumask *mask, u32 msr_no, | 97 | static void __rwmsr_on_cpus(const struct cpumask *mask, u32 msr_no, |
| 67 | struct msr *msrs, | 98 | struct msr *msrs, |
| 68 | void (*msr_func) (void *info)) | 99 | void (*msr_func) (void *info)) |
| @@ -159,6 +190,37 @@ int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) | |||
| 159 | } | 190 | } |
| 160 | EXPORT_SYMBOL(wrmsr_safe_on_cpu); | 191 | EXPORT_SYMBOL(wrmsr_safe_on_cpu); |
| 161 | 192 | ||
| 193 | int wrmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q) | ||
| 194 | { | ||
| 195 | int err; | ||
| 196 | struct msr_info rv; | ||
| 197 | |||
| 198 | memset(&rv, 0, sizeof(rv)); | ||
| 199 | |||
| 200 | rv.msr_no = msr_no; | ||
| 201 | rv.reg.q = q; | ||
| 202 | |||
| 203 | err = smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &rv, 1); | ||
| 204 | |||
| 205 | return err ? err : rv.err; | ||
| 206 | } | ||
| 207 | EXPORT_SYMBOL(wrmsrl_safe_on_cpu); | ||
| 208 | |||
| 209 | int rdmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 *q) | ||
| 210 | { | ||
| 211 | int err; | ||
| 212 | struct msr_info rv; | ||
| 213 | |||
| 214 | memset(&rv, 0, sizeof(rv)); | ||
| 215 | |||
| 216 | rv.msr_no = msr_no; | ||
| 217 | err = smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &rv, 1); | ||
| 218 | *q = rv.reg.q; | ||
| 219 | |||
| 220 | return err ? err : rv.err; | ||
| 221 | } | ||
| 222 | EXPORT_SYMBOL(rdmsrl_safe_on_cpu); | ||
| 223 | |||
| 162 | /* | 224 | /* |
| 163 | * These variants are significantly slower, but allows control over | 225 | * These variants are significantly slower, but allows control over |
| 164 | * the entire 32-bit GPR set. | 226 | * the entire 32-bit GPR set. |
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 79c216aa0e2b..516593e1ce33 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c | |||
| @@ -772,13 +772,21 @@ out: | |||
| 772 | return; | 772 | return; |
| 773 | } | 773 | } |
| 774 | 774 | ||
| 775 | static void bpf_jit_free_deferred(struct work_struct *work) | ||
| 776 | { | ||
| 777 | struct sk_filter *fp = container_of(work, struct sk_filter, work); | ||
| 778 | unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK; | ||
| 779 | struct bpf_binary_header *header = (void *)addr; | ||
| 780 | |||
| 781 | set_memory_rw(addr, header->pages); | ||
| 782 | module_free(NULL, header); | ||
| 783 | kfree(fp); | ||
| 784 | } | ||
| 785 | |||
| 775 | void bpf_jit_free(struct sk_filter *fp) | 786 | void bpf_jit_free(struct sk_filter *fp) |
| 776 | { | 787 | { |
| 777 | if (fp->bpf_func != sk_run_filter) { | 788 | if (fp->bpf_func != sk_run_filter) { |
| 778 | unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK; | 789 | INIT_WORK(&fp->work, bpf_jit_free_deferred); |
| 779 | struct bpf_binary_header *header = (void *)addr; | 790 | schedule_work(&fp->work); |
| 780 | |||
| 781 | set_memory_rw(addr, header->pages); | ||
| 782 | module_free(NULL, header); | ||
| 783 | } | 791 | } |
| 784 | } | 792 | } |
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c index fef7d0ba7e3a..649a12befba9 100644 --- a/arch/x86/platform/olpc/olpc-xo15-sci.c +++ b/arch/x86/platform/olpc/olpc-xo15-sci.c | |||
| @@ -40,16 +40,9 @@ static bool lid_wake_on_close; | |||
| 40 | */ | 40 | */ |
| 41 | static int set_lid_wake_behavior(bool wake_on_close) | 41 | static int set_lid_wake_behavior(bool wake_on_close) |
| 42 | { | 42 | { |
| 43 | struct acpi_object_list arg_list; | ||
| 44 | union acpi_object arg; | ||
| 45 | acpi_status status; | 43 | acpi_status status; |
| 46 | 44 | ||
| 47 | arg_list.count = 1; | 45 | status = acpi_execute_simple_method(NULL, "\\_SB.PCI0.LID.LIDW", wake_on_close); |
| 48 | arg_list.pointer = &arg; | ||
| 49 | arg.type = ACPI_TYPE_INTEGER; | ||
| 50 | arg.integer.value = wake_on_close; | ||
| 51 | |||
| 52 | status = acpi_evaluate_object(NULL, "\\_SB.PCI0.LID.LIDW", &arg_list, NULL); | ||
| 53 | if (ACPI_FAILURE(status)) { | 46 | if (ACPI_FAILURE(status)) { |
| 54 | pr_warning(PFX "failed to set lid behavior\n"); | 47 | pr_warning(PFX "failed to set lid behavior\n"); |
| 55 | return 1; | 48 | return 1; |
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index d1e4777b4e75..31d04758b76f 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
| @@ -278,6 +278,15 @@ static void __init xen_smp_prepare_boot_cpu(void) | |||
| 278 | old memory can be recycled */ | 278 | old memory can be recycled */ |
| 279 | make_lowmem_page_readwrite(xen_initial_gdt); | 279 | make_lowmem_page_readwrite(xen_initial_gdt); |
| 280 | 280 | ||
| 281 | #ifdef CONFIG_X86_32 | ||
| 282 | /* | ||
| 283 | * Xen starts us with XEN_FLAT_RING1_DS, but linux code | ||
| 284 | * expects __USER_DS | ||
| 285 | */ | ||
| 286 | loadsegment(ds, __USER_DS); | ||
| 287 | loadsegment(es, __USER_DS); | ||
| 288 | #endif | ||
| 289 | |||
| 281 | xen_filter_cpu_maps(); | 290 | xen_filter_cpu_maps(); |
| 282 | xen_setup_vcpu_info_placement(); | 291 | xen_setup_vcpu_info_placement(); |
| 283 | } | 292 | } |
diff --git a/block/partitions/efi.c b/block/partitions/efi.c index 1eb09ee5311b..a8287b49d062 100644 --- a/block/partitions/efi.c +++ b/block/partitions/efi.c | |||
| @@ -222,11 +222,16 @@ check_hybrid: | |||
| 222 | * the disk size. | 222 | * the disk size. |
| 223 | * | 223 | * |
| 224 | * Hybrid MBRs do not necessarily comply with this. | 224 | * Hybrid MBRs do not necessarily comply with this. |
| 225 | * | ||
| 226 | * Consider a bad value here to be a warning to support dd'ing | ||
| 227 | * an image from a smaller disk to a larger disk. | ||
| 225 | */ | 228 | */ |
| 226 | if (ret == GPT_MBR_PROTECTIVE) { | 229 | if (ret == GPT_MBR_PROTECTIVE) { |
| 227 | sz = le32_to_cpu(mbr->partition_record[part].size_in_lba); | 230 | sz = le32_to_cpu(mbr->partition_record[part].size_in_lba); |
| 228 | if (sz != (uint32_t) total_sectors - 1 && sz != 0xFFFFFFFF) | 231 | if (sz != (uint32_t) total_sectors - 1 && sz != 0xFFFFFFFF) |
| 229 | ret = 0; | 232 | pr_debug("GPT: mbr size in lba (%u) different than whole disk (%u).\n", |
| 233 | sz, min_t(uint32_t, | ||
| 234 | total_sectors - 1, 0xFFFFFFFF)); | ||
| 230 | } | 235 | } |
| 231 | done: | 236 | done: |
| 232 | return ret; | 237 | return ret; |
diff --git a/drivers/Kconfig b/drivers/Kconfig index aa43b911ccef..969e9871785c 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -166,4 +166,6 @@ source "drivers/reset/Kconfig" | |||
| 166 | 166 | ||
| 167 | source "drivers/fmc/Kconfig" | 167 | source "drivers/fmc/Kconfig" |
| 168 | 168 | ||
| 169 | source "drivers/powercap/Kconfig" | ||
| 170 | |||
| 169 | endmenu | 171 | endmenu |
diff --git a/drivers/Makefile b/drivers/Makefile index ab93de8297f1..34c1d554f69b 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -152,3 +152,4 @@ obj-$(CONFIG_VME_BUS) += vme/ | |||
| 152 | obj-$(CONFIG_IPACK_BUS) += ipack/ | 152 | obj-$(CONFIG_IPACK_BUS) += ipack/ |
| 153 | obj-$(CONFIG_NTB) += ntb/ | 153 | obj-$(CONFIG_NTB) += ntb/ |
| 154 | obj-$(CONFIG_FMC) += fmc/ | 154 | obj-$(CONFIG_FMC) += fmc/ |
| 155 | obj-$(CONFIG_POWERCAP) += powercap/ | ||
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 22327e6a7236..589da059ce39 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -24,7 +24,7 @@ menuconfig ACPI | |||
| 24 | are configured, ACPI is used. | 24 | are configured, ACPI is used. |
| 25 | 25 | ||
| 26 | The project home page for the Linux ACPI subsystem is here: | 26 | The project home page for the Linux ACPI subsystem is here: |
| 27 | <http://www.lesswatts.org/projects/acpi/> | 27 | <https://01.org/linux-acpi> |
| 28 | 28 | ||
| 29 | Linux support for ACPI is based on Intel Corporation's ACPI | 29 | Linux support for ACPI is based on Intel Corporation's ACPI |
| 30 | Component Architecture (ACPI CA). For more information on the | 30 | Component Architecture (ACPI CA). For more information on the |
| @@ -56,23 +56,6 @@ config ACPI_PROCFS | |||
| 56 | 56 | ||
| 57 | Say N to delete /proc/acpi/ files that have moved to /sys/ | 57 | Say N to delete /proc/acpi/ files that have moved to /sys/ |
| 58 | 58 | ||
| 59 | config ACPI_PROCFS_POWER | ||
| 60 | bool "Deprecated power /proc/acpi directories" | ||
| 61 | depends on PROC_FS | ||
| 62 | help | ||
| 63 | For backwards compatibility, this option allows | ||
| 64 | deprecated power /proc/acpi/ directories to exist, even when | ||
| 65 | they have been replaced by functions in /sys. | ||
| 66 | The deprecated directories (and their replacements) include: | ||
| 67 | /proc/acpi/battery/* (/sys/class/power_supply/*) | ||
| 68 | /proc/acpi/ac_adapter/* (sys/class/power_supply/*) | ||
| 69 | This option has no effect on /proc/acpi/ directories | ||
| 70 | and functions, which do not yet exist in /sys | ||
| 71 | This option, together with the proc directories, will be | ||
| 72 | deleted in 2.6.39. | ||
| 73 | |||
| 74 | Say N to delete power /proc/acpi/ directories that have moved to /sys/ | ||
| 75 | |||
| 76 | config ACPI_EC_DEBUGFS | 59 | config ACPI_EC_DEBUGFS |
| 77 | tristate "EC read/write access through /sys/kernel/debug/ec" | 60 | tristate "EC read/write access through /sys/kernel/debug/ec" |
| 78 | default n | 61 | default n |
| @@ -123,9 +106,9 @@ config ACPI_BUTTON | |||
| 123 | default y | 106 | default y |
| 124 | help | 107 | help |
| 125 | This driver handles events on the power, sleep, and lid buttons. | 108 | This driver handles events on the power, sleep, and lid buttons. |
| 126 | A daemon reads /proc/acpi/event and perform user-defined actions | 109 | A daemon reads events from input devices or via netlink and |
| 127 | such as shutting down the system. This is necessary for | 110 | performs user-defined actions such as shutting down the system. |
| 128 | software-controlled poweroff. | 111 | This is necessary for software-controlled poweroff. |
| 129 | 112 | ||
| 130 | To compile this driver as a module, choose M here: | 113 | To compile this driver as a module, choose M here: |
| 131 | the module will be called button. | 114 | the module will be called button. |
| @@ -175,9 +158,10 @@ config ACPI_PROCESSOR | |||
| 175 | 158 | ||
| 176 | To compile this driver as a module, choose M here: | 159 | To compile this driver as a module, choose M here: |
| 177 | the module will be called processor. | 160 | the module will be called processor. |
| 161 | |||
| 178 | config ACPI_IPMI | 162 | config ACPI_IPMI |
| 179 | tristate "IPMI" | 163 | tristate "IPMI" |
| 180 | depends on IPMI_SI && IPMI_HANDLER | 164 | depends on IPMI_SI |
| 181 | default n | 165 | default n |
| 182 | help | 166 | help |
| 183 | This driver enables the ACPI to access the BMC controller. And it | 167 | This driver enables the ACPI to access the BMC controller. And it |
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index cdaf68b58b00..a55fc06db4ae 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile | |||
| @@ -47,7 +47,6 @@ acpi-y += sysfs.o | |||
| 47 | acpi-$(CONFIG_X86) += acpi_cmos_rtc.o | 47 | acpi-$(CONFIG_X86) += acpi_cmos_rtc.o |
| 48 | acpi-$(CONFIG_DEBUG_FS) += debugfs.o | 48 | acpi-$(CONFIG_DEBUG_FS) += debugfs.o |
| 49 | acpi-$(CONFIG_ACPI_NUMA) += numa.o | 49 | acpi-$(CONFIG_ACPI_NUMA) += numa.o |
| 50 | acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o | ||
| 51 | ifdef CONFIG_ACPI_VIDEO | 50 | ifdef CONFIG_ACPI_VIDEO |
| 52 | acpi-y += video_detect.o | 51 | acpi-y += video_detect.o |
| 53 | endif | 52 | endif |
diff --git a/drivers/acpi/acpi_ipmi.c b/drivers/acpi/acpi_ipmi.c index a6977e12d574..ac0f52f6df2b 100644 --- a/drivers/acpi/acpi_ipmi.c +++ b/drivers/acpi/acpi_ipmi.c | |||
| @@ -1,8 +1,9 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * acpi_ipmi.c - ACPI IPMI opregion | 2 | * acpi_ipmi.c - ACPI IPMI opregion |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2010 Intel Corporation | 4 | * Copyright (C) 2010, 2013 Intel Corporation |
| 5 | * Copyright (C) 2010 Zhao Yakui <yakui.zhao@intel.com> | 5 | * Author: Zhao Yakui <yakui.zhao@intel.com> |
| 6 | * Lv Zheng <lv.zheng@intel.com> | ||
| 6 | * | 7 | * |
| 7 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 8 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 8 | * | 9 | * |
| @@ -23,60 +24,58 @@ | |||
| 23 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 24 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 24 | */ | 25 | */ |
| 25 | 26 | ||
| 26 | #include <linux/kernel.h> | ||
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/init.h> | 28 | #include <linux/acpi.h> |
| 29 | #include <linux/types.h> | ||
| 30 | #include <linux/delay.h> | ||
| 31 | #include <linux/proc_fs.h> | ||
| 32 | #include <linux/seq_file.h> | ||
| 33 | #include <linux/interrupt.h> | ||
| 34 | #include <linux/list.h> | ||
| 35 | #include <linux/spinlock.h> | ||
| 36 | #include <linux/io.h> | ||
| 37 | #include <acpi/acpi_bus.h> | ||
| 38 | #include <acpi/acpi_drivers.h> | ||
| 39 | #include <linux/ipmi.h> | 29 | #include <linux/ipmi.h> |
| 40 | #include <linux/device.h> | ||
| 41 | #include <linux/pnp.h> | ||
| 42 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 43 | 31 | ||
| 44 | MODULE_AUTHOR("Zhao Yakui"); | 32 | MODULE_AUTHOR("Zhao Yakui"); |
| 45 | MODULE_DESCRIPTION("ACPI IPMI Opregion driver"); | 33 | MODULE_DESCRIPTION("ACPI IPMI Opregion driver"); |
| 46 | MODULE_LICENSE("GPL"); | 34 | MODULE_LICENSE("GPL"); |
| 47 | 35 | ||
| 48 | #define IPMI_FLAGS_HANDLER_INSTALL 0 | ||
| 49 | |||
| 50 | #define ACPI_IPMI_OK 0 | 36 | #define ACPI_IPMI_OK 0 |
| 51 | #define ACPI_IPMI_TIMEOUT 0x10 | 37 | #define ACPI_IPMI_TIMEOUT 0x10 |
| 52 | #define ACPI_IPMI_UNKNOWN 0x07 | 38 | #define ACPI_IPMI_UNKNOWN 0x07 |
| 53 | /* the IPMI timeout is 5s */ | 39 | /* the IPMI timeout is 5s */ |
| 54 | #define IPMI_TIMEOUT (5 * HZ) | 40 | #define IPMI_TIMEOUT (5000) |
| 41 | #define ACPI_IPMI_MAX_MSG_LENGTH 64 | ||
| 55 | 42 | ||
| 56 | struct acpi_ipmi_device { | 43 | struct acpi_ipmi_device { |
| 57 | /* the device list attached to driver_data.ipmi_devices */ | 44 | /* the device list attached to driver_data.ipmi_devices */ |
| 58 | struct list_head head; | 45 | struct list_head head; |
| 46 | |||
| 59 | /* the IPMI request message list */ | 47 | /* the IPMI request message list */ |
| 60 | struct list_head tx_msg_list; | 48 | struct list_head tx_msg_list; |
| 61 | spinlock_t tx_msg_lock; | 49 | |
| 50 | spinlock_t tx_msg_lock; | ||
| 62 | acpi_handle handle; | 51 | acpi_handle handle; |
| 63 | struct pnp_dev *pnp_dev; | 52 | struct device *dev; |
| 64 | ipmi_user_t user_interface; | 53 | ipmi_user_t user_interface; |
| 65 | int ipmi_ifnum; /* IPMI interface number */ | 54 | int ipmi_ifnum; /* IPMI interface number */ |
| 66 | long curr_msgid; | 55 | long curr_msgid; |
| 67 | unsigned long flags; | 56 | bool dead; |
| 68 | struct ipmi_smi_info smi_data; | 57 | struct kref kref; |
| 69 | }; | 58 | }; |
| 70 | 59 | ||
| 71 | struct ipmi_driver_data { | 60 | struct ipmi_driver_data { |
| 72 | struct list_head ipmi_devices; | 61 | struct list_head ipmi_devices; |
| 73 | struct ipmi_smi_watcher bmc_events; | 62 | struct ipmi_smi_watcher bmc_events; |
| 74 | struct ipmi_user_hndl ipmi_hndlrs; | 63 | struct ipmi_user_hndl ipmi_hndlrs; |
| 75 | struct mutex ipmi_lock; | 64 | struct mutex ipmi_lock; |
| 65 | |||
| 66 | /* | ||
| 67 | * NOTE: IPMI System Interface Selection | ||
| 68 | * There is no system interface specified by the IPMI operation | ||
| 69 | * region access. We try to select one system interface with ACPI | ||
| 70 | * handle set. IPMI messages passed from the ACPI codes are sent | ||
| 71 | * to this selected global IPMI system interface. | ||
| 72 | */ | ||
| 73 | struct acpi_ipmi_device *selected_smi; | ||
| 76 | }; | 74 | }; |
| 77 | 75 | ||
| 78 | struct acpi_ipmi_msg { | 76 | struct acpi_ipmi_msg { |
| 79 | struct list_head head; | 77 | struct list_head head; |
| 78 | |||
| 80 | /* | 79 | /* |
| 81 | * General speaking the addr type should be SI_ADDR_TYPE. And | 80 | * General speaking the addr type should be SI_ADDR_TYPE. And |
| 82 | * the addr channel should be BMC. | 81 | * the addr channel should be BMC. |
| @@ -86,30 +85,31 @@ struct acpi_ipmi_msg { | |||
| 86 | */ | 85 | */ |
| 87 | struct ipmi_addr addr; | 86 | struct ipmi_addr addr; |
| 88 | long tx_msgid; | 87 | long tx_msgid; |
| 88 | |||
| 89 | /* it is used to track whether the IPMI message is finished */ | 89 | /* it is used to track whether the IPMI message is finished */ |
| 90 | struct completion tx_complete; | 90 | struct completion tx_complete; |
| 91 | |||
| 91 | struct kernel_ipmi_msg tx_message; | 92 | struct kernel_ipmi_msg tx_message; |
| 92 | int msg_done; | 93 | int msg_done; |
| 93 | /* tx data . And copy it from ACPI object buffer */ | 94 | |
| 94 | u8 tx_data[64]; | 95 | /* tx/rx data . And copy it from/to ACPI object buffer */ |
| 95 | int tx_len; | 96 | u8 data[ACPI_IPMI_MAX_MSG_LENGTH]; |
| 96 | u8 rx_data[64]; | 97 | u8 rx_len; |
| 97 | int rx_len; | 98 | |
| 98 | struct acpi_ipmi_device *device; | 99 | struct acpi_ipmi_device *device; |
| 100 | struct kref kref; | ||
| 99 | }; | 101 | }; |
| 100 | 102 | ||
| 101 | /* IPMI request/response buffer per ACPI 4.0, sec 5.5.2.4.3.2 */ | 103 | /* IPMI request/response buffer per ACPI 4.0, sec 5.5.2.4.3.2 */ |
| 102 | struct acpi_ipmi_buffer { | 104 | struct acpi_ipmi_buffer { |
| 103 | u8 status; | 105 | u8 status; |
| 104 | u8 length; | 106 | u8 length; |
| 105 | u8 data[64]; | 107 | u8 data[ACPI_IPMI_MAX_MSG_LENGTH]; |
| 106 | }; | 108 | }; |
| 107 | 109 | ||
| 108 | static void ipmi_register_bmc(int iface, struct device *dev); | 110 | static void ipmi_register_bmc(int iface, struct device *dev); |
| 109 | static void ipmi_bmc_gone(int iface); | 111 | static void ipmi_bmc_gone(int iface); |
| 110 | static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data); | 112 | static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data); |
| 111 | static void acpi_add_ipmi_device(struct acpi_ipmi_device *ipmi_device); | ||
| 112 | static void acpi_remove_ipmi_device(struct acpi_ipmi_device *ipmi_device); | ||
| 113 | 113 | ||
| 114 | static struct ipmi_driver_data driver_data = { | 114 | static struct ipmi_driver_data driver_data = { |
| 115 | .ipmi_devices = LIST_HEAD_INIT(driver_data.ipmi_devices), | 115 | .ipmi_devices = LIST_HEAD_INIT(driver_data.ipmi_devices), |
| @@ -121,29 +121,142 @@ static struct ipmi_driver_data driver_data = { | |||
| 121 | .ipmi_hndlrs = { | 121 | .ipmi_hndlrs = { |
| 122 | .ipmi_recv_hndl = ipmi_msg_handler, | 122 | .ipmi_recv_hndl = ipmi_msg_handler, |
| 123 | }, | 123 | }, |
| 124 | .ipmi_lock = __MUTEX_INITIALIZER(driver_data.ipmi_lock) | ||
| 124 | }; | 125 | }; |
| 125 | 126 | ||
| 126 | static struct acpi_ipmi_msg *acpi_alloc_ipmi_msg(struct acpi_ipmi_device *ipmi) | 127 | static struct acpi_ipmi_device * |
| 128 | ipmi_dev_alloc(int iface, struct device *dev, acpi_handle handle) | ||
| 129 | { | ||
| 130 | struct acpi_ipmi_device *ipmi_device; | ||
| 131 | int err; | ||
| 132 | ipmi_user_t user; | ||
| 133 | |||
| 134 | ipmi_device = kzalloc(sizeof(*ipmi_device), GFP_KERNEL); | ||
| 135 | if (!ipmi_device) | ||
| 136 | return NULL; | ||
| 137 | |||
| 138 | kref_init(&ipmi_device->kref); | ||
| 139 | INIT_LIST_HEAD(&ipmi_device->head); | ||
| 140 | INIT_LIST_HEAD(&ipmi_device->tx_msg_list); | ||
| 141 | spin_lock_init(&ipmi_device->tx_msg_lock); | ||
| 142 | ipmi_device->handle = handle; | ||
| 143 | ipmi_device->dev = get_device(dev); | ||
| 144 | ipmi_device->ipmi_ifnum = iface; | ||
| 145 | |||
| 146 | err = ipmi_create_user(iface, &driver_data.ipmi_hndlrs, | ||
| 147 | ipmi_device, &user); | ||
| 148 | if (err) { | ||
| 149 | put_device(dev); | ||
| 150 | kfree(ipmi_device); | ||
| 151 | return NULL; | ||
| 152 | } | ||
| 153 | ipmi_device->user_interface = user; | ||
| 154 | |||
| 155 | return ipmi_device; | ||
| 156 | } | ||
| 157 | |||
| 158 | static void ipmi_dev_release(struct acpi_ipmi_device *ipmi_device) | ||
| 159 | { | ||
| 160 | ipmi_destroy_user(ipmi_device->user_interface); | ||
| 161 | put_device(ipmi_device->dev); | ||
| 162 | kfree(ipmi_device); | ||
| 163 | } | ||
| 164 | |||
| 165 | static void ipmi_dev_release_kref(struct kref *kref) | ||
| 166 | { | ||
| 167 | struct acpi_ipmi_device *ipmi = | ||
| 168 | container_of(kref, struct acpi_ipmi_device, kref); | ||
| 169 | |||
| 170 | ipmi_dev_release(ipmi); | ||
| 171 | } | ||
| 172 | |||
| 173 | static void __ipmi_dev_kill(struct acpi_ipmi_device *ipmi_device) | ||
| 174 | { | ||
| 175 | list_del(&ipmi_device->head); | ||
| 176 | if (driver_data.selected_smi == ipmi_device) | ||
| 177 | driver_data.selected_smi = NULL; | ||
| 178 | |||
| 179 | /* | ||
| 180 | * Always setting dead flag after deleting from the list or | ||
| 181 | * list_for_each_entry() codes must get changed. | ||
| 182 | */ | ||
| 183 | ipmi_device->dead = true; | ||
| 184 | } | ||
| 185 | |||
| 186 | static struct acpi_ipmi_device *acpi_ipmi_dev_get(void) | ||
| 187 | { | ||
| 188 | struct acpi_ipmi_device *ipmi_device = NULL; | ||
| 189 | |||
| 190 | mutex_lock(&driver_data.ipmi_lock); | ||
| 191 | if (driver_data.selected_smi) { | ||
| 192 | ipmi_device = driver_data.selected_smi; | ||
| 193 | kref_get(&ipmi_device->kref); | ||
| 194 | } | ||
| 195 | mutex_unlock(&driver_data.ipmi_lock); | ||
| 196 | |||
| 197 | return ipmi_device; | ||
| 198 | } | ||
| 199 | |||
| 200 | static void acpi_ipmi_dev_put(struct acpi_ipmi_device *ipmi_device) | ||
| 201 | { | ||
| 202 | kref_put(&ipmi_device->kref, ipmi_dev_release_kref); | ||
| 203 | } | ||
| 204 | |||
| 205 | static struct acpi_ipmi_msg *ipmi_msg_alloc(void) | ||
| 127 | { | 206 | { |
| 207 | struct acpi_ipmi_device *ipmi; | ||
| 128 | struct acpi_ipmi_msg *ipmi_msg; | 208 | struct acpi_ipmi_msg *ipmi_msg; |
| 129 | struct pnp_dev *pnp_dev = ipmi->pnp_dev; | 209 | |
| 210 | ipmi = acpi_ipmi_dev_get(); | ||
| 211 | if (!ipmi) | ||
| 212 | return NULL; | ||
| 130 | 213 | ||
| 131 | ipmi_msg = kzalloc(sizeof(struct acpi_ipmi_msg), GFP_KERNEL); | 214 | ipmi_msg = kzalloc(sizeof(struct acpi_ipmi_msg), GFP_KERNEL); |
| 132 | if (!ipmi_msg) { | 215 | if (!ipmi_msg) { |
| 133 | dev_warn(&pnp_dev->dev, "Can't allocate memory for ipmi_msg\n"); | 216 | acpi_ipmi_dev_put(ipmi); |
| 134 | return NULL; | 217 | return NULL; |
| 135 | } | 218 | } |
| 219 | |||
| 220 | kref_init(&ipmi_msg->kref); | ||
| 136 | init_completion(&ipmi_msg->tx_complete); | 221 | init_completion(&ipmi_msg->tx_complete); |
| 137 | INIT_LIST_HEAD(&ipmi_msg->head); | 222 | INIT_LIST_HEAD(&ipmi_msg->head); |
| 138 | ipmi_msg->device = ipmi; | 223 | ipmi_msg->device = ipmi; |
| 224 | ipmi_msg->msg_done = ACPI_IPMI_UNKNOWN; | ||
| 225 | |||
| 139 | return ipmi_msg; | 226 | return ipmi_msg; |
| 140 | } | 227 | } |
| 141 | 228 | ||
| 142 | #define IPMI_OP_RGN_NETFN(offset) ((offset >> 8) & 0xff) | 229 | static void ipmi_msg_release(struct acpi_ipmi_msg *tx_msg) |
| 143 | #define IPMI_OP_RGN_CMD(offset) (offset & 0xff) | 230 | { |
| 144 | static void acpi_format_ipmi_msg(struct acpi_ipmi_msg *tx_msg, | 231 | acpi_ipmi_dev_put(tx_msg->device); |
| 145 | acpi_physical_address address, | 232 | kfree(tx_msg); |
| 146 | acpi_integer *value) | 233 | } |
| 234 | |||
| 235 | static void ipmi_msg_release_kref(struct kref *kref) | ||
| 236 | { | ||
| 237 | struct acpi_ipmi_msg *tx_msg = | ||
| 238 | container_of(kref, struct acpi_ipmi_msg, kref); | ||
| 239 | |||
| 240 | ipmi_msg_release(tx_msg); | ||
| 241 | } | ||
| 242 | |||
| 243 | static struct acpi_ipmi_msg *acpi_ipmi_msg_get(struct acpi_ipmi_msg *tx_msg) | ||
| 244 | { | ||
| 245 | kref_get(&tx_msg->kref); | ||
| 246 | |||
| 247 | return tx_msg; | ||
| 248 | } | ||
| 249 | |||
| 250 | static void acpi_ipmi_msg_put(struct acpi_ipmi_msg *tx_msg) | ||
| 251 | { | ||
| 252 | kref_put(&tx_msg->kref, ipmi_msg_release_kref); | ||
| 253 | } | ||
| 254 | |||
| 255 | #define IPMI_OP_RGN_NETFN(offset) ((offset >> 8) & 0xff) | ||
| 256 | #define IPMI_OP_RGN_CMD(offset) (offset & 0xff) | ||
| 257 | static int acpi_format_ipmi_request(struct acpi_ipmi_msg *tx_msg, | ||
| 258 | acpi_physical_address address, | ||
| 259 | acpi_integer *value) | ||
| 147 | { | 260 | { |
| 148 | struct kernel_ipmi_msg *msg; | 261 | struct kernel_ipmi_msg *msg; |
| 149 | struct acpi_ipmi_buffer *buffer; | 262 | struct acpi_ipmi_buffer *buffer; |
| @@ -151,21 +264,31 @@ static void acpi_format_ipmi_msg(struct acpi_ipmi_msg *tx_msg, | |||
| 151 | unsigned long flags; | 264 | unsigned long flags; |
| 152 | 265 | ||
| 153 | msg = &tx_msg->tx_message; | 266 | msg = &tx_msg->tx_message; |
| 267 | |||
| 154 | /* | 268 | /* |
| 155 | * IPMI network function and command are encoded in the address | 269 | * IPMI network function and command are encoded in the address |
| 156 | * within the IPMI OpRegion; see ACPI 4.0, sec 5.5.2.4.3. | 270 | * within the IPMI OpRegion; see ACPI 4.0, sec 5.5.2.4.3. |
| 157 | */ | 271 | */ |
| 158 | msg->netfn = IPMI_OP_RGN_NETFN(address); | 272 | msg->netfn = IPMI_OP_RGN_NETFN(address); |
| 159 | msg->cmd = IPMI_OP_RGN_CMD(address); | 273 | msg->cmd = IPMI_OP_RGN_CMD(address); |
| 160 | msg->data = tx_msg->tx_data; | 274 | msg->data = tx_msg->data; |
| 275 | |||
| 161 | /* | 276 | /* |
| 162 | * value is the parameter passed by the IPMI opregion space handler. | 277 | * value is the parameter passed by the IPMI opregion space handler. |
| 163 | * It points to the IPMI request message buffer | 278 | * It points to the IPMI request message buffer |
| 164 | */ | 279 | */ |
| 165 | buffer = (struct acpi_ipmi_buffer *)value; | 280 | buffer = (struct acpi_ipmi_buffer *)value; |
| 281 | |||
| 166 | /* copy the tx message data */ | 282 | /* copy the tx message data */ |
| 283 | if (buffer->length > ACPI_IPMI_MAX_MSG_LENGTH) { | ||
| 284 | dev_WARN_ONCE(tx_msg->device->dev, true, | ||
| 285 | "Unexpected request (msg len %d).\n", | ||
| 286 | buffer->length); | ||
| 287 | return -EINVAL; | ||
| 288 | } | ||
| 167 | msg->data_len = buffer->length; | 289 | msg->data_len = buffer->length; |
| 168 | memcpy(tx_msg->tx_data, buffer->data, msg->data_len); | 290 | memcpy(tx_msg->data, buffer->data, msg->data_len); |
| 291 | |||
| 169 | /* | 292 | /* |
| 170 | * now the default type is SYSTEM_INTERFACE and channel type is BMC. | 293 | * now the default type is SYSTEM_INTERFACE and channel type is BMC. |
| 171 | * If the netfn is APP_REQUEST and the cmd is SEND_MESSAGE, | 294 | * If the netfn is APP_REQUEST and the cmd is SEND_MESSAGE, |
| @@ -179,14 +302,17 @@ static void acpi_format_ipmi_msg(struct acpi_ipmi_msg *tx_msg, | |||
| 179 | 302 | ||
| 180 | /* Get the msgid */ | 303 | /* Get the msgid */ |
| 181 | device = tx_msg->device; | 304 | device = tx_msg->device; |
| 305 | |||
| 182 | spin_lock_irqsave(&device->tx_msg_lock, flags); | 306 | spin_lock_irqsave(&device->tx_msg_lock, flags); |
| 183 | device->curr_msgid++; | 307 | device->curr_msgid++; |
| 184 | tx_msg->tx_msgid = device->curr_msgid; | 308 | tx_msg->tx_msgid = device->curr_msgid; |
| 185 | spin_unlock_irqrestore(&device->tx_msg_lock, flags); | 309 | spin_unlock_irqrestore(&device->tx_msg_lock, flags); |
| 310 | |||
| 311 | return 0; | ||
| 186 | } | 312 | } |
| 187 | 313 | ||
| 188 | static void acpi_format_ipmi_response(struct acpi_ipmi_msg *msg, | 314 | static void acpi_format_ipmi_response(struct acpi_ipmi_msg *msg, |
| 189 | acpi_integer *value, int rem_time) | 315 | acpi_integer *value) |
| 190 | { | 316 | { |
| 191 | struct acpi_ipmi_buffer *buffer; | 317 | struct acpi_ipmi_buffer *buffer; |
| 192 | 318 | ||
| @@ -195,110 +321,158 @@ static void acpi_format_ipmi_response(struct acpi_ipmi_msg *msg, | |||
| 195 | * IPMI message returned by IPMI command. | 321 | * IPMI message returned by IPMI command. |
| 196 | */ | 322 | */ |
| 197 | buffer = (struct acpi_ipmi_buffer *)value; | 323 | buffer = (struct acpi_ipmi_buffer *)value; |
| 198 | if (!rem_time && !msg->msg_done) { | 324 | |
| 199 | buffer->status = ACPI_IPMI_TIMEOUT; | ||
| 200 | return; | ||
| 201 | } | ||
| 202 | /* | 325 | /* |
| 203 | * If the flag of msg_done is not set or the recv length is zero, it | 326 | * If the flag of msg_done is not set, it means that the IPMI command is |
| 204 | * means that the IPMI command is not executed correctly. | 327 | * not executed correctly. |
| 205 | * The status code will be ACPI_IPMI_UNKNOWN. | ||
| 206 | */ | 328 | */ |
| 207 | if (!msg->msg_done || !msg->rx_len) { | 329 | buffer->status = msg->msg_done; |
| 208 | buffer->status = ACPI_IPMI_UNKNOWN; | 330 | if (msg->msg_done != ACPI_IPMI_OK) |
| 209 | return; | 331 | return; |
| 210 | } | 332 | |
| 211 | /* | 333 | /* |
| 212 | * If the IPMI response message is obtained correctly, the status code | 334 | * If the IPMI response message is obtained correctly, the status code |
| 213 | * will be ACPI_IPMI_OK | 335 | * will be ACPI_IPMI_OK |
| 214 | */ | 336 | */ |
| 215 | buffer->status = ACPI_IPMI_OK; | ||
| 216 | buffer->length = msg->rx_len; | 337 | buffer->length = msg->rx_len; |
| 217 | memcpy(buffer->data, msg->rx_data, msg->rx_len); | 338 | memcpy(buffer->data, msg->data, msg->rx_len); |
| 218 | } | 339 | } |
| 219 | 340 | ||
| 220 | static void ipmi_flush_tx_msg(struct acpi_ipmi_device *ipmi) | 341 | static void ipmi_flush_tx_msg(struct acpi_ipmi_device *ipmi) |
| 221 | { | 342 | { |
| 222 | struct acpi_ipmi_msg *tx_msg, *temp; | 343 | struct acpi_ipmi_msg *tx_msg; |
| 223 | int count = HZ / 10; | 344 | unsigned long flags; |
| 224 | struct pnp_dev *pnp_dev = ipmi->pnp_dev; | 345 | |
| 346 | /* | ||
| 347 | * NOTE: On-going ipmi_recv_msg | ||
| 348 | * ipmi_msg_handler() may still be invoked by ipmi_si after | ||
| 349 | * flushing. But it is safe to do a fast flushing on module_exit() | ||
| 350 | * without waiting for all ipmi_recv_msg(s) to complete from | ||
| 351 | * ipmi_msg_handler() as it is ensured by ipmi_si that all | ||
| 352 | * ipmi_recv_msg(s) are freed after invoking ipmi_destroy_user(). | ||
| 353 | */ | ||
| 354 | spin_lock_irqsave(&ipmi->tx_msg_lock, flags); | ||
| 355 | while (!list_empty(&ipmi->tx_msg_list)) { | ||
| 356 | tx_msg = list_first_entry(&ipmi->tx_msg_list, | ||
| 357 | struct acpi_ipmi_msg, | ||
| 358 | head); | ||
| 359 | list_del(&tx_msg->head); | ||
| 360 | spin_unlock_irqrestore(&ipmi->tx_msg_lock, flags); | ||
| 225 | 361 | ||
| 226 | list_for_each_entry_safe(tx_msg, temp, &ipmi->tx_msg_list, head) { | ||
| 227 | /* wake up the sleep thread on the Tx msg */ | 362 | /* wake up the sleep thread on the Tx msg */ |
| 228 | complete(&tx_msg->tx_complete); | 363 | complete(&tx_msg->tx_complete); |
| 364 | acpi_ipmi_msg_put(tx_msg); | ||
| 365 | spin_lock_irqsave(&ipmi->tx_msg_lock, flags); | ||
| 229 | } | 366 | } |
| 367 | spin_unlock_irqrestore(&ipmi->tx_msg_lock, flags); | ||
| 368 | } | ||
| 369 | |||
| 370 | static void ipmi_cancel_tx_msg(struct acpi_ipmi_device *ipmi, | ||
| 371 | struct acpi_ipmi_msg *msg) | ||
| 372 | { | ||
| 373 | struct acpi_ipmi_msg *tx_msg, *temp; | ||
| 374 | bool msg_found = false; | ||
| 375 | unsigned long flags; | ||
| 230 | 376 | ||
| 231 | /* wait for about 100ms to flush the tx message list */ | 377 | spin_lock_irqsave(&ipmi->tx_msg_lock, flags); |
| 232 | while (count--) { | 378 | list_for_each_entry_safe(tx_msg, temp, &ipmi->tx_msg_list, head) { |
| 233 | if (list_empty(&ipmi->tx_msg_list)) | 379 | if (msg == tx_msg) { |
| 380 | msg_found = true; | ||
| 381 | list_del(&tx_msg->head); | ||
| 234 | break; | 382 | break; |
| 235 | schedule_timeout(1); | 383 | } |
| 236 | } | 384 | } |
| 237 | if (!list_empty(&ipmi->tx_msg_list)) | 385 | spin_unlock_irqrestore(&ipmi->tx_msg_lock, flags); |
| 238 | dev_warn(&pnp_dev->dev, "tx msg list is not NULL\n"); | 386 | |
| 387 | if (msg_found) | ||
| 388 | acpi_ipmi_msg_put(tx_msg); | ||
| 239 | } | 389 | } |
| 240 | 390 | ||
| 241 | static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data) | 391 | static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data) |
| 242 | { | 392 | { |
| 243 | struct acpi_ipmi_device *ipmi_device = user_msg_data; | 393 | struct acpi_ipmi_device *ipmi_device = user_msg_data; |
| 244 | int msg_found = 0; | 394 | bool msg_found = false; |
| 245 | struct acpi_ipmi_msg *tx_msg; | 395 | struct acpi_ipmi_msg *tx_msg, *temp; |
| 246 | struct pnp_dev *pnp_dev = ipmi_device->pnp_dev; | 396 | struct device *dev = ipmi_device->dev; |
| 247 | unsigned long flags; | 397 | unsigned long flags; |
| 248 | 398 | ||
| 249 | if (msg->user != ipmi_device->user_interface) { | 399 | if (msg->user != ipmi_device->user_interface) { |
| 250 | dev_warn(&pnp_dev->dev, "Unexpected response is returned. " | 400 | dev_warn(dev, |
| 251 | "returned user %p, expected user %p\n", | 401 | "Unexpected response is returned. returned user %p, expected user %p\n", |
| 252 | msg->user, ipmi_device->user_interface); | 402 | msg->user, ipmi_device->user_interface); |
| 253 | ipmi_free_recv_msg(msg); | 403 | goto out_msg; |
| 254 | return; | ||
| 255 | } | 404 | } |
| 405 | |||
| 256 | spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags); | 406 | spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags); |
| 257 | list_for_each_entry(tx_msg, &ipmi_device->tx_msg_list, head) { | 407 | list_for_each_entry_safe(tx_msg, temp, &ipmi_device->tx_msg_list, head) { |
| 258 | if (msg->msgid == tx_msg->tx_msgid) { | 408 | if (msg->msgid == tx_msg->tx_msgid) { |
| 259 | msg_found = 1; | 409 | msg_found = true; |
| 410 | list_del(&tx_msg->head); | ||
| 260 | break; | 411 | break; |
| 261 | } | 412 | } |
| 262 | } | 413 | } |
| 263 | |||
| 264 | spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags); | 414 | spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags); |
| 415 | |||
| 265 | if (!msg_found) { | 416 | if (!msg_found) { |
| 266 | dev_warn(&pnp_dev->dev, "Unexpected response (msg id %ld) is " | 417 | dev_warn(dev, |
| 267 | "returned.\n", msg->msgid); | 418 | "Unexpected response (msg id %ld) is returned.\n", |
| 268 | ipmi_free_recv_msg(msg); | 419 | msg->msgid); |
| 269 | return; | 420 | goto out_msg; |
| 270 | } | 421 | } |
| 271 | 422 | ||
| 272 | if (msg->msg.data_len) { | 423 | /* copy the response data to Rx_data buffer */ |
| 273 | /* copy the response data to Rx_data buffer */ | 424 | if (msg->msg.data_len > ACPI_IPMI_MAX_MSG_LENGTH) { |
| 274 | memcpy(tx_msg->rx_data, msg->msg_data, msg->msg.data_len); | 425 | dev_WARN_ONCE(dev, true, |
| 275 | tx_msg->rx_len = msg->msg.data_len; | 426 | "Unexpected response (msg len %d).\n", |
| 276 | tx_msg->msg_done = 1; | 427 | msg->msg.data_len); |
| 428 | goto out_comp; | ||
| 277 | } | 429 | } |
| 430 | |||
| 431 | /* response msg is an error msg */ | ||
| 432 | msg->recv_type = IPMI_RESPONSE_RECV_TYPE; | ||
| 433 | if (msg->recv_type == IPMI_RESPONSE_RECV_TYPE && | ||
| 434 | msg->msg.data_len == 1) { | ||
| 435 | if (msg->msg.data[0] == IPMI_TIMEOUT_COMPLETION_CODE) { | ||
| 436 | dev_WARN_ONCE(dev, true, | ||
| 437 | "Unexpected response (timeout).\n"); | ||
| 438 | tx_msg->msg_done = ACPI_IPMI_TIMEOUT; | ||
| 439 | } | ||
| 440 | goto out_comp; | ||
| 441 | } | ||
| 442 | |||
| 443 | tx_msg->rx_len = msg->msg.data_len; | ||
| 444 | memcpy(tx_msg->data, msg->msg.data, tx_msg->rx_len); | ||
| 445 | tx_msg->msg_done = ACPI_IPMI_OK; | ||
| 446 | |||
| 447 | out_comp: | ||
| 278 | complete(&tx_msg->tx_complete); | 448 | complete(&tx_msg->tx_complete); |
| 449 | acpi_ipmi_msg_put(tx_msg); | ||
| 450 | out_msg: | ||
| 279 | ipmi_free_recv_msg(msg); | 451 | ipmi_free_recv_msg(msg); |
| 280 | }; | 452 | } |
| 281 | 453 | ||
| 282 | static void ipmi_register_bmc(int iface, struct device *dev) | 454 | static void ipmi_register_bmc(int iface, struct device *dev) |
| 283 | { | 455 | { |
| 284 | struct acpi_ipmi_device *ipmi_device, *temp; | 456 | struct acpi_ipmi_device *ipmi_device, *temp; |
| 285 | struct pnp_dev *pnp_dev; | ||
| 286 | ipmi_user_t user; | ||
| 287 | int err; | 457 | int err; |
| 288 | struct ipmi_smi_info smi_data; | 458 | struct ipmi_smi_info smi_data; |
| 289 | acpi_handle handle; | 459 | acpi_handle handle; |
| 290 | 460 | ||
| 291 | err = ipmi_get_smi_info(iface, &smi_data); | 461 | err = ipmi_get_smi_info(iface, &smi_data); |
| 292 | |||
| 293 | if (err) | 462 | if (err) |
| 294 | return; | 463 | return; |
| 295 | 464 | ||
| 296 | if (smi_data.addr_src != SI_ACPI) { | 465 | if (smi_data.addr_src != SI_ACPI) |
| 297 | put_device(smi_data.dev); | 466 | goto err_ref; |
| 298 | return; | ||
| 299 | } | ||
| 300 | |||
| 301 | handle = smi_data.addr_info.acpi_info.acpi_handle; | 467 | handle = smi_data.addr_info.acpi_info.acpi_handle; |
| 468 | if (!handle) | ||
| 469 | goto err_ref; | ||
| 470 | |||
| 471 | ipmi_device = ipmi_dev_alloc(iface, smi_data.dev, handle); | ||
| 472 | if (!ipmi_device) { | ||
| 473 | dev_warn(smi_data.dev, "Can't create IPMI user interface\n"); | ||
| 474 | goto err_ref; | ||
| 475 | } | ||
| 302 | 476 | ||
| 303 | mutex_lock(&driver_data.ipmi_lock); | 477 | mutex_lock(&driver_data.ipmi_lock); |
| 304 | list_for_each_entry(temp, &driver_data.ipmi_devices, head) { | 478 | list_for_each_entry(temp, &driver_data.ipmi_devices, head) { |
| @@ -307,34 +481,20 @@ static void ipmi_register_bmc(int iface, struct device *dev) | |||
| 307 | * to the device list, don't add it again. | 481 | * to the device list, don't add it again. |
| 308 | */ | 482 | */ |
| 309 | if (temp->handle == handle) | 483 | if (temp->handle == handle) |
| 310 | goto out; | 484 | goto err_lock; |
| 311 | } | 485 | } |
| 312 | 486 | if (!driver_data.selected_smi) | |
| 313 | ipmi_device = kzalloc(sizeof(*ipmi_device), GFP_KERNEL); | 487 | driver_data.selected_smi = ipmi_device; |
| 314 | 488 | list_add_tail(&ipmi_device->head, &driver_data.ipmi_devices); | |
| 315 | if (!ipmi_device) | ||
| 316 | goto out; | ||
| 317 | |||
| 318 | pnp_dev = to_pnp_dev(smi_data.dev); | ||
| 319 | ipmi_device->handle = handle; | ||
| 320 | ipmi_device->pnp_dev = pnp_dev; | ||
| 321 | |||
| 322 | err = ipmi_create_user(iface, &driver_data.ipmi_hndlrs, | ||
| 323 | ipmi_device, &user); | ||
| 324 | if (err) { | ||
| 325 | dev_warn(&pnp_dev->dev, "Can't create IPMI user interface\n"); | ||
| 326 | kfree(ipmi_device); | ||
| 327 | goto out; | ||
| 328 | } | ||
| 329 | acpi_add_ipmi_device(ipmi_device); | ||
| 330 | ipmi_device->user_interface = user; | ||
| 331 | ipmi_device->ipmi_ifnum = iface; | ||
| 332 | mutex_unlock(&driver_data.ipmi_lock); | 489 | mutex_unlock(&driver_data.ipmi_lock); |
| 333 | memcpy(&ipmi_device->smi_data, &smi_data, sizeof(struct ipmi_smi_info)); | 490 | |
| 491 | put_device(smi_data.dev); | ||
| 334 | return; | 492 | return; |
| 335 | 493 | ||
| 336 | out: | 494 | err_lock: |
| 337 | mutex_unlock(&driver_data.ipmi_lock); | 495 | mutex_unlock(&driver_data.ipmi_lock); |
| 496 | ipmi_dev_release(ipmi_device); | ||
| 497 | err_ref: | ||
| 338 | put_device(smi_data.dev); | 498 | put_device(smi_data.dev); |
| 339 | return; | 499 | return; |
| 340 | } | 500 | } |
| @@ -342,23 +502,29 @@ out: | |||
| 342 | static void ipmi_bmc_gone(int iface) | 502 | static void ipmi_bmc_gone(int iface) |
| 343 | { | 503 | { |
| 344 | struct acpi_ipmi_device *ipmi_device, *temp; | 504 | struct acpi_ipmi_device *ipmi_device, *temp; |
| 505 | bool dev_found = false; | ||
| 345 | 506 | ||
| 346 | mutex_lock(&driver_data.ipmi_lock); | 507 | mutex_lock(&driver_data.ipmi_lock); |
| 347 | list_for_each_entry_safe(ipmi_device, temp, | 508 | list_for_each_entry_safe(ipmi_device, temp, |
| 348 | &driver_data.ipmi_devices, head) { | 509 | &driver_data.ipmi_devices, head) { |
| 349 | if (ipmi_device->ipmi_ifnum != iface) | 510 | if (ipmi_device->ipmi_ifnum != iface) { |
| 350 | continue; | 511 | dev_found = true; |
| 351 | 512 | __ipmi_dev_kill(ipmi_device); | |
| 352 | acpi_remove_ipmi_device(ipmi_device); | 513 | break; |
| 353 | put_device(ipmi_device->smi_data.dev); | 514 | } |
| 354 | kfree(ipmi_device); | ||
| 355 | break; | ||
| 356 | } | 515 | } |
| 516 | if (!driver_data.selected_smi) | ||
| 517 | driver_data.selected_smi = list_first_entry_or_null( | ||
| 518 | &driver_data.ipmi_devices, | ||
| 519 | struct acpi_ipmi_device, head); | ||
| 357 | mutex_unlock(&driver_data.ipmi_lock); | 520 | mutex_unlock(&driver_data.ipmi_lock); |
| 521 | |||
| 522 | if (dev_found) { | ||
| 523 | ipmi_flush_tx_msg(ipmi_device); | ||
| 524 | acpi_ipmi_dev_put(ipmi_device); | ||
| 525 | } | ||
| 358 | } | 526 | } |
| 359 | /* -------------------------------------------------------------------------- | 527 | |
| 360 | * Address Space Management | ||
| 361 | * -------------------------------------------------------------------------- */ | ||
| 362 | /* | 528 | /* |
| 363 | * This is the IPMI opregion space handler. | 529 | * This is the IPMI opregion space handler. |
| 364 | * @function: indicates the read/write. In fact as the IPMI message is driven | 530 | * @function: indicates the read/write. In fact as the IPMI message is driven |
| @@ -371,17 +537,17 @@ static void ipmi_bmc_gone(int iface) | |||
| 371 | * the response IPMI message returned by IPMI command. | 537 | * the response IPMI message returned by IPMI command. |
| 372 | * @handler_context: IPMI device context. | 538 | * @handler_context: IPMI device context. |
| 373 | */ | 539 | */ |
| 374 | |||
| 375 | static acpi_status | 540 | static acpi_status |
| 376 | acpi_ipmi_space_handler(u32 function, acpi_physical_address address, | 541 | acpi_ipmi_space_handler(u32 function, acpi_physical_address address, |
| 377 | u32 bits, acpi_integer *value, | 542 | u32 bits, acpi_integer *value, |
| 378 | void *handler_context, void *region_context) | 543 | void *handler_context, void *region_context) |
| 379 | { | 544 | { |
| 380 | struct acpi_ipmi_msg *tx_msg; | 545 | struct acpi_ipmi_msg *tx_msg; |
| 381 | struct acpi_ipmi_device *ipmi_device = handler_context; | 546 | struct acpi_ipmi_device *ipmi_device; |
| 382 | int err, rem_time; | 547 | int err; |
| 383 | acpi_status status; | 548 | acpi_status status; |
| 384 | unsigned long flags; | 549 | unsigned long flags; |
| 550 | |||
| 385 | /* | 551 | /* |
| 386 | * IPMI opregion message. | 552 | * IPMI opregion message. |
| 387 | * IPMI message is firstly written to the BMC and system software | 553 | * IPMI message is firstly written to the BMC and system software |
| @@ -391,118 +557,75 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address, | |||
| 391 | if ((function & ACPI_IO_MASK) == ACPI_READ) | 557 | if ((function & ACPI_IO_MASK) == ACPI_READ) |
| 392 | return AE_TYPE; | 558 | return AE_TYPE; |
| 393 | 559 | ||
| 394 | if (!ipmi_device->user_interface) | 560 | tx_msg = ipmi_msg_alloc(); |
| 561 | if (!tx_msg) | ||
| 395 | return AE_NOT_EXIST; | 562 | return AE_NOT_EXIST; |
| 563 | ipmi_device = tx_msg->device; | ||
| 396 | 564 | ||
| 397 | tx_msg = acpi_alloc_ipmi_msg(ipmi_device); | 565 | if (acpi_format_ipmi_request(tx_msg, address, value) != 0) { |
| 398 | if (!tx_msg) | 566 | ipmi_msg_release(tx_msg); |
| 399 | return AE_NO_MEMORY; | 567 | return AE_TYPE; |
| 568 | } | ||
| 400 | 569 | ||
| 401 | acpi_format_ipmi_msg(tx_msg, address, value); | 570 | acpi_ipmi_msg_get(tx_msg); |
| 571 | mutex_lock(&driver_data.ipmi_lock); | ||
| 572 | /* Do not add a tx_msg that can not be flushed. */ | ||
| 573 | if (ipmi_device->dead) { | ||
| 574 | mutex_unlock(&driver_data.ipmi_lock); | ||
| 575 | ipmi_msg_release(tx_msg); | ||
| 576 | return AE_NOT_EXIST; | ||
| 577 | } | ||
| 402 | spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags); | 578 | spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags); |
| 403 | list_add_tail(&tx_msg->head, &ipmi_device->tx_msg_list); | 579 | list_add_tail(&tx_msg->head, &ipmi_device->tx_msg_list); |
| 404 | spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags); | 580 | spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags); |
| 581 | mutex_unlock(&driver_data.ipmi_lock); | ||
| 582 | |||
| 405 | err = ipmi_request_settime(ipmi_device->user_interface, | 583 | err = ipmi_request_settime(ipmi_device->user_interface, |
| 406 | &tx_msg->addr, | 584 | &tx_msg->addr, |
| 407 | tx_msg->tx_msgid, | 585 | tx_msg->tx_msgid, |
| 408 | &tx_msg->tx_message, | 586 | &tx_msg->tx_message, |
| 409 | NULL, 0, 0, 0); | 587 | NULL, 0, 0, IPMI_TIMEOUT); |
| 410 | if (err) { | 588 | if (err) { |
| 411 | status = AE_ERROR; | 589 | status = AE_ERROR; |
| 412 | goto end_label; | 590 | goto out_msg; |
| 413 | } | 591 | } |
| 414 | rem_time = wait_for_completion_timeout(&tx_msg->tx_complete, | 592 | wait_for_completion(&tx_msg->tx_complete); |
| 415 | IPMI_TIMEOUT); | 593 | |
| 416 | acpi_format_ipmi_response(tx_msg, value, rem_time); | 594 | acpi_format_ipmi_response(tx_msg, value); |
| 417 | status = AE_OK; | 595 | status = AE_OK; |
| 418 | 596 | ||
| 419 | end_label: | 597 | out_msg: |
| 420 | spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags); | 598 | ipmi_cancel_tx_msg(ipmi_device, tx_msg); |
| 421 | list_del(&tx_msg->head); | 599 | acpi_ipmi_msg_put(tx_msg); |
| 422 | spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags); | ||
| 423 | kfree(tx_msg); | ||
| 424 | return status; | 600 | return status; |
| 425 | } | 601 | } |
| 426 | 602 | ||
| 427 | static void ipmi_remove_space_handler(struct acpi_ipmi_device *ipmi) | 603 | static int __init acpi_ipmi_init(void) |
| 428 | { | ||
| 429 | if (!test_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags)) | ||
| 430 | return; | ||
| 431 | |||
| 432 | acpi_remove_address_space_handler(ipmi->handle, | ||
| 433 | ACPI_ADR_SPACE_IPMI, &acpi_ipmi_space_handler); | ||
| 434 | |||
| 435 | clear_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags); | ||
| 436 | } | ||
| 437 | |||
| 438 | static int ipmi_install_space_handler(struct acpi_ipmi_device *ipmi) | ||
| 439 | { | 604 | { |
| 605 | int result; | ||
| 440 | acpi_status status; | 606 | acpi_status status; |
| 441 | 607 | ||
| 442 | if (test_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags)) | 608 | if (acpi_disabled) |
| 443 | return 0; | 609 | return 0; |
| 444 | 610 | ||
| 445 | status = acpi_install_address_space_handler(ipmi->handle, | 611 | status = acpi_install_address_space_handler(ACPI_ROOT_OBJECT, |
| 446 | ACPI_ADR_SPACE_IPMI, | 612 | ACPI_ADR_SPACE_IPMI, |
| 447 | &acpi_ipmi_space_handler, | 613 | &acpi_ipmi_space_handler, |
| 448 | NULL, ipmi); | 614 | NULL, NULL); |
| 449 | if (ACPI_FAILURE(status)) { | 615 | if (ACPI_FAILURE(status)) { |
| 450 | struct pnp_dev *pnp_dev = ipmi->pnp_dev; | 616 | pr_warn("Can't register IPMI opregion space handle\n"); |
| 451 | dev_warn(&pnp_dev->dev, "Can't register IPMI opregion space " | ||
| 452 | "handle\n"); | ||
| 453 | return -EINVAL; | 617 | return -EINVAL; |
| 454 | } | 618 | } |
| 455 | set_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags); | ||
| 456 | return 0; | ||
| 457 | } | ||
| 458 | |||
| 459 | static void acpi_add_ipmi_device(struct acpi_ipmi_device *ipmi_device) | ||
| 460 | { | ||
| 461 | |||
| 462 | INIT_LIST_HEAD(&ipmi_device->head); | ||
| 463 | |||
| 464 | spin_lock_init(&ipmi_device->tx_msg_lock); | ||
| 465 | INIT_LIST_HEAD(&ipmi_device->tx_msg_list); | ||
| 466 | ipmi_install_space_handler(ipmi_device); | ||
| 467 | |||
| 468 | list_add_tail(&ipmi_device->head, &driver_data.ipmi_devices); | ||
| 469 | } | ||
| 470 | |||
| 471 | static void acpi_remove_ipmi_device(struct acpi_ipmi_device *ipmi_device) | ||
| 472 | { | ||
| 473 | /* | ||
| 474 | * If the IPMI user interface is created, it should be | ||
| 475 | * destroyed. | ||
| 476 | */ | ||
| 477 | if (ipmi_device->user_interface) { | ||
| 478 | ipmi_destroy_user(ipmi_device->user_interface); | ||
| 479 | ipmi_device->user_interface = NULL; | ||
| 480 | } | ||
| 481 | /* flush the Tx_msg list */ | ||
| 482 | if (!list_empty(&ipmi_device->tx_msg_list)) | ||
| 483 | ipmi_flush_tx_msg(ipmi_device); | ||
| 484 | |||
| 485 | list_del(&ipmi_device->head); | ||
| 486 | ipmi_remove_space_handler(ipmi_device); | ||
| 487 | } | ||
| 488 | |||
| 489 | static int __init acpi_ipmi_init(void) | ||
| 490 | { | ||
| 491 | int result = 0; | ||
| 492 | |||
| 493 | if (acpi_disabled) | ||
| 494 | return result; | ||
| 495 | |||
| 496 | mutex_init(&driver_data.ipmi_lock); | ||
| 497 | |||
| 498 | result = ipmi_smi_watcher_register(&driver_data.bmc_events); | 619 | result = ipmi_smi_watcher_register(&driver_data.bmc_events); |
| 620 | if (result) | ||
| 621 | pr_err("Can't register IPMI system interface watcher\n"); | ||
| 499 | 622 | ||
| 500 | return result; | 623 | return result; |
| 501 | } | 624 | } |
| 502 | 625 | ||
| 503 | static void __exit acpi_ipmi_exit(void) | 626 | static void __exit acpi_ipmi_exit(void) |
| 504 | { | 627 | { |
| 505 | struct acpi_ipmi_device *ipmi_device, *temp; | 628 | struct acpi_ipmi_device *ipmi_device; |
| 506 | 629 | ||
| 507 | if (acpi_disabled) | 630 | if (acpi_disabled) |
| 508 | return; | 631 | return; |
| @@ -516,13 +639,22 @@ static void __exit acpi_ipmi_exit(void) | |||
| 516 | * handler and free it. | 639 | * handler and free it. |
| 517 | */ | 640 | */ |
| 518 | mutex_lock(&driver_data.ipmi_lock); | 641 | mutex_lock(&driver_data.ipmi_lock); |
| 519 | list_for_each_entry_safe(ipmi_device, temp, | 642 | while (!list_empty(&driver_data.ipmi_devices)) { |
| 520 | &driver_data.ipmi_devices, head) { | 643 | ipmi_device = list_first_entry(&driver_data.ipmi_devices, |
| 521 | acpi_remove_ipmi_device(ipmi_device); | 644 | struct acpi_ipmi_device, |
| 522 | put_device(ipmi_device->smi_data.dev); | 645 | head); |
| 523 | kfree(ipmi_device); | 646 | __ipmi_dev_kill(ipmi_device); |
| 647 | mutex_unlock(&driver_data.ipmi_lock); | ||
| 648 | |||
| 649 | ipmi_flush_tx_msg(ipmi_device); | ||
| 650 | acpi_ipmi_dev_put(ipmi_device); | ||
| 651 | |||
| 652 | mutex_lock(&driver_data.ipmi_lock); | ||
| 524 | } | 653 | } |
| 525 | mutex_unlock(&driver_data.ipmi_lock); | 654 | mutex_unlock(&driver_data.ipmi_lock); |
| 655 | acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, | ||
| 656 | ACPI_ADR_SPACE_IPMI, | ||
| 657 | &acpi_ipmi_space_handler); | ||
| 526 | } | 658 | } |
| 527 | 659 | ||
| 528 | module_init(acpi_ipmi_init); | 660 | module_init(acpi_ipmi_init); |
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 999adb5499c7..551dad712ffe 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
| @@ -152,8 +152,9 @@ static int acpi_memory_check_device(struct acpi_memory_device *mem_device) | |||
| 152 | unsigned long long current_status; | 152 | unsigned long long current_status; |
| 153 | 153 | ||
| 154 | /* Get device present/absent information from the _STA */ | 154 | /* Get device present/absent information from the _STA */ |
| 155 | if (ACPI_FAILURE(acpi_evaluate_integer(mem_device->device->handle, "_STA", | 155 | if (ACPI_FAILURE(acpi_evaluate_integer(mem_device->device->handle, |
| 156 | NULL, ¤t_status))) | 156 | METHOD_NAME__STA, NULL, |
| 157 | ¤t_status))) | ||
| 157 | return -ENODEV; | 158 | return -ENODEV; |
| 158 | /* | 159 | /* |
| 159 | * Check for device status. Device should be | 160 | * Check for device status. Device should be |
| @@ -281,7 +282,7 @@ static void acpi_memory_remove_memory(struct acpi_memory_device *mem_device) | |||
| 281 | if (!info->enabled) | 282 | if (!info->enabled) |
| 282 | continue; | 283 | continue; |
| 283 | 284 | ||
| 284 | if (nid < 0) | 285 | if (nid == NUMA_NO_NODE) |
| 285 | nid = memory_add_physaddr_to_nid(info->start_addr); | 286 | nid = memory_add_physaddr_to_nid(info->start_addr); |
| 286 | 287 | ||
| 287 | acpi_unbind_memory_blocks(info, handle); | 288 | acpi_unbind_memory_blocks(info, handle); |
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index f29e06efa479..3c1d6b0c09a4 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c | |||
| @@ -140,15 +140,11 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev) | |||
| 140 | return 0; | 140 | return 0; |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | static int acpi_processor_errata(struct acpi_processor *pr) | 143 | static int acpi_processor_errata(void) |
| 144 | { | 144 | { |
| 145 | int result = 0; | 145 | int result = 0; |
| 146 | struct pci_dev *dev = NULL; | 146 | struct pci_dev *dev = NULL; |
| 147 | 147 | ||
| 148 | |||
| 149 | if (!pr) | ||
| 150 | return -EINVAL; | ||
| 151 | |||
| 152 | /* | 148 | /* |
| 153 | * PIIX4 | 149 | * PIIX4 |
| 154 | */ | 150 | */ |
| @@ -181,7 +177,7 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr) | |||
| 181 | cpu_maps_update_begin(); | 177 | cpu_maps_update_begin(); |
| 182 | cpu_hotplug_begin(); | 178 | cpu_hotplug_begin(); |
| 183 | 179 | ||
| 184 | ret = acpi_map_lsapic(pr->handle, &pr->id); | 180 | ret = acpi_map_lsapic(pr->handle, pr->apic_id, &pr->id); |
| 185 | if (ret) | 181 | if (ret) |
| 186 | goto out; | 182 | goto out; |
| 187 | 183 | ||
| @@ -219,11 +215,9 @@ static int acpi_processor_get_info(struct acpi_device *device) | |||
| 219 | int cpu_index, device_declaration = 0; | 215 | int cpu_index, device_declaration = 0; |
| 220 | acpi_status status = AE_OK; | 216 | acpi_status status = AE_OK; |
| 221 | static int cpu0_initialized; | 217 | static int cpu0_initialized; |
| 218 | unsigned long long value; | ||
| 222 | 219 | ||
| 223 | if (num_online_cpus() > 1) | 220 | acpi_processor_errata(); |
| 224 | errata.smp = TRUE; | ||
| 225 | |||
| 226 | acpi_processor_errata(pr); | ||
| 227 | 221 | ||
| 228 | /* | 222 | /* |
| 229 | * Check to see if we have bus mastering arbitration control. This | 223 | * Check to see if we have bus mastering arbitration control. This |
| @@ -247,18 +241,12 @@ static int acpi_processor_get_info(struct acpi_device *device) | |||
| 247 | return -ENODEV; | 241 | return -ENODEV; |
| 248 | } | 242 | } |
| 249 | 243 | ||
| 250 | /* | ||
| 251 | * TBD: Synch processor ID (via LAPIC/LSAPIC structures) on SMP. | ||
| 252 | * >>> 'acpi_get_processor_id(acpi_id, &id)' in | ||
| 253 | * arch/xxx/acpi.c | ||
| 254 | */ | ||
| 255 | pr->acpi_id = object.processor.proc_id; | 244 | pr->acpi_id = object.processor.proc_id; |
| 256 | } else { | 245 | } else { |
| 257 | /* | 246 | /* |
| 258 | * Declared with "Device" statement; match _UID. | 247 | * Declared with "Device" statement; match _UID. |
| 259 | * Note that we don't handle string _UIDs yet. | 248 | * Note that we don't handle string _UIDs yet. |
| 260 | */ | 249 | */ |
| 261 | unsigned long long value; | ||
| 262 | status = acpi_evaluate_integer(pr->handle, METHOD_NAME__UID, | 250 | status = acpi_evaluate_integer(pr->handle, METHOD_NAME__UID, |
| 263 | NULL, &value); | 251 | NULL, &value); |
| 264 | if (ACPI_FAILURE(status)) { | 252 | if (ACPI_FAILURE(status)) { |
| @@ -270,7 +258,9 @@ static int acpi_processor_get_info(struct acpi_device *device) | |||
| 270 | device_declaration = 1; | 258 | device_declaration = 1; |
| 271 | pr->acpi_id = value; | 259 | pr->acpi_id = value; |
| 272 | } | 260 | } |
| 273 | cpu_index = acpi_get_cpuid(pr->handle, device_declaration, pr->acpi_id); | 261 | pr->apic_id = acpi_get_apicid(pr->handle, device_declaration, |
| 262 | pr->acpi_id); | ||
| 263 | cpu_index = acpi_map_cpuid(pr->apic_id, pr->acpi_id); | ||
| 274 | 264 | ||
| 275 | /* Handle UP system running SMP kernel, with no LAPIC in MADT */ | 265 | /* Handle UP system running SMP kernel, with no LAPIC in MADT */ |
| 276 | if (!cpu0_initialized && (cpu_index == -1) && | 266 | if (!cpu0_initialized && (cpu_index == -1) && |
| @@ -332,9 +322,9 @@ static int acpi_processor_get_info(struct acpi_device *device) | |||
| 332 | * ensure we get the right value in the "physical id" field | 322 | * ensure we get the right value in the "physical id" field |
| 333 | * of /proc/cpuinfo | 323 | * of /proc/cpuinfo |
| 334 | */ | 324 | */ |
| 335 | status = acpi_evaluate_object(pr->handle, "_SUN", NULL, &buffer); | 325 | status = acpi_evaluate_integer(pr->handle, "_SUN", NULL, &value); |
| 336 | if (ACPI_SUCCESS(status)) | 326 | if (ACPI_SUCCESS(status)) |
| 337 | arch_fix_phys_package_id(pr->id, object.integer.value); | 327 | arch_fix_phys_package_id(pr->id, value); |
| 338 | 328 | ||
| 339 | return 0; | 329 | return 0; |
| 340 | } | 330 | } |
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h index 9feba08c29fe..27c36a5251b5 100644 --- a/drivers/acpi/acpica/acdebug.h +++ b/drivers/acpi/acpica/acdebug.h | |||
| @@ -113,11 +113,12 @@ void acpi_db_display_handlers(void); | |||
| 113 | ACPI_HW_DEPENDENT_RETURN_VOID(void | 113 | ACPI_HW_DEPENDENT_RETURN_VOID(void |
| 114 | acpi_db_generate_gpe(char *gpe_arg, | 114 | acpi_db_generate_gpe(char *gpe_arg, |
| 115 | char *block_arg)) | 115 | char *block_arg)) |
| 116 | ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_generate_sci(void)) | ||
| 116 | 117 | ||
| 117 | /* | 118 | /* |
| 118 | * dbconvert - miscellaneous conversion routines | 119 | * dbconvert - miscellaneous conversion routines |
| 119 | */ | 120 | */ |
| 120 | acpi_status acpi_db_hex_char_to_value(int hex_char, u8 *return_value); | 121 | acpi_status acpi_db_hex_char_to_value(int hex_char, u8 *return_value); |
| 121 | 122 | ||
| 122 | acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object); | 123 | acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object); |
| 123 | 124 | ||
| @@ -154,6 +155,8 @@ void acpi_db_set_scope(char *name); | |||
| 154 | 155 | ||
| 155 | void acpi_db_dump_namespace(char *start_arg, char *depth_arg); | 156 | void acpi_db_dump_namespace(char *start_arg, char *depth_arg); |
| 156 | 157 | ||
| 158 | void acpi_db_dump_namespace_paths(void); | ||
| 159 | |||
| 157 | void acpi_db_dump_namespace_by_owner(char *owner_arg, char *depth_arg); | 160 | void acpi_db_dump_namespace_by_owner(char *owner_arg, char *depth_arg); |
| 158 | 161 | ||
| 159 | acpi_status acpi_db_find_name_in_namespace(char *name_arg); | 162 | acpi_status acpi_db_find_name_in_namespace(char *name_arg); |
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h index ab0e97710381..3ae5fd02ae64 100644 --- a/drivers/acpi/acpica/acevents.h +++ b/drivers/acpi/acpica/acevents.h | |||
| @@ -242,11 +242,11 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj, | |||
| 242 | */ | 242 | */ |
| 243 | u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context); | 243 | u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context); |
| 244 | 244 | ||
| 245 | u32 acpi_ev_install_sci_handler(void); | 245 | u32 acpi_ev_sci_dispatch(void); |
| 246 | 246 | ||
| 247 | acpi_status acpi_ev_remove_sci_handler(void); | 247 | u32 acpi_ev_install_sci_handler(void); |
| 248 | 248 | ||
| 249 | u32 acpi_ev_initialize_SCI(u32 program_SCI); | 249 | acpi_status acpi_ev_remove_all_sci_handlers(void); |
| 250 | 250 | ||
| 251 | ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_ev_terminate(void)) | 251 | ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_ev_terminate(void)) |
| 252 | #endif /* __ACEVENTS_H__ */ | 252 | #endif /* __ACEVENTS_H__ */ |
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h index 90e846f985fa..0fba431f4fcb 100644 --- a/drivers/acpi/acpica/acglobal.h +++ b/drivers/acpi/acpica/acglobal.h | |||
| @@ -269,6 +269,7 @@ ACPI_EXTERN acpi_table_handler acpi_gbl_table_handler; | |||
| 269 | ACPI_EXTERN void *acpi_gbl_table_handler_context; | 269 | ACPI_EXTERN void *acpi_gbl_table_handler_context; |
| 270 | ACPI_EXTERN struct acpi_walk_state *acpi_gbl_breakpoint_walk; | 270 | ACPI_EXTERN struct acpi_walk_state *acpi_gbl_breakpoint_walk; |
| 271 | ACPI_EXTERN acpi_interface_handler acpi_gbl_interface_handler; | 271 | ACPI_EXTERN acpi_interface_handler acpi_gbl_interface_handler; |
| 272 | ACPI_EXTERN struct acpi_sci_handler_info *acpi_gbl_sci_handler_list; | ||
| 272 | 273 | ||
| 273 | /* Owner ID support */ | 274 | /* Owner ID support */ |
| 274 | 275 | ||
| @@ -445,13 +446,6 @@ ACPI_EXTERN u8 acpi_gbl_db_opt_tables; | |||
| 445 | ACPI_EXTERN u8 acpi_gbl_db_opt_stats; | 446 | ACPI_EXTERN u8 acpi_gbl_db_opt_stats; |
| 446 | ACPI_EXTERN u8 acpi_gbl_db_opt_ini_methods; | 447 | ACPI_EXTERN u8 acpi_gbl_db_opt_ini_methods; |
| 447 | ACPI_EXTERN u8 acpi_gbl_db_opt_no_region_support; | 448 | ACPI_EXTERN u8 acpi_gbl_db_opt_no_region_support; |
| 448 | |||
| 449 | ACPI_EXTERN char *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS]; | ||
| 450 | ACPI_EXTERN acpi_object_type acpi_gbl_db_arg_types[ACPI_DEBUGGER_MAX_ARGS]; | ||
| 451 | ACPI_EXTERN char acpi_gbl_db_line_buf[ACPI_DB_LINE_BUFFER_SIZE]; | ||
| 452 | ACPI_EXTERN char acpi_gbl_db_parsed_buf[ACPI_DB_LINE_BUFFER_SIZE]; | ||
| 453 | ACPI_EXTERN char acpi_gbl_db_scope_buf[80]; | ||
| 454 | ACPI_EXTERN char acpi_gbl_db_debug_filename[80]; | ||
| 455 | ACPI_EXTERN u8 acpi_gbl_db_output_to_file; | 449 | ACPI_EXTERN u8 acpi_gbl_db_output_to_file; |
| 456 | ACPI_EXTERN char *acpi_gbl_db_buffer; | 450 | ACPI_EXTERN char *acpi_gbl_db_buffer; |
| 457 | ACPI_EXTERN char *acpi_gbl_db_filename; | 451 | ACPI_EXTERN char *acpi_gbl_db_filename; |
| @@ -459,6 +453,16 @@ ACPI_EXTERN u32 acpi_gbl_db_debug_level; | |||
| 459 | ACPI_EXTERN u32 acpi_gbl_db_console_debug_level; | 453 | ACPI_EXTERN u32 acpi_gbl_db_console_debug_level; |
| 460 | ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_db_scope_node; | 454 | ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_db_scope_node; |
| 461 | 455 | ||
| 456 | ACPI_EXTERN char *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS]; | ||
| 457 | ACPI_EXTERN acpi_object_type acpi_gbl_db_arg_types[ACPI_DEBUGGER_MAX_ARGS]; | ||
| 458 | |||
| 459 | /* These buffers should all be the same size */ | ||
| 460 | |||
| 461 | ACPI_EXTERN char acpi_gbl_db_line_buf[ACPI_DB_LINE_BUFFER_SIZE]; | ||
| 462 | ACPI_EXTERN char acpi_gbl_db_parsed_buf[ACPI_DB_LINE_BUFFER_SIZE]; | ||
| 463 | ACPI_EXTERN char acpi_gbl_db_scope_buf[ACPI_DB_LINE_BUFFER_SIZE]; | ||
| 464 | ACPI_EXTERN char acpi_gbl_db_debug_filename[ACPI_DB_LINE_BUFFER_SIZE]; | ||
| 465 | |||
| 462 | /* | 466 | /* |
| 463 | * Statistic globals | 467 | * Statistic globals |
| 464 | */ | 468 | */ |
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index 0ed00669cd21..be9e30ee6048 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h | |||
| @@ -398,6 +398,14 @@ struct acpi_simple_repair_info { | |||
| 398 | * | 398 | * |
| 399 | ****************************************************************************/ | 399 | ****************************************************************************/ |
| 400 | 400 | ||
| 401 | /* Dispatch info for each host-installed SCI handler */ | ||
| 402 | |||
| 403 | struct acpi_sci_handler_info { | ||
| 404 | struct acpi_sci_handler_info *next; | ||
| 405 | acpi_sci_handler address; /* Address of handler */ | ||
| 406 | void *context; /* Context to be passed to handler */ | ||
| 407 | }; | ||
| 408 | |||
| 401 | /* Dispatch info for each GPE -- either a method or handler, cannot be both */ | 409 | /* Dispatch info for each GPE -- either a method or handler, cannot be both */ |
| 402 | 410 | ||
| 403 | struct acpi_gpe_handler_info { | 411 | struct acpi_gpe_handler_info { |
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h index 40b04bd5579e..e6138ac4a160 100644 --- a/drivers/acpi/acpica/acnamesp.h +++ b/drivers/acpi/acpica/acnamesp.h | |||
| @@ -213,6 +213,12 @@ acpi_ns_dump_objects(acpi_object_type type, | |||
| 213 | u8 display_type, | 213 | u8 display_type, |
| 214 | u32 max_depth, | 214 | u32 max_depth, |
| 215 | acpi_owner_id owner_id, acpi_handle start_handle); | 215 | acpi_owner_id owner_id, acpi_handle start_handle); |
| 216 | |||
| 217 | void | ||
| 218 | acpi_ns_dump_object_paths(acpi_object_type type, | ||
| 219 | u8 display_type, | ||
| 220 | u32 max_depth, | ||
| 221 | acpi_owner_id owner_id, acpi_handle start_handle); | ||
| 216 | #endif /* ACPI_FUTURE_USAGE */ | 222 | #endif /* ACPI_FUTURE_USAGE */ |
| 217 | 223 | ||
| 218 | /* | 224 | /* |
diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c index b24dbb80fab8..d52339090b60 100644 --- a/drivers/acpi/acpica/evgpeutil.c +++ b/drivers/acpi/acpica/evgpeutil.c | |||
| @@ -196,7 +196,7 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info, | |||
| 196 | * | 196 | * |
| 197 | * FUNCTION: acpi_ev_get_gpe_xrupt_block | 197 | * FUNCTION: acpi_ev_get_gpe_xrupt_block |
| 198 | * | 198 | * |
| 199 | * PARAMETERS: interrupt_number - Interrupt for a GPE block | 199 | * PARAMETERS: interrupt_number - Interrupt for a GPE block |
| 200 | * | 200 | * |
| 201 | * RETURN: A GPE interrupt block | 201 | * RETURN: A GPE interrupt block |
| 202 | * | 202 | * |
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c index 1b111ef74903..a5687540e9a6 100644 --- a/drivers/acpi/acpica/evmisc.c +++ b/drivers/acpi/acpica/evmisc.c | |||
| @@ -264,13 +264,6 @@ void acpi_ev_terminate(void) | |||
| 264 | 264 | ||
| 265 | status = acpi_ev_walk_gpe_list(acpi_hw_disable_gpe_block, NULL); | 265 | status = acpi_ev_walk_gpe_list(acpi_hw_disable_gpe_block, NULL); |
| 266 | 266 | ||
| 267 | /* Remove SCI handler */ | ||
| 268 | |||
| 269 | status = acpi_ev_remove_sci_handler(); | ||
| 270 | if (ACPI_FAILURE(status)) { | ||
| 271 | ACPI_ERROR((AE_INFO, "Could not remove SCI handler")); | ||
| 272 | } | ||
| 273 | |||
| 274 | status = acpi_ev_remove_global_lock_handler(); | 267 | status = acpi_ev_remove_global_lock_handler(); |
| 275 | if (ACPI_FAILURE(status)) { | 268 | if (ACPI_FAILURE(status)) { |
| 276 | ACPI_ERROR((AE_INFO, | 269 | ACPI_ERROR((AE_INFO, |
| @@ -280,6 +273,13 @@ void acpi_ev_terminate(void) | |||
| 280 | acpi_gbl_events_initialized = FALSE; | 273 | acpi_gbl_events_initialized = FALSE; |
| 281 | } | 274 | } |
| 282 | 275 | ||
| 276 | /* Remove SCI handlers */ | ||
| 277 | |||
| 278 | status = acpi_ev_remove_all_sci_handlers(); | ||
| 279 | if (ACPI_FAILURE(status)) { | ||
| 280 | ACPI_ERROR((AE_INFO, "Could not remove SCI handler")); | ||
| 281 | } | ||
| 282 | |||
| 283 | /* Deallocate all handler objects installed within GPE info structs */ | 283 | /* Deallocate all handler objects installed within GPE info structs */ |
| 284 | 284 | ||
| 285 | status = acpi_ev_walk_gpe_list(acpi_ev_delete_gpe_handlers, NULL); | 285 | status = acpi_ev_walk_gpe_list(acpi_ev_delete_gpe_handlers, NULL); |
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c index cea14d6fc76c..6293d6bb6fe1 100644 --- a/drivers/acpi/acpica/evregion.c +++ b/drivers/acpi/acpica/evregion.c | |||
| @@ -217,16 +217,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, | |||
| 217 | if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE)) { | 217 | if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE)) { |
| 218 | region_obj->region.flags |= AOPOBJ_SETUP_COMPLETE; | 218 | region_obj->region.flags |= AOPOBJ_SETUP_COMPLETE; |
| 219 | 219 | ||
| 220 | if (region_obj2->extra.region_context) { | 220 | /* |
| 221 | 221 | * Save the returned context for use in all accesses to | |
| 222 | /* The handler for this region was already installed */ | 222 | * the handler for this particular region |
| 223 | 223 | */ | |
| 224 | ACPI_FREE(region_context); | 224 | if (!(region_obj2->extra.region_context)) { |
| 225 | } else { | ||
| 226 | /* | ||
| 227 | * Save the returned context for use in all accesses to | ||
| 228 | * this particular region | ||
| 229 | */ | ||
| 230 | region_obj2->extra.region_context = | 225 | region_obj2->extra.region_context = |
| 231 | region_context; | 226 | region_context; |
| 232 | } | 227 | } |
| @@ -402,6 +397,14 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj, | |||
| 402 | handler_obj->address_space. | 397 | handler_obj->address_space. |
| 403 | context, region_context); | 398 | context, region_context); |
| 404 | 399 | ||
| 400 | /* | ||
| 401 | * region_context should have been released by the deactivate | ||
| 402 | * operation. We don't need access to it anymore here. | ||
| 403 | */ | ||
| 404 | if (region_context) { | ||
| 405 | *region_context = NULL; | ||
| 406 | } | ||
| 407 | |||
| 405 | /* Init routine may fail, Just ignore errors */ | 408 | /* Init routine may fail, Just ignore errors */ |
| 406 | 409 | ||
| 407 | if (ACPI_FAILURE(status)) { | 410 | if (ACPI_FAILURE(status)) { |
diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c index b905acf7aacd..94d9ebddf575 100644 --- a/drivers/acpi/acpica/evsci.c +++ b/drivers/acpi/acpica/evsci.c | |||
| @@ -54,6 +54,50 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context); | |||
| 54 | 54 | ||
| 55 | /******************************************************************************* | 55 | /******************************************************************************* |
| 56 | * | 56 | * |
| 57 | * FUNCTION: acpi_ev_sci_dispatch | ||
| 58 | * | ||
| 59 | * PARAMETERS: None | ||
| 60 | * | ||
| 61 | * RETURN: Status code indicates whether interrupt was handled. | ||
| 62 | * | ||
| 63 | * DESCRIPTION: Dispatch the SCI to all host-installed SCI handlers. | ||
| 64 | * | ||
| 65 | ******************************************************************************/ | ||
| 66 | |||
| 67 | u32 acpi_ev_sci_dispatch(void) | ||
| 68 | { | ||
| 69 | struct acpi_sci_handler_info *sci_handler; | ||
| 70 | acpi_cpu_flags flags; | ||
| 71 | u32 int_status = ACPI_INTERRUPT_NOT_HANDLED; | ||
| 72 | |||
| 73 | ACPI_FUNCTION_NAME(ev_sci_dispatch); | ||
| 74 | |||
| 75 | /* Are there any host-installed SCI handlers? */ | ||
| 76 | |||
| 77 | if (!acpi_gbl_sci_handler_list) { | ||
| 78 | return (int_status); | ||
| 79 | } | ||
| 80 | |||
| 81 | flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock); | ||
| 82 | |||
| 83 | /* Invoke all host-installed SCI handlers */ | ||
| 84 | |||
| 85 | sci_handler = acpi_gbl_sci_handler_list; | ||
| 86 | while (sci_handler) { | ||
| 87 | |||
| 88 | /* Invoke the installed handler (at interrupt level) */ | ||
| 89 | |||
| 90 | int_status |= sci_handler->address(sci_handler->context); | ||
| 91 | |||
| 92 | sci_handler = sci_handler->next; | ||
| 93 | } | ||
| 94 | |||
| 95 | acpi_os_release_lock(acpi_gbl_gpe_lock, flags); | ||
| 96 | return (int_status); | ||
| 97 | } | ||
| 98 | |||
| 99 | /******************************************************************************* | ||
| 100 | * | ||
| 57 | * FUNCTION: acpi_ev_sci_xrupt_handler | 101 | * FUNCTION: acpi_ev_sci_xrupt_handler |
| 58 | * | 102 | * |
| 59 | * PARAMETERS: context - Calling Context | 103 | * PARAMETERS: context - Calling Context |
| @@ -89,6 +133,10 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context) | |||
| 89 | */ | 133 | */ |
| 90 | interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list); | 134 | interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list); |
| 91 | 135 | ||
| 136 | /* Invoke all host-installed SCI handlers */ | ||
| 137 | |||
| 138 | interrupt_handled |= acpi_ev_sci_dispatch(); | ||
| 139 | |||
| 92 | return_UINT32(interrupt_handled); | 140 | return_UINT32(interrupt_handled); |
| 93 | } | 141 | } |
| 94 | 142 | ||
| @@ -112,14 +160,13 @@ u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context) | |||
| 112 | ACPI_FUNCTION_TRACE(ev_gpe_xrupt_handler); | 160 | ACPI_FUNCTION_TRACE(ev_gpe_xrupt_handler); |
| 113 | 161 | ||
| 114 | /* | 162 | /* |
| 115 | * We are guaranteed by the ACPI CA initialization/shutdown code that | 163 | * We are guaranteed by the ACPICA initialization/shutdown code that |
| 116 | * if this interrupt handler is installed, ACPI is enabled. | 164 | * if this interrupt handler is installed, ACPI is enabled. |
| 117 | */ | 165 | */ |
| 118 | 166 | ||
| 119 | /* GPEs: Check for and dispatch any GPEs that have occurred */ | 167 | /* GPEs: Check for and dispatch any GPEs that have occurred */ |
| 120 | 168 | ||
| 121 | interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list); | 169 | interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list); |
| 122 | |||
| 123 | return_UINT32(interrupt_handled); | 170 | return_UINT32(interrupt_handled); |
| 124 | } | 171 | } |
| 125 | 172 | ||
| @@ -150,15 +197,15 @@ u32 acpi_ev_install_sci_handler(void) | |||
| 150 | 197 | ||
| 151 | /****************************************************************************** | 198 | /****************************************************************************** |
| 152 | * | 199 | * |
| 153 | * FUNCTION: acpi_ev_remove_sci_handler | 200 | * FUNCTION: acpi_ev_remove_all_sci_handlers |
| 154 | * | 201 | * |
| 155 | * PARAMETERS: none | 202 | * PARAMETERS: none |
| 156 | * | 203 | * |
| 157 | * RETURN: E_OK if handler uninstalled OK, E_ERROR if handler was not | 204 | * RETURN: AE_OK if handler uninstalled, AE_ERROR if handler was not |
| 158 | * installed to begin with | 205 | * installed to begin with |
| 159 | * | 206 | * |
| 160 | * DESCRIPTION: Remove the SCI interrupt handler. No further SCIs will be | 207 | * DESCRIPTION: Remove the SCI interrupt handler. No further SCIs will be |
| 161 | * taken. | 208 | * taken. Remove all host-installed SCI handlers. |
| 162 | * | 209 | * |
| 163 | * Note: It doesn't seem important to disable all events or set the event | 210 | * Note: It doesn't seem important to disable all events or set the event |
| 164 | * enable registers to their original values. The OS should disable | 211 | * enable registers to their original values. The OS should disable |
| @@ -167,11 +214,13 @@ u32 acpi_ev_install_sci_handler(void) | |||
| 167 | * | 214 | * |
| 168 | ******************************************************************************/ | 215 | ******************************************************************************/ |
| 169 | 216 | ||
| 170 | acpi_status acpi_ev_remove_sci_handler(void) | 217 | acpi_status acpi_ev_remove_all_sci_handlers(void) |
| 171 | { | 218 | { |
| 219 | struct acpi_sci_handler_info *sci_handler; | ||
| 220 | acpi_cpu_flags flags; | ||
| 172 | acpi_status status; | 221 | acpi_status status; |
| 173 | 222 | ||
| 174 | ACPI_FUNCTION_TRACE(ev_remove_sci_handler); | 223 | ACPI_FUNCTION_TRACE(ev_remove_all_sci_handlers); |
| 175 | 224 | ||
| 176 | /* Just let the OS remove the handler and disable the level */ | 225 | /* Just let the OS remove the handler and disable the level */ |
| 177 | 226 | ||
| @@ -179,6 +228,21 @@ acpi_status acpi_ev_remove_sci_handler(void) | |||
| 179 | acpi_os_remove_interrupt_handler((u32) acpi_gbl_FADT.sci_interrupt, | 228 | acpi_os_remove_interrupt_handler((u32) acpi_gbl_FADT.sci_interrupt, |
| 180 | acpi_ev_sci_xrupt_handler); | 229 | acpi_ev_sci_xrupt_handler); |
| 181 | 230 | ||
| 231 | if (!acpi_gbl_sci_handler_list) { | ||
| 232 | return (status); | ||
| 233 | } | ||
| 234 | |||
| 235 | flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock); | ||
| 236 | |||
| 237 | /* Free all host-installed SCI handlers */ | ||
| 238 | |||
| 239 | while (acpi_gbl_sci_handler_list) { | ||
| 240 | sci_handler = acpi_gbl_sci_handler_list; | ||
| 241 | acpi_gbl_sci_handler_list = sci_handler->next; | ||
| 242 | ACPI_FREE(sci_handler); | ||
| 243 | } | ||
| 244 | |||
| 245 | acpi_os_release_lock(acpi_gbl_gpe_lock, flags); | ||
| 182 | return_ACPI_STATUS(status); | 246 | return_ACPI_STATUS(status); |
| 183 | } | 247 | } |
| 184 | 248 | ||
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c index ca5fba99c33b..6f56146a6f88 100644 --- a/drivers/acpi/acpica/evxface.c +++ b/drivers/acpi/acpica/evxface.c | |||
| @@ -385,6 +385,144 @@ ACPI_EXPORT_SYMBOL(acpi_install_exception_handler) | |||
| 385 | #if (!ACPI_REDUCED_HARDWARE) | 385 | #if (!ACPI_REDUCED_HARDWARE) |
| 386 | /******************************************************************************* | 386 | /******************************************************************************* |
| 387 | * | 387 | * |
| 388 | * FUNCTION: acpi_install_sci_handler | ||
| 389 | * | ||
| 390 | * PARAMETERS: address - Address of the handler | ||
| 391 | * context - Value passed to the handler on each SCI | ||
| 392 | * | ||
| 393 | * RETURN: Status | ||
| 394 | * | ||
| 395 | * DESCRIPTION: Install a handler for a System Control Interrupt. | ||
| 396 | * | ||
| 397 | ******************************************************************************/ | ||
| 398 | acpi_status acpi_install_sci_handler(acpi_sci_handler address, void *context) | ||
| 399 | { | ||
| 400 | struct acpi_sci_handler_info *new_sci_handler; | ||
| 401 | struct acpi_sci_handler_info *sci_handler; | ||
| 402 | acpi_cpu_flags flags; | ||
| 403 | acpi_status status; | ||
| 404 | |||
| 405 | ACPI_FUNCTION_TRACE(acpi_install_sci_handler); | ||
| 406 | |||
| 407 | if (!address) { | ||
| 408 | return_ACPI_STATUS(AE_BAD_PARAMETER); | ||
| 409 | } | ||
| 410 | |||
| 411 | /* Allocate and init a handler object */ | ||
| 412 | |||
| 413 | new_sci_handler = ACPI_ALLOCATE(sizeof(struct acpi_sci_handler_info)); | ||
| 414 | if (!new_sci_handler) { | ||
| 415 | return_ACPI_STATUS(AE_NO_MEMORY); | ||
| 416 | } | ||
| 417 | |||
| 418 | new_sci_handler->address = address; | ||
| 419 | new_sci_handler->context = context; | ||
| 420 | |||
| 421 | status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS); | ||
| 422 | if (ACPI_FAILURE(status)) { | ||
| 423 | goto exit; | ||
| 424 | } | ||
| 425 | |||
| 426 | /* Lock list during installation */ | ||
| 427 | |||
| 428 | flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock); | ||
| 429 | sci_handler = acpi_gbl_sci_handler_list; | ||
| 430 | |||
| 431 | /* Ensure handler does not already exist */ | ||
| 432 | |||
| 433 | while (sci_handler) { | ||
| 434 | if (address == sci_handler->address) { | ||
| 435 | status = AE_ALREADY_EXISTS; | ||
| 436 | goto unlock_and_exit; | ||
| 437 | } | ||
| 438 | |||
| 439 | sci_handler = sci_handler->next; | ||
| 440 | } | ||
| 441 | |||
| 442 | /* Install the new handler into the global list (at head) */ | ||
| 443 | |||
| 444 | new_sci_handler->next = acpi_gbl_sci_handler_list; | ||
| 445 | acpi_gbl_sci_handler_list = new_sci_handler; | ||
| 446 | |||
| 447 | unlock_and_exit: | ||
| 448 | |||
| 449 | acpi_os_release_lock(acpi_gbl_gpe_lock, flags); | ||
| 450 | (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS); | ||
| 451 | |||
| 452 | exit: | ||
| 453 | if (ACPI_FAILURE(status)) { | ||
| 454 | ACPI_FREE(new_sci_handler); | ||
| 455 | } | ||
| 456 | return_ACPI_STATUS(status); | ||
| 457 | } | ||
| 458 | |||
| 459 | /******************************************************************************* | ||
| 460 | * | ||
| 461 | * FUNCTION: acpi_remove_sci_handler | ||
| 462 | * | ||
| 463 | * PARAMETERS: address - Address of the handler | ||
| 464 | * | ||
| 465 | * RETURN: Status | ||
| 466 | * | ||
| 467 | * DESCRIPTION: Remove a handler for a System Control Interrupt. | ||
| 468 | * | ||
| 469 | ******************************************************************************/ | ||
| 470 | |||
| 471 | acpi_status acpi_remove_sci_handler(acpi_sci_handler address) | ||
| 472 | { | ||
| 473 | struct acpi_sci_handler_info *prev_sci_handler; | ||
| 474 | struct acpi_sci_handler_info *next_sci_handler; | ||
| 475 | acpi_cpu_flags flags; | ||
| 476 | acpi_status status; | ||
| 477 | |||
| 478 | ACPI_FUNCTION_TRACE(acpi_remove_sci_handler); | ||
| 479 | |||
| 480 | if (!address) { | ||
| 481 | return_ACPI_STATUS(AE_BAD_PARAMETER); | ||
| 482 | } | ||
| 483 | |||
| 484 | status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS); | ||
| 485 | if (ACPI_FAILURE(status)) { | ||
| 486 | return_ACPI_STATUS(status); | ||
| 487 | } | ||
| 488 | |||
| 489 | /* Remove the SCI handler with lock */ | ||
| 490 | |||
| 491 | flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock); | ||
| 492 | |||
| 493 | prev_sci_handler = NULL; | ||
| 494 | next_sci_handler = acpi_gbl_sci_handler_list; | ||
| 495 | while (next_sci_handler) { | ||
| 496 | if (next_sci_handler->address == address) { | ||
| 497 | |||
| 498 | /* Unlink and free the SCI handler info block */ | ||
| 499 | |||
| 500 | if (prev_sci_handler) { | ||
| 501 | prev_sci_handler->next = next_sci_handler->next; | ||
| 502 | } else { | ||
| 503 | acpi_gbl_sci_handler_list = | ||
| 504 | next_sci_handler->next; | ||
| 505 | } | ||
| 506 | |||
| 507 | acpi_os_release_lock(acpi_gbl_gpe_lock, flags); | ||
| 508 | ACPI_FREE(next_sci_handler); | ||
| 509 | goto unlock_and_exit; | ||
| 510 | } | ||
| 511 | |||
| 512 | prev_sci_handler = next_sci_handler; | ||
| 513 | next_sci_handler = next_sci_handler->next; | ||
| 514 | } | ||
| 515 | |||
| 516 | acpi_os_release_lock(acpi_gbl_gpe_lock, flags); | ||
| 517 | status = AE_NOT_EXIST; | ||
| 518 | |||
| 519 | unlock_and_exit: | ||
| 520 | (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS); | ||
| 521 | return_ACPI_STATUS(status); | ||
| 522 | } | ||
| 523 | |||
| 524 | /******************************************************************************* | ||
| 525 | * | ||
| 388 | * FUNCTION: acpi_install_global_event_handler | 526 | * FUNCTION: acpi_install_global_event_handler |
| 389 | * | 527 | * |
| 390 | * PARAMETERS: handler - Pointer to the global event handler function | 528 | * PARAMETERS: handler - Pointer to the global event handler function |
| @@ -398,6 +536,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_exception_handler) | |||
| 398 | * Can be used to update event counters, etc. | 536 | * Can be used to update event counters, etc. |
| 399 | * | 537 | * |
| 400 | ******************************************************************************/ | 538 | ******************************************************************************/ |
| 539 | |||
| 401 | acpi_status | 540 | acpi_status |
| 402 | acpi_install_global_event_handler(acpi_gbl_event_handler handler, void *context) | 541 | acpi_install_global_event_handler(acpi_gbl_event_handler handler, void *context) |
| 403 | { | 542 | { |
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c index 5ee7a814cd92..f81fb068d20e 100644 --- a/drivers/acpi/acpica/hwxface.c +++ b/drivers/acpi/acpica/hwxface.c | |||
| @@ -119,7 +119,8 @@ ACPI_EXPORT_SYMBOL(acpi_reset) | |||
| 119 | ******************************************************************************/ | 119 | ******************************************************************************/ |
| 120 | acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg) | 120 | acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg) |
| 121 | { | 121 | { |
| 122 | u32 value; | 122 | u32 value_lo; |
| 123 | u32 value_hi; | ||
| 123 | u32 width; | 124 | u32 width; |
| 124 | u64 address; | 125 | u64 address; |
| 125 | acpi_status status; | 126 | acpi_status status; |
| @@ -137,13 +138,8 @@ acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg) | |||
| 137 | return (status); | 138 | return (status); |
| 138 | } | 139 | } |
| 139 | 140 | ||
| 140 | /* Initialize entire 64-bit return value to zero */ | ||
| 141 | |||
| 142 | *return_value = 0; | ||
| 143 | value = 0; | ||
| 144 | |||
| 145 | /* | 141 | /* |
| 146 | * Two address spaces supported: Memory or IO. PCI_Config is | 142 | * Two address spaces supported: Memory or I/O. PCI_Config is |
| 147 | * not supported here because the GAS structure is insufficient | 143 | * not supported here because the GAS structure is insufficient |
| 148 | */ | 144 | */ |
| 149 | if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) { | 145 | if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) { |
| @@ -155,29 +151,35 @@ acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg) | |||
| 155 | } | 151 | } |
| 156 | } else { /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */ | 152 | } else { /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */ |
| 157 | 153 | ||
| 154 | value_lo = 0; | ||
| 155 | value_hi = 0; | ||
| 156 | |||
| 158 | width = reg->bit_width; | 157 | width = reg->bit_width; |
| 159 | if (width == 64) { | 158 | if (width == 64) { |
| 160 | width = 32; /* Break into two 32-bit transfers */ | 159 | width = 32; /* Break into two 32-bit transfers */ |
| 161 | } | 160 | } |
| 162 | 161 | ||
| 163 | status = acpi_hw_read_port((acpi_io_address) | 162 | status = acpi_hw_read_port((acpi_io_address) |
| 164 | address, &value, width); | 163 | address, &value_lo, width); |
| 165 | if (ACPI_FAILURE(status)) { | 164 | if (ACPI_FAILURE(status)) { |
| 166 | return (status); | 165 | return (status); |
| 167 | } | 166 | } |
| 168 | *return_value = value; | ||
| 169 | 167 | ||
| 170 | if (reg->bit_width == 64) { | 168 | if (reg->bit_width == 64) { |
| 171 | 169 | ||
| 172 | /* Read the top 32 bits */ | 170 | /* Read the top 32 bits */ |
| 173 | 171 | ||
| 174 | status = acpi_hw_read_port((acpi_io_address) | 172 | status = acpi_hw_read_port((acpi_io_address) |
| 175 | (address + 4), &value, 32); | 173 | (address + 4), &value_hi, |
| 174 | 32); | ||
| 176 | if (ACPI_FAILURE(status)) { | 175 | if (ACPI_FAILURE(status)) { |
| 177 | return (status); | 176 | return (status); |
| 178 | } | 177 | } |
| 179 | *return_value |= ((u64)value << 32); | ||
| 180 | } | 178 | } |
| 179 | |||
| 180 | /* Set the return value only if status is AE_OK */ | ||
| 181 | |||
| 182 | *return_value = (value_lo | ((u64)value_hi << 32)); | ||
| 181 | } | 183 | } |
| 182 | 184 | ||
| 183 | ACPI_DEBUG_PRINT((ACPI_DB_IO, | 185 | ACPI_DEBUG_PRINT((ACPI_DB_IO, |
| @@ -186,7 +188,7 @@ acpi_status acpi_read(u64 *return_value, struct acpi_generic_address *reg) | |||
| 186 | ACPI_FORMAT_UINT64(address), | 188 | ACPI_FORMAT_UINT64(address), |
| 187 | acpi_ut_get_region_name(reg->space_id))); | 189 | acpi_ut_get_region_name(reg->space_id))); |
| 188 | 190 | ||
| 189 | return (status); | 191 | return (AE_OK); |
| 190 | } | 192 | } |
| 191 | 193 | ||
| 192 | ACPI_EXPORT_SYMBOL(acpi_read) | 194 | ACPI_EXPORT_SYMBOL(acpi_read) |
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c index c5316e5bd4ab..aff79c7392ff 100644 --- a/drivers/acpi/acpica/nsaccess.c +++ b/drivers/acpi/acpica/nsaccess.c | |||
| @@ -424,8 +424,9 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, | |||
| 424 | /* Current scope has no parent scope */ | 424 | /* Current scope has no parent scope */ |
| 425 | 425 | ||
| 426 | ACPI_ERROR((AE_INFO, | 426 | ACPI_ERROR((AE_INFO, |
| 427 | "ACPI path has too many parent prefixes (^) " | 427 | "%s: Path has too many parent prefixes (^) " |
| 428 | "- reached beyond root node")); | 428 | "- reached beyond root node", |
| 429 | pathname)); | ||
| 429 | return_ACPI_STATUS(AE_NOT_FOUND); | 430 | return_ACPI_STATUS(AE_NOT_FOUND); |
| 430 | } | 431 | } |
| 431 | } | 432 | } |
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c index 7418c77fde8c..80633851cb2f 100644 --- a/drivers/acpi/acpica/nsdump.c +++ b/drivers/acpi/acpica/nsdump.c | |||
| @@ -59,6 +59,17 @@ acpi_ns_dump_one_device(acpi_handle obj_handle, | |||
| 59 | #endif | 59 | #endif |
| 60 | 60 | ||
| 61 | #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) | 61 | #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) |
| 62 | |||
| 63 | #ifdef ACPI_FUTURE_USAGE | ||
| 64 | static acpi_status | ||
| 65 | acpi_ns_dump_one_object_path(acpi_handle obj_handle, | ||
| 66 | u32 level, void *context, void **return_value); | ||
| 67 | |||
| 68 | static acpi_status | ||
| 69 | acpi_ns_get_max_depth(acpi_handle obj_handle, | ||
| 70 | u32 level, void *context, void **return_value); | ||
| 71 | #endif /* ACPI_FUTURE_USAGE */ | ||
| 72 | |||
| 62 | /******************************************************************************* | 73 | /******************************************************************************* |
| 63 | * | 74 | * |
| 64 | * FUNCTION: acpi_ns_print_pathname | 75 | * FUNCTION: acpi_ns_print_pathname |
| @@ -671,6 +682,129 @@ acpi_ns_dump_objects(acpi_object_type type, | |||
| 671 | } | 682 | } |
| 672 | #endif /* ACPI_FUTURE_USAGE */ | 683 | #endif /* ACPI_FUTURE_USAGE */ |
| 673 | 684 | ||
| 685 | #ifdef ACPI_FUTURE_USAGE | ||
| 686 | /******************************************************************************* | ||
| 687 | * | ||
| 688 | * FUNCTION: acpi_ns_dump_one_object_path, acpi_ns_get_max_depth | ||
| 689 | * | ||
| 690 | * PARAMETERS: obj_handle - Node to be dumped | ||
| 691 | * level - Nesting level of the handle | ||
| 692 | * context - Passed into walk_namespace | ||
| 693 | * return_value - Not used | ||
| 694 | * | ||
| 695 | * RETURN: Status | ||
| 696 | * | ||
| 697 | * DESCRIPTION: Dump the full pathname to a namespace object. acp_ns_get_max_depth | ||
| 698 | * computes the maximum nesting depth in the namespace tree, in | ||
| 699 | * order to simplify formatting in acpi_ns_dump_one_object_path. | ||
| 700 | * These procedures are user_functions called by acpi_ns_walk_namespace. | ||
| 701 | * | ||
| 702 | ******************************************************************************/ | ||
| 703 | |||
| 704 | static acpi_status | ||
| 705 | acpi_ns_dump_one_object_path(acpi_handle obj_handle, | ||
| 706 | u32 level, void *context, void **return_value) | ||
| 707 | { | ||
| 708 | u32 max_level = *((u32 *)context); | ||
| 709 | char *pathname; | ||
| 710 | struct acpi_namespace_node *node; | ||
| 711 | int path_indent; | ||
| 712 | |||
| 713 | if (!obj_handle) { | ||
| 714 | return (AE_OK); | ||
| 715 | } | ||
| 716 | |||
| 717 | node = acpi_ns_validate_handle(obj_handle); | ||
| 718 | pathname = acpi_ns_get_external_pathname(node); | ||
| 719 | |||
| 720 | path_indent = 1; | ||
| 721 | if (level <= max_level) { | ||
| 722 | path_indent = max_level - level + 1; | ||
| 723 | } | ||
| 724 | |||
| 725 | acpi_os_printf("%2d%*s%-12s%*s", | ||
| 726 | level, level, " ", acpi_ut_get_type_name(node->type), | ||
| 727 | path_indent, " "); | ||
| 728 | |||
| 729 | acpi_os_printf("%s\n", &pathname[1]); | ||
| 730 | ACPI_FREE(pathname); | ||
| 731 | return (AE_OK); | ||
| 732 | } | ||
| 733 | |||
| 734 | static acpi_status | ||
| 735 | acpi_ns_get_max_depth(acpi_handle obj_handle, | ||
| 736 | u32 level, void *context, void **return_value) | ||
| 737 | { | ||
| 738 | u32 *max_level = (u32 *)context; | ||
| 739 | |||
| 740 | if (level > *max_level) { | ||
| 741 | *max_level = level; | ||
| 742 | } | ||
| 743 | return (AE_OK); | ||
| 744 | } | ||
| 745 | |||
| 746 | /******************************************************************************* | ||
| 747 | * | ||
| 748 | * FUNCTION: acpi_ns_dump_object_paths | ||
| 749 | * | ||
| 750 | * PARAMETERS: type - Object type to be dumped | ||
| 751 | * display_type - 0 or ACPI_DISPLAY_SUMMARY | ||
| 752 | * max_depth - Maximum depth of dump. Use ACPI_UINT32_MAX | ||
| 753 | * for an effectively unlimited depth. | ||
| 754 | * owner_id - Dump only objects owned by this ID. Use | ||
| 755 | * ACPI_UINT32_MAX to match all owners. | ||
| 756 | * start_handle - Where in namespace to start/end search | ||
| 757 | * | ||
| 758 | * RETURN: None | ||
| 759 | * | ||
| 760 | * DESCRIPTION: Dump full object pathnames within the loaded namespace. Uses | ||
| 761 | * acpi_ns_walk_namespace in conjunction with acpi_ns_dump_one_object_path. | ||
| 762 | * | ||
| 763 | ******************************************************************************/ | ||
| 764 | |||
| 765 | void | ||
| 766 | acpi_ns_dump_object_paths(acpi_object_type type, | ||
| 767 | u8 display_type, | ||
| 768 | u32 max_depth, | ||
| 769 | acpi_owner_id owner_id, acpi_handle start_handle) | ||
| 770 | { | ||
| 771 | acpi_status status; | ||
| 772 | u32 max_level = 0; | ||
| 773 | |||
| 774 | ACPI_FUNCTION_ENTRY(); | ||
| 775 | |||
| 776 | /* | ||
| 777 | * Just lock the entire namespace for the duration of the dump. | ||
| 778 | * We don't want any changes to the namespace during this time, | ||
| 779 | * especially the temporary nodes since we are going to display | ||
| 780 | * them also. | ||
| 781 | */ | ||
| 782 | status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); | ||
| 783 | if (ACPI_FAILURE(status)) { | ||
| 784 | acpi_os_printf("Could not acquire namespace mutex\n"); | ||
| 785 | return; | ||
| 786 | } | ||
| 787 | |||
| 788 | /* Get the max depth of the namespace tree, for formatting later */ | ||
| 789 | |||
| 790 | (void)acpi_ns_walk_namespace(type, start_handle, max_depth, | ||
| 791 | ACPI_NS_WALK_NO_UNLOCK | | ||
| 792 | ACPI_NS_WALK_TEMP_NODES, | ||
| 793 | acpi_ns_get_max_depth, NULL, | ||
| 794 | (void *)&max_level, NULL); | ||
| 795 | |||
| 796 | /* Now dump the entire namespace */ | ||
| 797 | |||
| 798 | (void)acpi_ns_walk_namespace(type, start_handle, max_depth, | ||
| 799 | ACPI_NS_WALK_NO_UNLOCK | | ||
| 800 | ACPI_NS_WALK_TEMP_NODES, | ||
| 801 | acpi_ns_dump_one_object_path, NULL, | ||
| 802 | (void *)&max_level, NULL); | ||
| 803 | |||
| 804 | (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); | ||
| 805 | } | ||
| 806 | #endif /* ACPI_FUTURE_USAGE */ | ||
| 807 | |||
| 674 | /******************************************************************************* | 808 | /******************************************************************************* |
| 675 | * | 809 | * |
| 676 | * FUNCTION: acpi_ns_dump_entry | 810 | * FUNCTION: acpi_ns_dump_entry |
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c index b38b4b07f86e..481a6b4a9b2f 100644 --- a/drivers/acpi/acpica/nsxfeval.c +++ b/drivers/acpi/acpica/nsxfeval.c | |||
| @@ -605,11 +605,19 @@ acpi_walk_namespace(acpi_object_type type, | |||
| 605 | goto unlock_and_exit; | 605 | goto unlock_and_exit; |
| 606 | } | 606 | } |
| 607 | 607 | ||
| 608 | /* Now we can validate the starting node */ | ||
| 609 | |||
| 610 | if (!acpi_ns_validate_handle(start_object)) { | ||
| 611 | status = AE_BAD_PARAMETER; | ||
| 612 | goto unlock_and_exit2; | ||
| 613 | } | ||
| 614 | |||
| 608 | status = acpi_ns_walk_namespace(type, start_object, max_depth, | 615 | status = acpi_ns_walk_namespace(type, start_object, max_depth, |
| 609 | ACPI_NS_WALK_UNLOCK, | 616 | ACPI_NS_WALK_UNLOCK, |
| 610 | descending_callback, ascending_callback, | 617 | descending_callback, ascending_callback, |
| 611 | context, return_value); | 618 | context, return_value); |
| 612 | 619 | ||
| 620 | unlock_and_exit2: | ||
| 613 | (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); | 621 | (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); |
| 614 | 622 | ||
| 615 | unlock_and_exit: | 623 | unlock_and_exit: |
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c index 42a13c0d7015..9e6788f9ba0f 100644 --- a/drivers/acpi/acpica/tbinstal.c +++ b/drivers/acpi/acpica/tbinstal.c | |||
| @@ -80,16 +80,10 @@ acpi_status acpi_tb_verify_table(struct acpi_table_desc *table_desc) | |||
| 80 | } | 80 | } |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | /* FACS is the odd table, has no standard ACPI header and no checksum */ | 83 | /* Always calculate checksum, ignore bad checksum if requested */ |
| 84 | 84 | ||
| 85 | if (!ACPI_COMPARE_NAME(&table_desc->signature, ACPI_SIG_FACS)) { | 85 | status = |
| 86 | 86 | acpi_tb_verify_checksum(table_desc->pointer, table_desc->length); | |
| 87 | /* Always calculate checksum, ignore bad checksum if requested */ | ||
| 88 | |||
| 89 | status = | ||
| 90 | acpi_tb_verify_checksum(table_desc->pointer, | ||
| 91 | table_desc->length); | ||
| 92 | } | ||
| 93 | 87 | ||
| 94 | return_ACPI_STATUS(status); | 88 | return_ACPI_STATUS(status); |
| 95 | } | 89 | } |
diff --git a/drivers/acpi/acpica/tbprint.c b/drivers/acpi/acpica/tbprint.c index dc963f823d2c..9a47715af1f3 100644 --- a/drivers/acpi/acpica/tbprint.c +++ b/drivers/acpi/acpica/tbprint.c | |||
| @@ -138,7 +138,7 @@ acpi_tb_print_table_header(acpi_physical_address address, | |||
| 138 | ACPI_INFO((AE_INFO, "%4.4s %p %05X", | 138 | ACPI_INFO((AE_INFO, "%4.4s %p %05X", |
| 139 | header->signature, ACPI_CAST_PTR(void, address), | 139 | header->signature, ACPI_CAST_PTR(void, address), |
| 140 | header->length)); | 140 | header->length)); |
| 141 | } else if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_RSDP)) { | 141 | } else if (ACPI_VALIDATE_RSDP_SIG(header->signature)) { |
| 142 | 142 | ||
| 143 | /* RSDP has no common fields */ | 143 | /* RSDP has no common fields */ |
| 144 | 144 | ||
| @@ -190,6 +190,16 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length) | |||
| 190 | { | 190 | { |
| 191 | u8 checksum; | 191 | u8 checksum; |
| 192 | 192 | ||
| 193 | /* | ||
| 194 | * FACS/S3PT: | ||
| 195 | * They are the odd tables, have no standard ACPI header and no checksum | ||
| 196 | */ | ||
| 197 | |||
| 198 | if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_S3PT) || | ||
| 199 | ACPI_COMPARE_NAME(table->signature, ACPI_SIG_FACS)) { | ||
| 200 | return (AE_OK); | ||
| 201 | } | ||
| 202 | |||
| 193 | /* Compute the checksum on the table */ | 203 | /* Compute the checksum on the table */ |
| 194 | 204 | ||
| 195 | checksum = acpi_tb_checksum(ACPI_CAST_PTR(u8, table), length); | 205 | checksum = acpi_tb_checksum(ACPI_CAST_PTR(u8, table), length); |
diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c index 948c95e80d44..1c95fabbe6a4 100644 --- a/drivers/acpi/acpica/tbxfroot.c +++ b/drivers/acpi/acpica/tbxfroot.c | |||
| @@ -68,8 +68,7 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp) | |||
| 68 | * Note: Sometimes there exists more than one RSDP in memory; the valid | 68 | * Note: Sometimes there exists more than one RSDP in memory; the valid |
| 69 | * RSDP has a valid checksum, all others have an invalid checksum. | 69 | * RSDP has a valid checksum, all others have an invalid checksum. |
| 70 | */ | 70 | */ |
| 71 | if (ACPI_STRNCMP((char *)rsdp->signature, ACPI_SIG_RSDP, | 71 | if (!ACPI_VALIDATE_RSDP_SIG(rsdp->signature)) { |
| 72 | sizeof(ACPI_SIG_RSDP) - 1) != 0) { | ||
| 73 | 72 | ||
| 74 | /* Nope, BAD Signature */ | 73 | /* Nope, BAD Signature */ |
| 75 | 74 | ||
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c index 5796e11a0671..ffd0db509d34 100644 --- a/drivers/acpi/acpica/utdebug.c +++ b/drivers/acpi/acpica/utdebug.c | |||
| @@ -190,7 +190,7 @@ acpi_debug_print(u32 requested_debug_level, | |||
| 190 | * Display the module name, current line number, thread ID (if requested), | 190 | * Display the module name, current line number, thread ID (if requested), |
| 191 | * current procedure nesting level, and the current procedure name | 191 | * current procedure nesting level, and the current procedure name |
| 192 | */ | 192 | */ |
| 193 | acpi_os_printf("%8s-%04ld ", module_name, line_number); | 193 | acpi_os_printf("%9s-%04ld ", module_name, line_number); |
| 194 | 194 | ||
| 195 | if (ACPI_LV_THREADS & acpi_dbg_level) { | 195 | if (ACPI_LV_THREADS & acpi_dbg_level) { |
| 196 | acpi_os_printf("[%u] ", (u32)thread_id); | 196 | acpi_os_printf("[%u] ", (u32)thread_id); |
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c index d6f26bf8a062..046d5b059c07 100644 --- a/drivers/acpi/acpica/utglobal.c +++ b/drivers/acpi/acpica/utglobal.c | |||
| @@ -291,7 +291,7 @@ acpi_status acpi_ut_init_globals(void) | |||
| 291 | 291 | ||
| 292 | #if (!ACPI_REDUCED_HARDWARE) | 292 | #if (!ACPI_REDUCED_HARDWARE) |
| 293 | 293 | ||
| 294 | /* GPE support */ | 294 | /* GPE/SCI support */ |
| 295 | 295 | ||
| 296 | acpi_gbl_all_gpes_initialized = FALSE; | 296 | acpi_gbl_all_gpes_initialized = FALSE; |
| 297 | acpi_gbl_gpe_xrupt_list_head = NULL; | 297 | acpi_gbl_gpe_xrupt_list_head = NULL; |
| @@ -300,6 +300,7 @@ acpi_status acpi_ut_init_globals(void) | |||
| 300 | acpi_current_gpe_count = 0; | 300 | acpi_current_gpe_count = 0; |
| 301 | 301 | ||
| 302 | acpi_gbl_global_event_handler = NULL; | 302 | acpi_gbl_global_event_handler = NULL; |
| 303 | acpi_gbl_sci_handler_list = NULL; | ||
| 303 | 304 | ||
| 304 | #endif /* !ACPI_REDUCED_HARDWARE */ | 305 | #endif /* !ACPI_REDUCED_HARDWARE */ |
| 305 | 306 | ||
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 2c9958cd7a43..fbf1aceda8b8 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -36,12 +36,6 @@ | |||
| 36 | #include <linux/suspend.h> | 36 | #include <linux/suspend.h> |
| 37 | #include <asm/unaligned.h> | 37 | #include <asm/unaligned.h> |
| 38 | 38 | ||
| 39 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 40 | #include <linux/proc_fs.h> | ||
| 41 | #include <linux/seq_file.h> | ||
| 42 | #include <asm/uaccess.h> | ||
| 43 | #endif | ||
| 44 | |||
| 45 | #include <acpi/acpi_bus.h> | 39 | #include <acpi/acpi_bus.h> |
| 46 | #include <acpi/acpi_drivers.h> | 40 | #include <acpi/acpi_drivers.h> |
| 47 | #include <linux/power_supply.h> | 41 | #include <linux/power_supply.h> |
| @@ -72,19 +66,6 @@ static unsigned int cache_time = 1000; | |||
| 72 | module_param(cache_time, uint, 0644); | 66 | module_param(cache_time, uint, 0644); |
| 73 | MODULE_PARM_DESC(cache_time, "cache time in milliseconds"); | 67 | MODULE_PARM_DESC(cache_time, "cache time in milliseconds"); |
| 74 | 68 | ||
| 75 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 76 | extern struct proc_dir_entry *acpi_lock_battery_dir(void); | ||
| 77 | extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir); | ||
| 78 | |||
| 79 | enum acpi_battery_files { | ||
| 80 | info_tag = 0, | ||
| 81 | state_tag, | ||
| 82 | alarm_tag, | ||
| 83 | ACPI_BATTERY_NUMFILES, | ||
| 84 | }; | ||
| 85 | |||
| 86 | #endif | ||
| 87 | |||
| 88 | static const struct acpi_device_id battery_device_ids[] = { | 69 | static const struct acpi_device_id battery_device_ids[] = { |
| 89 | {"PNP0C0A", 0}, | 70 | {"PNP0C0A", 0}, |
| 90 | {"", 0}, | 71 | {"", 0}, |
| @@ -320,14 +301,6 @@ static enum power_supply_property energy_battery_props[] = { | |||
| 320 | POWER_SUPPLY_PROP_SERIAL_NUMBER, | 301 | POWER_SUPPLY_PROP_SERIAL_NUMBER, |
| 321 | }; | 302 | }; |
| 322 | 303 | ||
| 323 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 324 | inline char *acpi_battery_units(struct acpi_battery *battery) | ||
| 325 | { | ||
| 326 | return (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) ? | ||
| 327 | "mA" : "mW"; | ||
| 328 | } | ||
| 329 | #endif | ||
| 330 | |||
| 331 | /* -------------------------------------------------------------------------- | 304 | /* -------------------------------------------------------------------------- |
| 332 | Battery Management | 305 | Battery Management |
| 333 | -------------------------------------------------------------------------- */ | 306 | -------------------------------------------------------------------------- */ |
| @@ -741,279 +714,6 @@ static void acpi_battery_refresh(struct acpi_battery *battery) | |||
| 741 | } | 714 | } |
| 742 | 715 | ||
| 743 | /* -------------------------------------------------------------------------- | 716 | /* -------------------------------------------------------------------------- |
| 744 | FS Interface (/proc) | ||
| 745 | -------------------------------------------------------------------------- */ | ||
| 746 | |||
| 747 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 748 | static struct proc_dir_entry *acpi_battery_dir; | ||
| 749 | |||
| 750 | static int acpi_battery_print_info(struct seq_file *seq, int result) | ||
| 751 | { | ||
| 752 | struct acpi_battery *battery = seq->private; | ||
| 753 | |||
| 754 | if (result) | ||
| 755 | goto end; | ||
| 756 | |||
| 757 | seq_printf(seq, "present: %s\n", | ||
| 758 | acpi_battery_present(battery) ? "yes" : "no"); | ||
| 759 | if (!acpi_battery_present(battery)) | ||
| 760 | goto end; | ||
| 761 | if (battery->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN) | ||
| 762 | seq_printf(seq, "design capacity: unknown\n"); | ||
| 763 | else | ||
| 764 | seq_printf(seq, "design capacity: %d %sh\n", | ||
| 765 | battery->design_capacity, | ||
| 766 | acpi_battery_units(battery)); | ||
| 767 | |||
| 768 | if (battery->full_charge_capacity == ACPI_BATTERY_VALUE_UNKNOWN) | ||
| 769 | seq_printf(seq, "last full capacity: unknown\n"); | ||
| 770 | else | ||
| 771 | seq_printf(seq, "last full capacity: %d %sh\n", | ||
| 772 | battery->full_charge_capacity, | ||
| 773 | acpi_battery_units(battery)); | ||
| 774 | |||
| 775 | seq_printf(seq, "battery technology: %srechargeable\n", | ||
| 776 | (!battery->technology)?"non-":""); | ||
| 777 | |||
| 778 | if (battery->design_voltage == ACPI_BATTERY_VALUE_UNKNOWN) | ||
| 779 | seq_printf(seq, "design voltage: unknown\n"); | ||
| 780 | else | ||
| 781 | seq_printf(seq, "design voltage: %d mV\n", | ||
| 782 | battery->design_voltage); | ||
| 783 | seq_printf(seq, "design capacity warning: %d %sh\n", | ||
| 784 | battery->design_capacity_warning, | ||
| 785 | acpi_battery_units(battery)); | ||
| 786 | seq_printf(seq, "design capacity low: %d %sh\n", | ||
| 787 | battery->design_capacity_low, | ||
| 788 | acpi_battery_units(battery)); | ||
| 789 | seq_printf(seq, "cycle count: %i\n", battery->cycle_count); | ||
| 790 | seq_printf(seq, "capacity granularity 1: %d %sh\n", | ||
| 791 | battery->capacity_granularity_1, | ||
| 792 | acpi_battery_units(battery)); | ||
| 793 | seq_printf(seq, "capacity granularity 2: %d %sh\n", | ||
| 794 | battery->capacity_granularity_2, | ||
| 795 | acpi_battery_units(battery)); | ||
| 796 | seq_printf(seq, "model number: %s\n", battery->model_number); | ||
| 797 | seq_printf(seq, "serial number: %s\n", battery->serial_number); | ||
| 798 | seq_printf(seq, "battery type: %s\n", battery->type); | ||
| 799 | seq_printf(seq, "OEM info: %s\n", battery->oem_info); | ||
| 800 | end: | ||
| 801 | if (result) | ||
| 802 | seq_printf(seq, "ERROR: Unable to read battery info\n"); | ||
| 803 | return result; | ||
| 804 | } | ||
| 805 | |||
| 806 | static int acpi_battery_print_state(struct seq_file *seq, int result) | ||
| 807 | { | ||
| 808 | struct acpi_battery *battery = seq->private; | ||
| 809 | |||
| 810 | if (result) | ||
| 811 | goto end; | ||
| 812 | |||
| 813 | seq_printf(seq, "present: %s\n", | ||
| 814 | acpi_battery_present(battery) ? "yes" : "no"); | ||
| 815 | if (!acpi_battery_present(battery)) | ||
| 816 | goto end; | ||
| 817 | |||
| 818 | seq_printf(seq, "capacity state: %s\n", | ||
| 819 | (battery->state & 0x04) ? "critical" : "ok"); | ||
| 820 | if ((battery->state & 0x01) && (battery->state & 0x02)) | ||
| 821 | seq_printf(seq, | ||
| 822 | "charging state: charging/discharging\n"); | ||
| 823 | else if (battery->state & 0x01) | ||
| 824 | seq_printf(seq, "charging state: discharging\n"); | ||
| 825 | else if (battery->state & 0x02) | ||
| 826 | seq_printf(seq, "charging state: charging\n"); | ||
| 827 | else | ||
| 828 | seq_printf(seq, "charging state: charged\n"); | ||
| 829 | |||
| 830 | if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN) | ||
| 831 | seq_printf(seq, "present rate: unknown\n"); | ||
| 832 | else | ||
| 833 | seq_printf(seq, "present rate: %d %s\n", | ||
| 834 | battery->rate_now, acpi_battery_units(battery)); | ||
| 835 | |||
| 836 | if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN) | ||
| 837 | seq_printf(seq, "remaining capacity: unknown\n"); | ||
| 838 | else | ||
| 839 | seq_printf(seq, "remaining capacity: %d %sh\n", | ||
| 840 | battery->capacity_now, acpi_battery_units(battery)); | ||
| 841 | if (battery->voltage_now == ACPI_BATTERY_VALUE_UNKNOWN) | ||
| 842 | seq_printf(seq, "present voltage: unknown\n"); | ||
| 843 | else | ||
| 844 | seq_printf(seq, "present voltage: %d mV\n", | ||
| 845 | battery->voltage_now); | ||
| 846 | end: | ||
| 847 | if (result) | ||
| 848 | seq_printf(seq, "ERROR: Unable to read battery state\n"); | ||
| 849 | |||
| 850 | return result; | ||
| 851 | } | ||
| 852 | |||
| 853 | static int acpi_battery_print_alarm(struct seq_file *seq, int result) | ||
| 854 | { | ||
| 855 | struct acpi_battery *battery = seq->private; | ||
| 856 | |||
| 857 | if (result) | ||
| 858 | goto end; | ||
| 859 | |||
| 860 | if (!acpi_battery_present(battery)) { | ||
| 861 | seq_printf(seq, "present: no\n"); | ||
| 862 | goto end; | ||
| 863 | } | ||
| 864 | seq_printf(seq, "alarm: "); | ||
| 865 | if (!battery->alarm) | ||
| 866 | seq_printf(seq, "unsupported\n"); | ||
| 867 | else | ||
| 868 | seq_printf(seq, "%u %sh\n", battery->alarm, | ||
| 869 | acpi_battery_units(battery)); | ||
| 870 | end: | ||
| 871 | if (result) | ||
| 872 | seq_printf(seq, "ERROR: Unable to read battery alarm\n"); | ||
| 873 | return result; | ||
| 874 | } | ||
| 875 | |||
| 876 | static ssize_t acpi_battery_write_alarm(struct file *file, | ||
| 877 | const char __user * buffer, | ||
| 878 | size_t count, loff_t * ppos) | ||
| 879 | { | ||
| 880 | int result = 0; | ||
| 881 | char alarm_string[12] = { '\0' }; | ||
| 882 | struct seq_file *m = file->private_data; | ||
| 883 | struct acpi_battery *battery = m->private; | ||
| 884 | |||
| 885 | if (!battery || (count > sizeof(alarm_string) - 1)) | ||
| 886 | return -EINVAL; | ||
| 887 | if (!acpi_battery_present(battery)) { | ||
| 888 | result = -ENODEV; | ||
| 889 | goto end; | ||
| 890 | } | ||
| 891 | if (copy_from_user(alarm_string, buffer, count)) { | ||
| 892 | result = -EFAULT; | ||
| 893 | goto end; | ||
| 894 | } | ||
| 895 | alarm_string[count] = '\0'; | ||
| 896 | battery->alarm = simple_strtol(alarm_string, NULL, 0); | ||
| 897 | result = acpi_battery_set_alarm(battery); | ||
| 898 | end: | ||
| 899 | if (!result) | ||
| 900 | return count; | ||
| 901 | return result; | ||
| 902 | } | ||
| 903 | |||
| 904 | typedef int(*print_func)(struct seq_file *seq, int result); | ||
| 905 | |||
| 906 | static print_func acpi_print_funcs[ACPI_BATTERY_NUMFILES] = { | ||
| 907 | acpi_battery_print_info, | ||
| 908 | acpi_battery_print_state, | ||
| 909 | acpi_battery_print_alarm, | ||
| 910 | }; | ||
| 911 | |||
| 912 | static int acpi_battery_read(int fid, struct seq_file *seq) | ||
| 913 | { | ||
| 914 | struct acpi_battery *battery = seq->private; | ||
| 915 | int result = acpi_battery_update(battery); | ||
| 916 | return acpi_print_funcs[fid](seq, result); | ||
| 917 | } | ||
| 918 | |||
| 919 | #define DECLARE_FILE_FUNCTIONS(_name) \ | ||
| 920 | static int acpi_battery_read_##_name(struct seq_file *seq, void *offset) \ | ||
| 921 | { \ | ||
| 922 | return acpi_battery_read(_name##_tag, seq); \ | ||
| 923 | } \ | ||
| 924 | static int acpi_battery_##_name##_open_fs(struct inode *inode, struct file *file) \ | ||
| 925 | { \ | ||
| 926 | return single_open(file, acpi_battery_read_##_name, PDE_DATA(inode)); \ | ||
| 927 | } | ||
| 928 | |||
| 929 | DECLARE_FILE_FUNCTIONS(info); | ||
| 930 | DECLARE_FILE_FUNCTIONS(state); | ||
| 931 | DECLARE_FILE_FUNCTIONS(alarm); | ||
| 932 | |||
| 933 | #undef DECLARE_FILE_FUNCTIONS | ||
| 934 | |||
| 935 | #define FILE_DESCRIPTION_RO(_name) \ | ||
| 936 | { \ | ||
| 937 | .name = __stringify(_name), \ | ||
| 938 | .mode = S_IRUGO, \ | ||
| 939 | .ops = { \ | ||
| 940 | .open = acpi_battery_##_name##_open_fs, \ | ||
| 941 | .read = seq_read, \ | ||
| 942 | .llseek = seq_lseek, \ | ||
| 943 | .release = single_release, \ | ||
| 944 | .owner = THIS_MODULE, \ | ||
| 945 | }, \ | ||
| 946 | } | ||
| 947 | |||
| 948 | #define FILE_DESCRIPTION_RW(_name) \ | ||
| 949 | { \ | ||
| 950 | .name = __stringify(_name), \ | ||
| 951 | .mode = S_IFREG | S_IRUGO | S_IWUSR, \ | ||
| 952 | .ops = { \ | ||
| 953 | .open = acpi_battery_##_name##_open_fs, \ | ||
| 954 | .read = seq_read, \ | ||
| 955 | .llseek = seq_lseek, \ | ||
| 956 | .write = acpi_battery_write_##_name, \ | ||
| 957 | .release = single_release, \ | ||
| 958 | .owner = THIS_MODULE, \ | ||
| 959 | }, \ | ||
| 960 | } | ||
| 961 | |||
| 962 | static const struct battery_file { | ||
| 963 | struct file_operations ops; | ||
| 964 | umode_t mode; | ||
| 965 | const char *name; | ||
| 966 | } acpi_battery_file[] = { | ||
| 967 | FILE_DESCRIPTION_RO(info), | ||
| 968 | FILE_DESCRIPTION_RO(state), | ||
| 969 | FILE_DESCRIPTION_RW(alarm), | ||
| 970 | }; | ||
| 971 | |||
| 972 | #undef FILE_DESCRIPTION_RO | ||
| 973 | #undef FILE_DESCRIPTION_RW | ||
| 974 | |||
| 975 | static int acpi_battery_add_fs(struct acpi_device *device) | ||
| 976 | { | ||
| 977 | struct proc_dir_entry *entry = NULL; | ||
| 978 | int i; | ||
| 979 | |||
| 980 | printk(KERN_WARNING PREFIX "Deprecated procfs I/F for battery is loaded," | ||
| 981 | " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n"); | ||
| 982 | if (!acpi_device_dir(device)) { | ||
| 983 | acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), | ||
| 984 | acpi_battery_dir); | ||
| 985 | if (!acpi_device_dir(device)) | ||
| 986 | return -ENODEV; | ||
| 987 | } | ||
| 988 | |||
| 989 | for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) { | ||
| 990 | entry = proc_create_data(acpi_battery_file[i].name, | ||
| 991 | acpi_battery_file[i].mode, | ||
| 992 | acpi_device_dir(device), | ||
| 993 | &acpi_battery_file[i].ops, | ||
| 994 | acpi_driver_data(device)); | ||
| 995 | if (!entry) | ||
| 996 | return -ENODEV; | ||
| 997 | } | ||
| 998 | return 0; | ||
| 999 | } | ||
| 1000 | |||
| 1001 | static void acpi_battery_remove_fs(struct acpi_device *device) | ||
| 1002 | { | ||
| 1003 | int i; | ||
| 1004 | if (!acpi_device_dir(device)) | ||
| 1005 | return; | ||
| 1006 | for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) | ||
| 1007 | remove_proc_entry(acpi_battery_file[i].name, | ||
| 1008 | acpi_device_dir(device)); | ||
| 1009 | |||
| 1010 | remove_proc_entry(acpi_device_bid(device), acpi_battery_dir); | ||
| 1011 | acpi_device_dir(device) = NULL; | ||
| 1012 | } | ||
| 1013 | |||
| 1014 | #endif | ||
| 1015 | |||
| 1016 | /* -------------------------------------------------------------------------- | ||
| 1017 | Driver Interface | 717 | Driver Interface |
| 1018 | -------------------------------------------------------------------------- */ | 718 | -------------------------------------------------------------------------- */ |
| 1019 | 719 | ||
| @@ -1075,15 +775,6 @@ static int acpi_battery_add(struct acpi_device *device) | |||
| 1075 | result = acpi_battery_update(battery); | 775 | result = acpi_battery_update(battery); |
| 1076 | if (result) | 776 | if (result) |
| 1077 | goto fail; | 777 | goto fail; |
| 1078 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 1079 | result = acpi_battery_add_fs(device); | ||
| 1080 | #endif | ||
| 1081 | if (result) { | ||
| 1082 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 1083 | acpi_battery_remove_fs(device); | ||
| 1084 | #endif | ||
| 1085 | goto fail; | ||
| 1086 | } | ||
| 1087 | 778 | ||
| 1088 | printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n", | 779 | printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n", |
| 1089 | ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device), | 780 | ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device), |
| @@ -1110,9 +801,6 @@ static int acpi_battery_remove(struct acpi_device *device) | |||
| 1110 | return -EINVAL; | 801 | return -EINVAL; |
| 1111 | battery = acpi_driver_data(device); | 802 | battery = acpi_driver_data(device); |
| 1112 | unregister_pm_notifier(&battery->pm_nb); | 803 | unregister_pm_notifier(&battery->pm_nb); |
| 1113 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 1114 | acpi_battery_remove_fs(device); | ||
| 1115 | #endif | ||
| 1116 | sysfs_remove_battery(battery); | 804 | sysfs_remove_battery(battery); |
| 1117 | mutex_destroy(&battery->lock); | 805 | mutex_destroy(&battery->lock); |
| 1118 | mutex_destroy(&battery->sysfs_lock); | 806 | mutex_destroy(&battery->sysfs_lock); |
| @@ -1158,18 +846,7 @@ static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie) | |||
| 1158 | { | 846 | { |
| 1159 | if (acpi_disabled) | 847 | if (acpi_disabled) |
| 1160 | return; | 848 | return; |
| 1161 | #ifdef CONFIG_ACPI_PROCFS_POWER | 849 | acpi_bus_register_driver(&acpi_battery_driver); |
| 1162 | acpi_battery_dir = acpi_lock_battery_dir(); | ||
| 1163 | if (!acpi_battery_dir) | ||
| 1164 | return; | ||
| 1165 | #endif | ||
| 1166 | if (acpi_bus_register_driver(&acpi_battery_driver) < 0) { | ||
| 1167 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 1168 | acpi_unlock_battery_dir(acpi_battery_dir); | ||
| 1169 | #endif | ||
| 1170 | return; | ||
| 1171 | } | ||
| 1172 | return; | ||
| 1173 | } | 850 | } |
| 1174 | 851 | ||
| 1175 | static int __init acpi_battery_init(void) | 852 | static int __init acpi_battery_init(void) |
| @@ -1181,9 +858,6 @@ static int __init acpi_battery_init(void) | |||
| 1181 | static void __exit acpi_battery_exit(void) | 858 | static void __exit acpi_battery_exit(void) |
| 1182 | { | 859 | { |
| 1183 | acpi_bus_unregister_driver(&acpi_battery_driver); | 860 | acpi_bus_unregister_driver(&acpi_battery_driver); |
| 1184 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 1185 | acpi_unlock_battery_dir(acpi_battery_dir); | ||
| 1186 | #endif | ||
| 1187 | } | 861 | } |
| 1188 | 862 | ||
| 1189 | module_init(acpi_battery_init); | 863 | module_init(acpi_battery_init); |
diff --git a/drivers/acpi/cm_sbs.c b/drivers/acpi/cm_sbs.c deleted file mode 100644 index 6c9ee68e46fb..000000000000 --- a/drivers/acpi/cm_sbs.c +++ /dev/null | |||
| @@ -1,105 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License as published by | ||
| 6 | * the Free Software Foundation; either version 2 of the License, or (at | ||
| 7 | * your option) any later version. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope that it will be useful, but | ||
| 10 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 12 | * General Public License for more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License along | ||
| 15 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
| 16 | * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. | ||
| 17 | * | ||
| 18 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 19 | */ | ||
| 20 | |||
| 21 | #include <linux/kernel.h> | ||
| 22 | #include <linux/module.h> | ||
| 23 | #include <linux/init.h> | ||
| 24 | #include <linux/acpi.h> | ||
| 25 | #include <linux/types.h> | ||
| 26 | #include <linux/proc_fs.h> | ||
| 27 | #include <linux/seq_file.h> | ||
| 28 | #include <acpi/acpi_bus.h> | ||
| 29 | #include <acpi/acpi_drivers.h> | ||
| 30 | |||
| 31 | #define PREFIX "ACPI: " | ||
| 32 | |||
| 33 | ACPI_MODULE_NAME("cm_sbs"); | ||
| 34 | #define ACPI_AC_CLASS "ac_adapter" | ||
| 35 | #define ACPI_BATTERY_CLASS "battery" | ||
| 36 | #define _COMPONENT ACPI_SBS_COMPONENT | ||
| 37 | static struct proc_dir_entry *acpi_ac_dir; | ||
| 38 | static struct proc_dir_entry *acpi_battery_dir; | ||
| 39 | |||
| 40 | static DEFINE_MUTEX(cm_sbs_mutex); | ||
| 41 | |||
| 42 | static int lock_ac_dir_cnt; | ||
| 43 | static int lock_battery_dir_cnt; | ||
| 44 | |||
| 45 | struct proc_dir_entry *acpi_lock_ac_dir(void) | ||
| 46 | { | ||
| 47 | mutex_lock(&cm_sbs_mutex); | ||
| 48 | if (!acpi_ac_dir) | ||
| 49 | acpi_ac_dir = proc_mkdir(ACPI_AC_CLASS, acpi_root_dir); | ||
| 50 | if (acpi_ac_dir) { | ||
| 51 | lock_ac_dir_cnt++; | ||
| 52 | } else { | ||
| 53 | printk(KERN_ERR PREFIX | ||
| 54 | "Cannot create %s\n", ACPI_AC_CLASS); | ||
| 55 | } | ||
| 56 | mutex_unlock(&cm_sbs_mutex); | ||
| 57 | return acpi_ac_dir; | ||
| 58 | } | ||
| 59 | EXPORT_SYMBOL(acpi_lock_ac_dir); | ||
| 60 | |||
| 61 | void acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir_param) | ||
| 62 | { | ||
| 63 | mutex_lock(&cm_sbs_mutex); | ||
| 64 | if (acpi_ac_dir_param) | ||
| 65 | lock_ac_dir_cnt--; | ||
| 66 | if (lock_ac_dir_cnt == 0 && acpi_ac_dir_param && acpi_ac_dir) { | ||
| 67 | remove_proc_entry(ACPI_AC_CLASS, acpi_root_dir); | ||
| 68 | acpi_ac_dir = NULL; | ||
| 69 | } | ||
| 70 | mutex_unlock(&cm_sbs_mutex); | ||
| 71 | } | ||
| 72 | EXPORT_SYMBOL(acpi_unlock_ac_dir); | ||
| 73 | |||
| 74 | struct proc_dir_entry *acpi_lock_battery_dir(void) | ||
| 75 | { | ||
| 76 | mutex_lock(&cm_sbs_mutex); | ||
| 77 | if (!acpi_battery_dir) { | ||
| 78 | acpi_battery_dir = | ||
| 79 | proc_mkdir(ACPI_BATTERY_CLASS, acpi_root_dir); | ||
| 80 | } | ||
| 81 | if (acpi_battery_dir) { | ||
| 82 | lock_battery_dir_cnt++; | ||
| 83 | } else { | ||
| 84 | printk(KERN_ERR PREFIX | ||
| 85 | "Cannot create %s\n", ACPI_BATTERY_CLASS); | ||
| 86 | } | ||
| 87 | mutex_unlock(&cm_sbs_mutex); | ||
| 88 | return acpi_battery_dir; | ||
| 89 | } | ||
| 90 | EXPORT_SYMBOL(acpi_lock_battery_dir); | ||
| 91 | |||
| 92 | void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir_param) | ||
| 93 | { | ||
| 94 | mutex_lock(&cm_sbs_mutex); | ||
| 95 | if (acpi_battery_dir_param) | ||
| 96 | lock_battery_dir_cnt--; | ||
| 97 | if (lock_battery_dir_cnt == 0 && acpi_battery_dir_param | ||
| 98 | && acpi_battery_dir) { | ||
| 99 | remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root_dir); | ||
| 100 | acpi_battery_dir = NULL; | ||
| 101 | } | ||
| 102 | mutex_unlock(&cm_sbs_mutex); | ||
| 103 | return; | ||
| 104 | } | ||
| 105 | EXPORT_SYMBOL(acpi_unlock_battery_dir); | ||
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 59d3202f6b36..d42b2fb5a7e9 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c | |||
| @@ -118,9 +118,10 @@ int acpi_device_get_power(struct acpi_device *device, int *state) | |||
| 118 | /* | 118 | /* |
| 119 | * If we were unsure about the device parent's power state up to this | 119 | * If we were unsure about the device parent's power state up to this |
| 120 | * point, the fact that the device is in D0 implies that the parent has | 120 | * point, the fact that the device is in D0 implies that the parent has |
| 121 | * to be in D0 too. | 121 | * to be in D0 too, except if ignore_parent is set. |
| 122 | */ | 122 | */ |
| 123 | if (device->parent && device->parent->power.state == ACPI_STATE_UNKNOWN | 123 | if (!device->power.flags.ignore_parent && device->parent |
| 124 | && device->parent->power.state == ACPI_STATE_UNKNOWN | ||
| 124 | && result == ACPI_STATE_D0) | 125 | && result == ACPI_STATE_D0) |
| 125 | device->parent->power.state = ACPI_STATE_D0; | 126 | device->parent->power.state = ACPI_STATE_D0; |
| 126 | 127 | ||
| @@ -177,7 +178,8 @@ int acpi_device_set_power(struct acpi_device *device, int state) | |||
| 177 | acpi_power_state_string(state)); | 178 | acpi_power_state_string(state)); |
| 178 | return -ENODEV; | 179 | return -ENODEV; |
| 179 | } | 180 | } |
| 180 | if (device->parent && (state < device->parent->power.state)) { | 181 | if (!device->power.flags.ignore_parent && |
| 182 | device->parent && (state < device->parent->power.state)) { | ||
| 181 | dev_warn(&device->dev, | 183 | dev_warn(&device->dev, |
| 182 | "Cannot transition to power state %s for parent in %s\n", | 184 | "Cannot transition to power state %s for parent in %s\n", |
| 183 | acpi_power_state_string(state), | 185 | acpi_power_state_string(state), |
| @@ -1025,60 +1027,4 @@ void acpi_dev_pm_detach(struct device *dev, bool power_off) | |||
| 1025 | } | 1027 | } |
| 1026 | } | 1028 | } |
| 1027 | EXPORT_SYMBOL_GPL(acpi_dev_pm_detach); | 1029 | EXPORT_SYMBOL_GPL(acpi_dev_pm_detach); |
| 1028 | |||
| 1029 | /** | ||
| 1030 | * acpi_dev_pm_add_dependent - Add physical device depending for PM. | ||
| 1031 | * @handle: Handle of ACPI device node. | ||
| 1032 | * @depdev: Device depending on that node for PM. | ||
| 1033 | */ | ||
| 1034 | void acpi_dev_pm_add_dependent(acpi_handle handle, struct device *depdev) | ||
| 1035 | { | ||
| 1036 | struct acpi_device_physical_node *dep; | ||
| 1037 | struct acpi_device *adev; | ||
| 1038 | |||
| 1039 | if (!depdev || acpi_bus_get_device(handle, &adev)) | ||
| 1040 | return; | ||
| 1041 | |||
| 1042 | mutex_lock(&adev->physical_node_lock); | ||
| 1043 | |||
| 1044 | list_for_each_entry(dep, &adev->power_dependent, node) | ||
| 1045 | if (dep->dev == depdev) | ||
| 1046 | goto out; | ||
| 1047 | |||
| 1048 | dep = kzalloc(sizeof(*dep), GFP_KERNEL); | ||
| 1049 | if (dep) { | ||
| 1050 | dep->dev = depdev; | ||
| 1051 | list_add_tail(&dep->node, &adev->power_dependent); | ||
| 1052 | } | ||
| 1053 | |||
| 1054 | out: | ||
| 1055 | mutex_unlock(&adev->physical_node_lock); | ||
| 1056 | } | ||
| 1057 | EXPORT_SYMBOL_GPL(acpi_dev_pm_add_dependent); | ||
| 1058 | |||
| 1059 | /** | ||
| 1060 | * acpi_dev_pm_remove_dependent - Remove physical device depending for PM. | ||
| 1061 | * @handle: Handle of ACPI device node. | ||
| 1062 | * @depdev: Device depending on that node for PM. | ||
| 1063 | */ | ||
| 1064 | void acpi_dev_pm_remove_dependent(acpi_handle handle, struct device *depdev) | ||
| 1065 | { | ||
| 1066 | struct acpi_device_physical_node *dep; | ||
| 1067 | struct acpi_device *adev; | ||
| 1068 | |||
| 1069 | if (!depdev || acpi_bus_get_device(handle, &adev)) | ||
| 1070 | return; | ||
| 1071 | |||
| 1072 | mutex_lock(&adev->physical_node_lock); | ||
| 1073 | |||
| 1074 | list_for_each_entry(dep, &adev->power_dependent, node) | ||
| 1075 | if (dep->dev == depdev) { | ||
| 1076 | list_del(&dep->node); | ||
| 1077 | kfree(dep); | ||
| 1078 | break; | ||
| 1079 | } | ||
| 1080 | |||
| 1081 | mutex_unlock(&adev->physical_node_lock); | ||
| 1082 | } | ||
| 1083 | EXPORT_SYMBOL_GPL(acpi_dev_pm_remove_dependent); | ||
| 1084 | #endif /* CONFIG_PM */ | 1030 | #endif /* CONFIG_PM */ |
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 05ea4be01a83..ca86c1ce7c8a 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
| @@ -441,7 +441,7 @@ static void handle_dock(struct dock_station *ds, int dock) | |||
| 441 | acpi_status status; | 441 | acpi_status status; |
| 442 | struct acpi_object_list arg_list; | 442 | struct acpi_object_list arg_list; |
| 443 | union acpi_object arg; | 443 | union acpi_object arg; |
| 444 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | 444 | unsigned long long value; |
| 445 | 445 | ||
| 446 | acpi_handle_info(ds->handle, "%s\n", dock ? "docking" : "undocking"); | 446 | acpi_handle_info(ds->handle, "%s\n", dock ? "docking" : "undocking"); |
| 447 | 447 | ||
| @@ -450,12 +450,10 @@ static void handle_dock(struct dock_station *ds, int dock) | |||
| 450 | arg_list.pointer = &arg; | 450 | arg_list.pointer = &arg; |
| 451 | arg.type = ACPI_TYPE_INTEGER; | 451 | arg.type = ACPI_TYPE_INTEGER; |
| 452 | arg.integer.value = dock; | 452 | arg.integer.value = dock; |
| 453 | status = acpi_evaluate_object(ds->handle, "_DCK", &arg_list, &buffer); | 453 | status = acpi_evaluate_integer(ds->handle, "_DCK", &arg_list, &value); |
| 454 | if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) | 454 | if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) |
| 455 | acpi_handle_err(ds->handle, "Failed to execute _DCK (0x%x)\n", | 455 | acpi_handle_err(ds->handle, "Failed to execute _DCK (0x%x)\n", |
| 456 | status); | 456 | status); |
| 457 | |||
| 458 | kfree(buffer.pointer); | ||
| 459 | } | 457 | } |
| 460 | 458 | ||
| 461 | static inline void dock(struct dock_station *ds) | 459 | static inline void dock(struct dock_station *ds) |
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 41ade6570bc0..ba3da88cee45 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c | |||
| @@ -168,7 +168,7 @@ static int acpi_fan_add(struct acpi_device *device) | |||
| 168 | acpi_device_name(device), acpi_device_bid(device), | 168 | acpi_device_name(device), acpi_device_bid(device), |
| 169 | !device->power.state ? "on" : "off"); | 169 | !device->power.state ? "on" : "off"); |
| 170 | 170 | ||
| 171 | end: | 171 | end: |
| 172 | return result; | 172 | return result; |
| 173 | } | 173 | } |
| 174 | 174 | ||
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 2e82e5d76930..a2343a1d9e0b 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c | |||
| @@ -73,7 +73,7 @@ int acpi_map_pxm_to_node(int pxm) | |||
| 73 | { | 73 | { |
| 74 | int node = pxm_to_node_map[pxm]; | 74 | int node = pxm_to_node_map[pxm]; |
| 75 | 75 | ||
| 76 | if (node < 0) { | 76 | if (node == NUMA_NO_NODE) { |
| 77 | if (nodes_weight(nodes_found_map) >= MAX_NUMNODES) | 77 | if (nodes_weight(nodes_found_map) >= MAX_NUMNODES) |
| 78 | return NUMA_NO_NODE; | 78 | return NUMA_NO_NODE; |
| 79 | node = first_unset_node(nodes_found_map); | 79 | node = first_unset_node(nodes_found_map); |
| @@ -334,7 +334,7 @@ int acpi_get_pxm(acpi_handle h) | |||
| 334 | 334 | ||
| 335 | int acpi_get_node(acpi_handle *handle) | 335 | int acpi_get_node(acpi_handle *handle) |
| 336 | { | 336 | { |
| 337 | int pxm, node = -1; | 337 | int pxm, node = NUMA_NO_NODE; |
| 338 | 338 | ||
| 339 | pxm = acpi_get_pxm(handle); | 339 | pxm = acpi_get_pxm(handle); |
| 340 | if (pxm >= 0 && pxm < MAX_PXM_DOMAINS) | 340 | if (pxm >= 0 && pxm < MAX_PXM_DOMAINS) |
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 4923dd4232b3..a0c09adf7e7d 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -569,8 +569,10 @@ static const char * const table_sigs[] = { | |||
| 569 | 569 | ||
| 570 | #define ACPI_HEADER_SIZE sizeof(struct acpi_table_header) | 570 | #define ACPI_HEADER_SIZE sizeof(struct acpi_table_header) |
| 571 | 571 | ||
| 572 | /* Must not increase 10 or needs code modification below */ | 572 | #define ACPI_OVERRIDE_TABLES 64 |
| 573 | #define ACPI_OVERRIDE_TABLES 10 | 573 | static struct cpio_data __initdata acpi_initrd_files[ACPI_OVERRIDE_TABLES]; |
| 574 | |||
| 575 | #define MAP_CHUNK_SIZE (NR_FIX_BTMAPS << PAGE_SHIFT) | ||
| 574 | 576 | ||
| 575 | void __init acpi_initrd_override(void *data, size_t size) | 577 | void __init acpi_initrd_override(void *data, size_t size) |
| 576 | { | 578 | { |
| @@ -579,8 +581,6 @@ void __init acpi_initrd_override(void *data, size_t size) | |||
| 579 | struct acpi_table_header *table; | 581 | struct acpi_table_header *table; |
| 580 | char cpio_path[32] = "kernel/firmware/acpi/"; | 582 | char cpio_path[32] = "kernel/firmware/acpi/"; |
| 581 | struct cpio_data file; | 583 | struct cpio_data file; |
| 582 | struct cpio_data early_initrd_files[ACPI_OVERRIDE_TABLES]; | ||
| 583 | char *p; | ||
| 584 | 584 | ||
| 585 | if (data == NULL || size == 0) | 585 | if (data == NULL || size == 0) |
| 586 | return; | 586 | return; |
| @@ -625,8 +625,8 @@ void __init acpi_initrd_override(void *data, size_t size) | |||
| 625 | table->signature, cpio_path, file.name, table->length); | 625 | table->signature, cpio_path, file.name, table->length); |
| 626 | 626 | ||
| 627 | all_tables_size += table->length; | 627 | all_tables_size += table->length; |
| 628 | early_initrd_files[table_nr].data = file.data; | 628 | acpi_initrd_files[table_nr].data = file.data; |
| 629 | early_initrd_files[table_nr].size = file.size; | 629 | acpi_initrd_files[table_nr].size = file.size; |
| 630 | table_nr++; | 630 | table_nr++; |
| 631 | } | 631 | } |
| 632 | if (table_nr == 0) | 632 | if (table_nr == 0) |
| @@ -652,14 +652,34 @@ void __init acpi_initrd_override(void *data, size_t size) | |||
| 652 | memblock_reserve(acpi_tables_addr, all_tables_size); | 652 | memblock_reserve(acpi_tables_addr, all_tables_size); |
| 653 | arch_reserve_mem_area(acpi_tables_addr, all_tables_size); | 653 | arch_reserve_mem_area(acpi_tables_addr, all_tables_size); |
| 654 | 654 | ||
| 655 | p = early_ioremap(acpi_tables_addr, all_tables_size); | 655 | /* |
| 656 | 656 | * early_ioremap only can remap 256k one time. If we map all | |
| 657 | * tables one time, we will hit the limit. Need to map chunks | ||
| 658 | * one by one during copying the same as that in relocate_initrd(). | ||
| 659 | */ | ||
| 657 | for (no = 0; no < table_nr; no++) { | 660 | for (no = 0; no < table_nr; no++) { |
| 658 | memcpy(p + total_offset, early_initrd_files[no].data, | 661 | unsigned char *src_p = acpi_initrd_files[no].data; |
| 659 | early_initrd_files[no].size); | 662 | phys_addr_t size = acpi_initrd_files[no].size; |
| 660 | total_offset += early_initrd_files[no].size; | 663 | phys_addr_t dest_addr = acpi_tables_addr + total_offset; |
| 664 | phys_addr_t slop, clen; | ||
| 665 | char *dest_p; | ||
| 666 | |||
| 667 | total_offset += size; | ||
| 668 | |||
| 669 | while (size) { | ||
| 670 | slop = dest_addr & ~PAGE_MASK; | ||
| 671 | clen = size; | ||
| 672 | if (clen > MAP_CHUNK_SIZE - slop) | ||
| 673 | clen = MAP_CHUNK_SIZE - slop; | ||
| 674 | dest_p = early_ioremap(dest_addr & PAGE_MASK, | ||
| 675 | clen + slop); | ||
| 676 | memcpy(dest_p + slop, src_p, clen); | ||
| 677 | early_iounmap(dest_p, clen + slop); | ||
| 678 | src_p += clen; | ||
| 679 | dest_addr += clen; | ||
| 680 | size -= clen; | ||
| 681 | } | ||
| 661 | } | 682 | } |
| 662 | early_iounmap(p, all_tables_size); | ||
| 663 | } | 683 | } |
| 664 | #endif /* CONFIG_ACPI_INITRD_TABLE_OVERRIDE */ | 684 | #endif /* CONFIG_ACPI_INITRD_TABLE_OVERRIDE */ |
| 665 | 685 | ||
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 0dbe5cdf3396..c2ad391d8041 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c | |||
| @@ -59,16 +59,9 @@ ACPI_MODULE_NAME("power"); | |||
| 59 | #define ACPI_POWER_RESOURCE_STATE_ON 0x01 | 59 | #define ACPI_POWER_RESOURCE_STATE_ON 0x01 |
| 60 | #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF | 60 | #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF |
| 61 | 61 | ||
| 62 | struct acpi_power_dependent_device { | ||
| 63 | struct list_head node; | ||
| 64 | struct acpi_device *adev; | ||
| 65 | struct work_struct work; | ||
| 66 | }; | ||
| 67 | |||
| 68 | struct acpi_power_resource { | 62 | struct acpi_power_resource { |
| 69 | struct acpi_device device; | 63 | struct acpi_device device; |
| 70 | struct list_head list_node; | 64 | struct list_head list_node; |
| 71 | struct list_head dependent; | ||
| 72 | char *name; | 65 | char *name; |
| 73 | u32 system_level; | 66 | u32 system_level; |
| 74 | u32 order; | 67 | u32 order; |
| @@ -233,32 +226,6 @@ static int acpi_power_get_list_state(struct list_head *list, int *state) | |||
| 233 | return 0; | 226 | return 0; |
| 234 | } | 227 | } |
| 235 | 228 | ||
| 236 | static void acpi_power_resume_dependent(struct work_struct *work) | ||
| 237 | { | ||
| 238 | struct acpi_power_dependent_device *dep; | ||
| 239 | struct acpi_device_physical_node *pn; | ||
| 240 | struct acpi_device *adev; | ||
| 241 | int state; | ||
| 242 | |||
| 243 | dep = container_of(work, struct acpi_power_dependent_device, work); | ||
| 244 | adev = dep->adev; | ||
| 245 | if (acpi_power_get_inferred_state(adev, &state)) | ||
| 246 | return; | ||
| 247 | |||
| 248 | if (state > ACPI_STATE_D0) | ||
| 249 | return; | ||
| 250 | |||
| 251 | mutex_lock(&adev->physical_node_lock); | ||
| 252 | |||
| 253 | list_for_each_entry(pn, &adev->physical_node_list, node) | ||
| 254 | pm_request_resume(pn->dev); | ||
| 255 | |||
| 256 | list_for_each_entry(pn, &adev->power_dependent, node) | ||
| 257 | pm_request_resume(pn->dev); | ||
| 258 | |||
| 259 | mutex_unlock(&adev->physical_node_lock); | ||
| 260 | } | ||
| 261 | |||
| 262 | static int __acpi_power_on(struct acpi_power_resource *resource) | 229 | static int __acpi_power_on(struct acpi_power_resource *resource) |
| 263 | { | 230 | { |
| 264 | acpi_status status = AE_OK; | 231 | acpi_status status = AE_OK; |
| @@ -283,14 +250,8 @@ static int acpi_power_on_unlocked(struct acpi_power_resource *resource) | |||
| 283 | resource->name)); | 250 | resource->name)); |
| 284 | } else { | 251 | } else { |
| 285 | result = __acpi_power_on(resource); | 252 | result = __acpi_power_on(resource); |
| 286 | if (result) { | 253 | if (result) |
| 287 | resource->ref_count--; | 254 | resource->ref_count--; |
| 288 | } else { | ||
| 289 | struct acpi_power_dependent_device *dep; | ||
| 290 | |||
| 291 | list_for_each_entry(dep, &resource->dependent, node) | ||
| 292 | schedule_work(&dep->work); | ||
| 293 | } | ||
| 294 | } | 255 | } |
| 295 | return result; | 256 | return result; |
| 296 | } | 257 | } |
| @@ -390,52 +351,6 @@ static int acpi_power_on_list(struct list_head *list) | |||
| 390 | return result; | 351 | return result; |
| 391 | } | 352 | } |
| 392 | 353 | ||
| 393 | static void acpi_power_add_dependent(struct acpi_power_resource *resource, | ||
| 394 | struct acpi_device *adev) | ||
| 395 | { | ||
| 396 | struct acpi_power_dependent_device *dep; | ||
| 397 | |||
| 398 | mutex_lock(&resource->resource_lock); | ||
| 399 | |||
| 400 | list_for_each_entry(dep, &resource->dependent, node) | ||
| 401 | if (dep->adev == adev) | ||
| 402 | goto out; | ||
| 403 | |||
| 404 | dep = kzalloc(sizeof(*dep), GFP_KERNEL); | ||
| 405 | if (!dep) | ||
| 406 | goto out; | ||
| 407 | |||
| 408 | dep->adev = adev; | ||
| 409 | INIT_WORK(&dep->work, acpi_power_resume_dependent); | ||
| 410 | list_add_tail(&dep->node, &resource->dependent); | ||
| 411 | |||
| 412 | out: | ||
| 413 | mutex_unlock(&resource->resource_lock); | ||
| 414 | } | ||
| 415 | |||
| 416 | static void acpi_power_remove_dependent(struct acpi_power_resource *resource, | ||
| 417 | struct acpi_device *adev) | ||
| 418 | { | ||
| 419 | struct acpi_power_dependent_device *dep; | ||
| 420 | struct work_struct *work = NULL; | ||
| 421 | |||
| 422 | mutex_lock(&resource->resource_lock); | ||
| 423 | |||
| 424 | list_for_each_entry(dep, &resource->dependent, node) | ||
| 425 | if (dep->adev == adev) { | ||
| 426 | list_del(&dep->node); | ||
| 427 | work = &dep->work; | ||
| 428 | break; | ||
| 429 | } | ||
| 430 | |||
| 431 | mutex_unlock(&resource->resource_lock); | ||
| 432 | |||
| 433 | if (work) { | ||
| 434 | cancel_work_sync(work); | ||
| 435 | kfree(dep); | ||
| 436 | } | ||
| 437 | } | ||
| 438 | |||
| 439 | static struct attribute *attrs[] = { | 354 | static struct attribute *attrs[] = { |
| 440 | NULL, | 355 | NULL, |
| 441 | }; | 356 | }; |
| @@ -524,8 +439,6 @@ static void acpi_power_expose_hide(struct acpi_device *adev, | |||
| 524 | 439 | ||
| 525 | void acpi_power_add_remove_device(struct acpi_device *adev, bool add) | 440 | void acpi_power_add_remove_device(struct acpi_device *adev, bool add) |
| 526 | { | 441 | { |
| 527 | struct acpi_device_power_state *ps; | ||
| 528 | struct acpi_power_resource_entry *entry; | ||
| 529 | int state; | 442 | int state; |
| 530 | 443 | ||
| 531 | if (adev->wakeup.flags.valid) | 444 | if (adev->wakeup.flags.valid) |
| @@ -535,16 +448,6 @@ void acpi_power_add_remove_device(struct acpi_device *adev, bool add) | |||
| 535 | if (!adev->power.flags.power_resources) | 448 | if (!adev->power.flags.power_resources) |
| 536 | return; | 449 | return; |
| 537 | 450 | ||
| 538 | ps = &adev->power.states[ACPI_STATE_D0]; | ||
| 539 | list_for_each_entry(entry, &ps->resources, node) { | ||
| 540 | struct acpi_power_resource *resource = entry->resource; | ||
| 541 | |||
| 542 | if (add) | ||
| 543 | acpi_power_add_dependent(resource, adev); | ||
| 544 | else | ||
| 545 | acpi_power_remove_dependent(resource, adev); | ||
| 546 | } | ||
| 547 | |||
| 548 | for (state = ACPI_STATE_D0; state <= ACPI_STATE_D3_HOT; state++) | 451 | for (state = ACPI_STATE_D0; state <= ACPI_STATE_D3_HOT; state++) |
| 549 | acpi_power_expose_hide(adev, | 452 | acpi_power_expose_hide(adev, |
| 550 | &adev->power.states[state].resources, | 453 | &adev->power.states[state].resources, |
| @@ -882,7 +785,6 @@ int acpi_add_power_resource(acpi_handle handle) | |||
| 882 | acpi_init_device_object(device, handle, ACPI_BUS_TYPE_POWER, | 785 | acpi_init_device_object(device, handle, ACPI_BUS_TYPE_POWER, |
| 883 | ACPI_STA_DEFAULT); | 786 | ACPI_STA_DEFAULT); |
| 884 | mutex_init(&resource->resource_lock); | 787 | mutex_init(&resource->resource_lock); |
| 885 | INIT_LIST_HEAD(&resource->dependent); | ||
| 886 | INIT_LIST_HEAD(&resource->list_node); | 788 | INIT_LIST_HEAD(&resource->list_node); |
| 887 | resource->name = device->pnp.bus_id; | 789 | resource->name = device->pnp.bus_id; |
| 888 | strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME); | 790 | strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME); |
| @@ -936,8 +838,10 @@ void acpi_resume_power_resources(void) | |||
| 936 | mutex_lock(&resource->resource_lock); | 838 | mutex_lock(&resource->resource_lock); |
| 937 | 839 | ||
| 938 | result = acpi_power_get_state(resource->device.handle, &state); | 840 | result = acpi_power_get_state(resource->device.handle, &state); |
| 939 | if (result) | 841 | if (result) { |
| 842 | mutex_unlock(&resource->resource_lock); | ||
| 940 | continue; | 843 | continue; |
| 844 | } | ||
| 941 | 845 | ||
| 942 | if (state == ACPI_POWER_RESOURCE_STATE_OFF | 846 | if (state == ACPI_POWER_RESOURCE_STATE_OFF |
| 943 | && resource->ref_count) { | 847 | && resource->ref_count) { |
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index 04a13784dd20..6a5b152ad4d0 100644 --- a/drivers/acpi/proc.c +++ b/drivers/acpi/proc.c | |||
| @@ -8,289 +8,17 @@ | |||
| 8 | #include <acpi/acpi_bus.h> | 8 | #include <acpi/acpi_bus.h> |
| 9 | #include <acpi/acpi_drivers.h> | 9 | #include <acpi/acpi_drivers.h> |
| 10 | 10 | ||
| 11 | #ifdef CONFIG_X86 | ||
| 12 | #include <linux/mc146818rtc.h> | ||
| 13 | #endif | ||
| 14 | |||
| 15 | #include "sleep.h" | 11 | #include "sleep.h" |
| 16 | 12 | ||
| 17 | #define _COMPONENT ACPI_SYSTEM_COMPONENT | 13 | #define _COMPONENT ACPI_SYSTEM_COMPONENT |
| 18 | 14 | ||
| 19 | /* | 15 | /* |
| 20 | * this file provides support for: | 16 | * this file provides support for: |
| 21 | * /proc/acpi/alarm | ||
| 22 | * /proc/acpi/wakeup | 17 | * /proc/acpi/wakeup |
| 23 | */ | 18 | */ |
| 24 | 19 | ||
| 25 | ACPI_MODULE_NAME("sleep") | 20 | ACPI_MODULE_NAME("sleep") |
| 26 | 21 | ||
| 27 | #if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || !defined(CONFIG_X86) | ||
| 28 | /* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */ | ||
| 29 | #else | ||
| 30 | #define HAVE_ACPI_LEGACY_ALARM | ||
| 31 | #endif | ||
| 32 | |||
| 33 | #ifdef HAVE_ACPI_LEGACY_ALARM | ||
| 34 | |||
| 35 | static u32 cmos_bcd_read(int offset, int rtc_control); | ||
| 36 | |||
| 37 | static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset) | ||
| 38 | { | ||
| 39 | u32 sec, min, hr; | ||
| 40 | u32 day, mo, yr, cent = 0; | ||
| 41 | u32 today = 0; | ||
| 42 | unsigned char rtc_control = 0; | ||
| 43 | unsigned long flags; | ||
| 44 | |||
| 45 | spin_lock_irqsave(&rtc_lock, flags); | ||
| 46 | |||
| 47 | rtc_control = CMOS_READ(RTC_CONTROL); | ||
| 48 | sec = cmos_bcd_read(RTC_SECONDS_ALARM, rtc_control); | ||
| 49 | min = cmos_bcd_read(RTC_MINUTES_ALARM, rtc_control); | ||
| 50 | hr = cmos_bcd_read(RTC_HOURS_ALARM, rtc_control); | ||
| 51 | |||
| 52 | /* If we ever get an FACP with proper values... */ | ||
| 53 | if (acpi_gbl_FADT.day_alarm) { | ||
| 54 | /* ACPI spec: only low 6 its should be cared */ | ||
| 55 | day = CMOS_READ(acpi_gbl_FADT.day_alarm) & 0x3F; | ||
| 56 | if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) | ||
| 57 | day = bcd2bin(day); | ||
| 58 | } else | ||
| 59 | day = cmos_bcd_read(RTC_DAY_OF_MONTH, rtc_control); | ||
| 60 | if (acpi_gbl_FADT.month_alarm) | ||
| 61 | mo = cmos_bcd_read(acpi_gbl_FADT.month_alarm, rtc_control); | ||
| 62 | else { | ||
| 63 | mo = cmos_bcd_read(RTC_MONTH, rtc_control); | ||
| 64 | today = cmos_bcd_read(RTC_DAY_OF_MONTH, rtc_control); | ||
| 65 | } | ||
| 66 | if (acpi_gbl_FADT.century) | ||
| 67 | cent = cmos_bcd_read(acpi_gbl_FADT.century, rtc_control); | ||
| 68 | |||
| 69 | yr = cmos_bcd_read(RTC_YEAR, rtc_control); | ||
| 70 | |||
| 71 | spin_unlock_irqrestore(&rtc_lock, flags); | ||
| 72 | |||
| 73 | /* we're trusting the FADT (see above) */ | ||
| 74 | if (!acpi_gbl_FADT.century) | ||
| 75 | /* If we're not trusting the FADT, we should at least make it | ||
| 76 | * right for _this_ century... ehm, what is _this_ century? | ||
| 77 | * | ||
| 78 | * TBD: | ||
| 79 | * ASAP: find piece of code in the kernel, e.g. star tracker driver, | ||
| 80 | * which we can trust to determine the century correctly. Atom | ||
| 81 | * watch driver would be nice, too... | ||
| 82 | * | ||
| 83 | * if that has not happened, change for first release in 2050: | ||
| 84 | * if (yr<50) | ||
| 85 | * yr += 2100; | ||
| 86 | * else | ||
| 87 | * yr += 2000; // current line of code | ||
| 88 | * | ||
| 89 | * if that has not happened either, please do on 2099/12/31:23:59:59 | ||
| 90 | * s/2000/2100 | ||
| 91 | * | ||
| 92 | */ | ||
| 93 | yr += 2000; | ||
| 94 | else | ||
| 95 | yr += cent * 100; | ||
| 96 | |||
| 97 | /* | ||
| 98 | * Show correct dates for alarms up to a month into the future. | ||
| 99 | * This solves issues for nearly all situations with the common | ||
| 100 | * 30-day alarm clocks in PC hardware. | ||
| 101 | */ | ||
| 102 | if (day < today) { | ||
| 103 | if (mo < 12) { | ||
| 104 | mo += 1; | ||
| 105 | } else { | ||
| 106 | mo = 1; | ||
| 107 | yr += 1; | ||
| 108 | } | ||
| 109 | } | ||
| 110 | |||
| 111 | seq_printf(seq, "%4.4u-", yr); | ||
| 112 | (mo > 12) ? seq_puts(seq, "**-") : seq_printf(seq, "%2.2u-", mo); | ||
| 113 | (day > 31) ? seq_puts(seq, "** ") : seq_printf(seq, "%2.2u ", day); | ||
| 114 | (hr > 23) ? seq_puts(seq, "**:") : seq_printf(seq, "%2.2u:", hr); | ||
| 115 | (min > 59) ? seq_puts(seq, "**:") : seq_printf(seq, "%2.2u:", min); | ||
| 116 | (sec > 59) ? seq_puts(seq, "**\n") : seq_printf(seq, "%2.2u\n", sec); | ||
| 117 | |||
| 118 | return 0; | ||
| 119 | } | ||
| 120 | |||
| 121 | static int acpi_system_alarm_open_fs(struct inode *inode, struct file *file) | ||
| 122 | { | ||
| 123 | return single_open(file, acpi_system_alarm_seq_show, PDE_DATA(inode)); | ||
| 124 | } | ||
| 125 | |||
| 126 | static int get_date_field(char **p, u32 * value) | ||
| 127 | { | ||
| 128 | char *next = NULL; | ||
| 129 | char *string_end = NULL; | ||
| 130 | int result = -EINVAL; | ||
| 131 | |||
| 132 | /* | ||
| 133 | * Try to find delimeter, only to insert null. The end of the | ||
| 134 | * string won't have one, but is still valid. | ||
| 135 | */ | ||
| 136 | if (*p == NULL) | ||
| 137 | return result; | ||
| 138 | |||
| 139 | next = strpbrk(*p, "- :"); | ||
| 140 | if (next) | ||
| 141 | *next++ = '\0'; | ||
| 142 | |||
| 143 | *value = simple_strtoul(*p, &string_end, 10); | ||
| 144 | |||
| 145 | /* Signal success if we got a good digit */ | ||
| 146 | if (string_end != *p) | ||
| 147 | result = 0; | ||
| 148 | |||
| 149 | if (next) | ||
| 150 | *p = next; | ||
| 151 | else | ||
| 152 | *p = NULL; | ||
| 153 | |||
| 154 | return result; | ||
| 155 | } | ||
| 156 | |||
| 157 | /* Read a possibly BCD register, always return binary */ | ||
| 158 | static u32 cmos_bcd_read(int offset, int rtc_control) | ||
| 159 | { | ||
| 160 | u32 val = CMOS_READ(offset); | ||
| 161 | if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) | ||
| 162 | val = bcd2bin(val); | ||
| 163 | return val; | ||
| 164 | } | ||
| 165 | |||
| 166 | /* Write binary value into possibly BCD register */ | ||
| 167 | static void cmos_bcd_write(u32 val, int offset, int rtc_control) | ||
| 168 | { | ||
| 169 | if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) | ||
| 170 | val = bin2bcd(val); | ||
| 171 | CMOS_WRITE(val, offset); | ||
| 172 | } | ||
| 173 | |||
| 174 | static ssize_t | ||
| 175 | acpi_system_write_alarm(struct file *file, | ||
| 176 | const char __user * buffer, size_t count, loff_t * ppos) | ||
| 177 | { | ||
| 178 | int result = 0; | ||
| 179 | char alarm_string[30] = { '\0' }; | ||
| 180 | char *p = alarm_string; | ||
| 181 | u32 sec, min, hr, day, mo, yr; | ||
| 182 | int adjust = 0; | ||
| 183 | unsigned char rtc_control = 0; | ||
| 184 | |||
| 185 | if (count > sizeof(alarm_string) - 1) | ||
| 186 | return -EINVAL; | ||
| 187 | |||
| 188 | if (copy_from_user(alarm_string, buffer, count)) | ||
| 189 | return -EFAULT; | ||
| 190 | |||
| 191 | alarm_string[count] = '\0'; | ||
| 192 | |||
| 193 | /* check for time adjustment */ | ||
| 194 | if (alarm_string[0] == '+') { | ||
| 195 | p++; | ||
| 196 | adjust = 1; | ||
| 197 | } | ||
| 198 | |||
| 199 | if ((result = get_date_field(&p, &yr))) | ||
| 200 | goto end; | ||
| 201 | if ((result = get_date_field(&p, &mo))) | ||
| 202 | goto end; | ||
| 203 | if ((result = get_date_field(&p, &day))) | ||
| 204 | goto end; | ||
| 205 | if ((result = get_date_field(&p, &hr))) | ||
| 206 | goto end; | ||
| 207 | if ((result = get_date_field(&p, &min))) | ||
| 208 | goto end; | ||
| 209 | if ((result = get_date_field(&p, &sec))) | ||
| 210 | goto end; | ||
| 211 | |||
| 212 | spin_lock_irq(&rtc_lock); | ||
| 213 | |||
| 214 | rtc_control = CMOS_READ(RTC_CONTROL); | ||
| 215 | |||
| 216 | if (adjust) { | ||
| 217 | yr += cmos_bcd_read(RTC_YEAR, rtc_control); | ||
| 218 | mo += cmos_bcd_read(RTC_MONTH, rtc_control); | ||
| 219 | day += cmos_bcd_read(RTC_DAY_OF_MONTH, rtc_control); | ||
| 220 | hr += cmos_bcd_read(RTC_HOURS, rtc_control); | ||
| 221 | min += cmos_bcd_read(RTC_MINUTES, rtc_control); | ||
| 222 | sec += cmos_bcd_read(RTC_SECONDS, rtc_control); | ||
| 223 | } | ||
| 224 | |||
| 225 | spin_unlock_irq(&rtc_lock); | ||
| 226 | |||
| 227 | if (sec > 59) { | ||
| 228 | min += sec/60; | ||
| 229 | sec = sec%60; | ||
| 230 | } | ||
| 231 | if (min > 59) { | ||
| 232 | hr += min/60; | ||
| 233 | min = min%60; | ||
| 234 | } | ||
| 235 | if (hr > 23) { | ||
| 236 | day += hr/24; | ||
| 237 | hr = hr%24; | ||
| 238 | } | ||
| 239 | if (day > 31) { | ||
| 240 | mo += day/32; | ||
| 241 | day = day%32; | ||
| 242 | } | ||
| 243 | if (mo > 12) { | ||
| 244 | yr += mo/13; | ||
| 245 | mo = mo%13; | ||
| 246 | } | ||
| 247 | |||
| 248 | spin_lock_irq(&rtc_lock); | ||
| 249 | /* | ||
| 250 | * Disable alarm interrupt before setting alarm timer or else | ||
| 251 | * when ACPI_EVENT_RTC is enabled, a spurious ACPI interrupt occurs | ||
| 252 | */ | ||
| 253 | rtc_control &= ~RTC_AIE; | ||
| 254 | CMOS_WRITE(rtc_control, RTC_CONTROL); | ||
| 255 | CMOS_READ(RTC_INTR_FLAGS); | ||
| 256 | |||
| 257 | /* write the fields the rtc knows about */ | ||
| 258 | cmos_bcd_write(hr, RTC_HOURS_ALARM, rtc_control); | ||
| 259 | cmos_bcd_write(min, RTC_MINUTES_ALARM, rtc_control); | ||
| 260 | cmos_bcd_write(sec, RTC_SECONDS_ALARM, rtc_control); | ||
| 261 | |||
| 262 | /* | ||
| 263 | * If the system supports an enhanced alarm it will have non-zero | ||
| 264 | * offsets into the CMOS RAM here -- which for some reason are pointing | ||
| 265 | * to the RTC area of memory. | ||
| 266 | */ | ||
| 267 | if (acpi_gbl_FADT.day_alarm) | ||
| 268 | cmos_bcd_write(day, acpi_gbl_FADT.day_alarm, rtc_control); | ||
| 269 | if (acpi_gbl_FADT.month_alarm) | ||
| 270 | cmos_bcd_write(mo, acpi_gbl_FADT.month_alarm, rtc_control); | ||
| 271 | if (acpi_gbl_FADT.century) { | ||
| 272 | if (adjust) | ||
| 273 | yr += cmos_bcd_read(acpi_gbl_FADT.century, rtc_control) * 100; | ||
| 274 | cmos_bcd_write(yr / 100, acpi_gbl_FADT.century, rtc_control); | ||
| 275 | } | ||
| 276 | /* enable the rtc alarm interrupt */ | ||
| 277 | rtc_control |= RTC_AIE; | ||
| 278 | CMOS_WRITE(rtc_control, RTC_CONTROL); | ||
| 279 | CMOS_READ(RTC_INTR_FLAGS); | ||
| 280 | |||
| 281 | spin_unlock_irq(&rtc_lock); | ||
| 282 | |||
| 283 | acpi_clear_event(ACPI_EVENT_RTC); | ||
| 284 | acpi_enable_event(ACPI_EVENT_RTC, 0); | ||
| 285 | |||
| 286 | *ppos += count; | ||
| 287 | |||
| 288 | result = 0; | ||
| 289 | end: | ||
| 290 | return result ? result : count; | ||
| 291 | } | ||
| 292 | #endif /* HAVE_ACPI_LEGACY_ALARM */ | ||
| 293 | |||
| 294 | static int | 22 | static int |
| 295 | acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset) | 23 | acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset) |
| 296 | { | 24 | { |
| @@ -417,41 +145,8 @@ static const struct file_operations acpi_system_wakeup_device_fops = { | |||
| 417 | .release = single_release, | 145 | .release = single_release, |
| 418 | }; | 146 | }; |
| 419 | 147 | ||
| 420 | #ifdef HAVE_ACPI_LEGACY_ALARM | ||
| 421 | static const struct file_operations acpi_system_alarm_fops = { | ||
| 422 | .owner = THIS_MODULE, | ||
| 423 | .open = acpi_system_alarm_open_fs, | ||
| 424 | .read = seq_read, | ||
| 425 | .write = acpi_system_write_alarm, | ||
| 426 | .llseek = seq_lseek, | ||
| 427 | .release = single_release, | ||
| 428 | }; | ||
| 429 | |||
| 430 | static u32 rtc_handler(void *context) | ||
| 431 | { | ||
| 432 | acpi_clear_event(ACPI_EVENT_RTC); | ||
| 433 | acpi_disable_event(ACPI_EVENT_RTC, 0); | ||
| 434 | |||
| 435 | return ACPI_INTERRUPT_HANDLED; | ||
| 436 | } | ||
| 437 | #endif /* HAVE_ACPI_LEGACY_ALARM */ | ||
| 438 | |||
| 439 | int __init acpi_sleep_proc_init(void) | 148 | int __init acpi_sleep_proc_init(void) |
| 440 | { | 149 | { |
| 441 | #ifdef HAVE_ACPI_LEGACY_ALARM | ||
| 442 | /* 'alarm' [R/W] */ | ||
| 443 | proc_create("alarm", S_IFREG | S_IRUGO | S_IWUSR, | ||
| 444 | acpi_root_dir, &acpi_system_alarm_fops); | ||
| 445 | |||
| 446 | acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL); | ||
| 447 | /* | ||
| 448 | * Disable the RTC event after installing RTC handler. | ||
| 449 | * Only when RTC alarm is set will it be enabled. | ||
| 450 | */ | ||
| 451 | acpi_clear_event(ACPI_EVENT_RTC); | ||
| 452 | acpi_disable_event(ACPI_EVENT_RTC, 0); | ||
| 453 | #endif /* HAVE_ACPI_LEGACY_ALARM */ | ||
| 454 | |||
| 455 | /* 'wakeup device' [R/W] */ | 150 | /* 'wakeup device' [R/W] */ |
| 456 | proc_create("wakeup", S_IFREG | S_IRUGO | S_IWUSR, | 151 | proc_create("wakeup", S_IFREG | S_IRUGO | S_IWUSR, |
| 457 | acpi_root_dir, &acpi_system_wakeup_device_fops); | 152 | acpi_root_dir, &acpi_system_wakeup_device_fops); |
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index cf34d903f4fb..b3171f30b319 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
| @@ -162,16 +162,23 @@ exit: | |||
| 162 | return apic_id; | 162 | return apic_id; |
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id) | 165 | int acpi_get_apicid(acpi_handle handle, int type, u32 acpi_id) |
| 166 | { | 166 | { |
| 167 | #ifdef CONFIG_SMP | 167 | int apic_id; |
| 168 | int i; | ||
| 169 | #endif | ||
| 170 | int apic_id = -1; | ||
| 171 | 168 | ||
| 172 | apic_id = map_mat_entry(handle, type, acpi_id); | 169 | apic_id = map_mat_entry(handle, type, acpi_id); |
| 173 | if (apic_id == -1) | 170 | if (apic_id == -1) |
| 174 | apic_id = map_madt_entry(type, acpi_id); | 171 | apic_id = map_madt_entry(type, acpi_id); |
| 172 | |||
| 173 | return apic_id; | ||
| 174 | } | ||
| 175 | |||
| 176 | int acpi_map_cpuid(int apic_id, u32 acpi_id) | ||
| 177 | { | ||
| 178 | #ifdef CONFIG_SMP | ||
| 179 | int i; | ||
| 180 | #endif | ||
| 181 | |||
| 175 | if (apic_id == -1) { | 182 | if (apic_id == -1) { |
| 176 | /* | 183 | /* |
| 177 | * On UP processor, there is no _MAT or MADT table. | 184 | * On UP processor, there is no _MAT or MADT table. |
| @@ -211,6 +218,15 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id) | |||
| 211 | #endif | 218 | #endif |
| 212 | return -1; | 219 | return -1; |
| 213 | } | 220 | } |
| 221 | |||
| 222 | int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id) | ||
| 223 | { | ||
| 224 | int apic_id; | ||
| 225 | |||
| 226 | apic_id = acpi_get_apicid(handle, type, acpi_id); | ||
| 227 | |||
| 228 | return acpi_map_cpuid(apic_id, acpi_id); | ||
| 229 | } | ||
| 214 | EXPORT_SYMBOL_GPL(acpi_get_cpuid); | 230 | EXPORT_SYMBOL_GPL(acpi_get_cpuid); |
| 215 | 231 | ||
| 216 | static bool __init processor_physically_present(acpi_handle handle) | 232 | static bool __init processor_physically_present(acpi_handle handle) |
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index e534ba66d5b8..146ab7e2b81d 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c | |||
| @@ -153,8 +153,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb, | |||
| 153 | return NOTIFY_OK; | 153 | return NOTIFY_OK; |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | static struct notifier_block __refdata acpi_cpu_notifier = | 156 | static struct notifier_block __refdata acpi_cpu_notifier = { |
| 157 | { | ||
| 158 | .notifier_call = acpi_cpu_soft_notify, | 157 | .notifier_call = acpi_cpu_soft_notify, |
| 159 | }; | 158 | }; |
| 160 | 159 | ||
| @@ -172,7 +171,6 @@ static int __acpi_processor_start(struct acpi_device *device) | |||
| 172 | 171 | ||
| 173 | #ifdef CONFIG_CPU_FREQ | 172 | #ifdef CONFIG_CPU_FREQ |
| 174 | acpi_processor_ppc_has_changed(pr, 0); | 173 | acpi_processor_ppc_has_changed(pr, 0); |
| 175 | acpi_processor_load_module(pr); | ||
| 176 | #endif | 174 | #endif |
| 177 | acpi_processor_get_throttling_info(pr); | 175 | acpi_processor_get_throttling_info(pr); |
| 178 | 176 | ||
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index f98dd00b51a9..35c8f2bbcc40 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -272,9 +272,6 @@ static void tsc_check_state(int state) { return; } | |||
| 272 | static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr) | 272 | static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr) |
| 273 | { | 273 | { |
| 274 | 274 | ||
| 275 | if (!pr) | ||
| 276 | return -EINVAL; | ||
| 277 | |||
| 278 | if (!pr->pblk) | 275 | if (!pr->pblk) |
| 279 | return -ENODEV; | 276 | return -ENODEV; |
| 280 | 277 | ||
| @@ -1076,12 +1073,8 @@ int acpi_processor_hotplug(struct acpi_processor *pr) | |||
| 1076 | if (disabled_by_idle_boot_param()) | 1073 | if (disabled_by_idle_boot_param()) |
| 1077 | return 0; | 1074 | return 0; |
| 1078 | 1075 | ||
| 1079 | if (!pr) | 1076 | if (nocst) |
| 1080 | return -EINVAL; | ||
| 1081 | |||
| 1082 | if (nocst) { | ||
| 1083 | return -ENODEV; | 1077 | return -ENODEV; |
| 1084 | } | ||
| 1085 | 1078 | ||
| 1086 | if (!pr->flags.power_setup_done) | 1079 | if (!pr->flags.power_setup_done) |
| 1087 | return -ENODEV; | 1080 | return -ENODEV; |
| @@ -1108,9 +1101,6 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) | |||
| 1108 | if (disabled_by_idle_boot_param()) | 1101 | if (disabled_by_idle_boot_param()) |
| 1109 | return 0; | 1102 | return 0; |
| 1110 | 1103 | ||
| 1111 | if (!pr) | ||
| 1112 | return -EINVAL; | ||
| 1113 | |||
| 1114 | if (nocst) | 1104 | if (nocst) |
| 1115 | return -ENODEV; | 1105 | return -ENODEV; |
| 1116 | 1106 | ||
| @@ -1183,9 +1173,6 @@ int acpi_processor_power_init(struct acpi_processor *pr) | |||
| 1183 | first_run++; | 1173 | first_run++; |
| 1184 | } | 1174 | } |
| 1185 | 1175 | ||
| 1186 | if (!pr) | ||
| 1187 | return -EINVAL; | ||
| 1188 | |||
| 1189 | if (acpi_gbl_FADT.cst_control && !nocst) { | 1176 | if (acpi_gbl_FADT.cst_control && !nocst) { |
| 1190 | status = | 1177 | status = |
| 1191 | acpi_os_write_port(acpi_gbl_FADT.smi_command, acpi_gbl_FADT.cst_control, 8); | 1178 | acpi_os_write_port(acpi_gbl_FADT.smi_command, acpi_gbl_FADT.cst_control, 8); |
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 51d7948611da..60a7c28fc167 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c | |||
| @@ -235,28 +235,6 @@ void acpi_processor_ppc_exit(void) | |||
| 235 | acpi_processor_ppc_status &= ~PPC_REGISTERED; | 235 | acpi_processor_ppc_status &= ~PPC_REGISTERED; |
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | /* | ||
| 239 | * Do a quick check if the systems looks like it should use ACPI | ||
| 240 | * cpufreq. We look at a _PCT method being available, but don't | ||
| 241 | * do a whole lot of sanity checks. | ||
| 242 | */ | ||
| 243 | void acpi_processor_load_module(struct acpi_processor *pr) | ||
| 244 | { | ||
| 245 | static int requested; | ||
| 246 | acpi_status status = 0; | ||
| 247 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | ||
| 248 | |||
| 249 | if (!arch_has_acpi_pdc() || requested) | ||
| 250 | return; | ||
| 251 | status = acpi_evaluate_object(pr->handle, "_PCT", NULL, &buffer); | ||
| 252 | if (!ACPI_FAILURE(status)) { | ||
| 253 | printk(KERN_INFO PREFIX "Requesting acpi_cpufreq\n"); | ||
| 254 | request_module_nowait("acpi_cpufreq"); | ||
| 255 | requested = 1; | ||
| 256 | } | ||
| 257 | kfree(buffer.pointer); | ||
| 258 | } | ||
| 259 | |||
| 260 | static int acpi_processor_get_performance_control(struct acpi_processor *pr) | 238 | static int acpi_processor_get_performance_control(struct acpi_processor *pr) |
| 261 | { | 239 | { |
| 262 | int result = 0; | 240 | int result = 0; |
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index aef7e1cd1e5d..d465ae6cdd00 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c | |||
| @@ -30,12 +30,6 @@ | |||
| 30 | #include <linux/moduleparam.h> | 30 | #include <linux/moduleparam.h> |
| 31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 32 | 32 | ||
| 33 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 34 | #include <linux/proc_fs.h> | ||
| 35 | #include <linux/seq_file.h> | ||
| 36 | #include <asm/uaccess.h> | ||
| 37 | #endif | ||
| 38 | |||
| 39 | #include <linux/acpi.h> | 33 | #include <linux/acpi.h> |
| 40 | #include <linux/timer.h> | 34 | #include <linux/timer.h> |
| 41 | #include <linux/jiffies.h> | 35 | #include <linux/jiffies.h> |
| @@ -67,11 +61,6 @@ static unsigned int cache_time = 1000; | |||
| 67 | module_param(cache_time, uint, 0644); | 61 | module_param(cache_time, uint, 0644); |
| 68 | MODULE_PARM_DESC(cache_time, "cache time in milliseconds"); | 62 | MODULE_PARM_DESC(cache_time, "cache time in milliseconds"); |
| 69 | 63 | ||
| 70 | extern struct proc_dir_entry *acpi_lock_ac_dir(void); | ||
| 71 | extern struct proc_dir_entry *acpi_lock_battery_dir(void); | ||
| 72 | extern void acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir); | ||
| 73 | extern void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir); | ||
| 74 | |||
| 75 | #define MAX_SBS_BAT 4 | 64 | #define MAX_SBS_BAT 4 |
| 76 | #define ACPI_SBS_BLOCK_MAX 32 | 65 | #define ACPI_SBS_BLOCK_MAX 32 |
| 77 | 66 | ||
| @@ -84,9 +73,6 @@ MODULE_DEVICE_TABLE(acpi, sbs_device_ids); | |||
| 84 | struct acpi_battery { | 73 | struct acpi_battery { |
| 85 | struct power_supply bat; | 74 | struct power_supply bat; |
| 86 | struct acpi_sbs *sbs; | 75 | struct acpi_sbs *sbs; |
| 87 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 88 | struct proc_dir_entry *proc_entry; | ||
| 89 | #endif | ||
| 90 | unsigned long update_time; | 76 | unsigned long update_time; |
| 91 | char name[8]; | 77 | char name[8]; |
| 92 | char manufacturer_name[ACPI_SBS_BLOCK_MAX]; | 78 | char manufacturer_name[ACPI_SBS_BLOCK_MAX]; |
| @@ -119,9 +105,6 @@ struct acpi_sbs { | |||
| 119 | struct acpi_device *device; | 105 | struct acpi_device *device; |
| 120 | struct acpi_smb_hc *hc; | 106 | struct acpi_smb_hc *hc; |
| 121 | struct mutex lock; | 107 | struct mutex lock; |
| 122 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 123 | struct proc_dir_entry *charger_entry; | ||
| 124 | #endif | ||
| 125 | struct acpi_battery battery[MAX_SBS_BAT]; | 108 | struct acpi_battery battery[MAX_SBS_BAT]; |
| 126 | u8 batteries_supported:4; | 109 | u8 batteries_supported:4; |
| 127 | u8 manager_present:1; | 110 | u8 manager_present:1; |
| @@ -482,261 +465,6 @@ static struct device_attribute alarm_attr = { | |||
| 482 | }; | 465 | }; |
| 483 | 466 | ||
| 484 | /* -------------------------------------------------------------------------- | 467 | /* -------------------------------------------------------------------------- |
| 485 | FS Interface (/proc/acpi) | ||
| 486 | -------------------------------------------------------------------------- */ | ||
| 487 | |||
| 488 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 489 | /* Generic Routines */ | ||
| 490 | static int | ||
| 491 | acpi_sbs_add_fs(struct proc_dir_entry **dir, | ||
| 492 | struct proc_dir_entry *parent_dir, | ||
| 493 | char *dir_name, | ||
| 494 | const struct file_operations *info_fops, | ||
| 495 | const struct file_operations *state_fops, | ||
| 496 | const struct file_operations *alarm_fops, void *data) | ||
| 497 | { | ||
| 498 | printk(KERN_WARNING PREFIX "Deprecated procfs I/F for SBS is loaded," | ||
| 499 | " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n"); | ||
| 500 | if (!*dir) { | ||
| 501 | *dir = proc_mkdir(dir_name, parent_dir); | ||
| 502 | if (!*dir) { | ||
| 503 | return -ENODEV; | ||
| 504 | } | ||
| 505 | } | ||
| 506 | |||
| 507 | /* 'info' [R] */ | ||
| 508 | if (info_fops) | ||
| 509 | proc_create_data(ACPI_SBS_FILE_INFO, S_IRUGO, *dir, | ||
| 510 | info_fops, data); | ||
| 511 | |||
| 512 | /* 'state' [R] */ | ||
| 513 | if (state_fops) | ||
| 514 | proc_create_data(ACPI_SBS_FILE_STATE, S_IRUGO, *dir, | ||
| 515 | state_fops, data); | ||
| 516 | |||
| 517 | /* 'alarm' [R/W] */ | ||
| 518 | if (alarm_fops) | ||
| 519 | proc_create_data(ACPI_SBS_FILE_ALARM, S_IRUGO, *dir, | ||
| 520 | alarm_fops, data); | ||
| 521 | return 0; | ||
| 522 | } | ||
| 523 | |||
| 524 | /* Smart Battery Interface */ | ||
| 525 | static struct proc_dir_entry *acpi_battery_dir = NULL; | ||
| 526 | |||
| 527 | static inline char *acpi_battery_units(struct acpi_battery *battery) | ||
| 528 | { | ||
| 529 | return acpi_battery_mode(battery) ? " mW" : " mA"; | ||
| 530 | } | ||
| 531 | |||
| 532 | |||
| 533 | static int acpi_battery_read_info(struct seq_file *seq, void *offset) | ||
| 534 | { | ||
| 535 | struct acpi_battery *battery = seq->private; | ||
| 536 | struct acpi_sbs *sbs = battery->sbs; | ||
| 537 | int result = 0; | ||
| 538 | |||
| 539 | mutex_lock(&sbs->lock); | ||
| 540 | |||
| 541 | seq_printf(seq, "present: %s\n", | ||
| 542 | (battery->present) ? "yes" : "no"); | ||
| 543 | if (!battery->present) | ||
| 544 | goto end; | ||
| 545 | |||
| 546 | seq_printf(seq, "design capacity: %i%sh\n", | ||
| 547 | battery->design_capacity * acpi_battery_scale(battery), | ||
| 548 | acpi_battery_units(battery)); | ||
| 549 | seq_printf(seq, "last full capacity: %i%sh\n", | ||
| 550 | battery->full_charge_capacity * acpi_battery_scale(battery), | ||
| 551 | acpi_battery_units(battery)); | ||
| 552 | seq_printf(seq, "battery technology: rechargeable\n"); | ||
| 553 | seq_printf(seq, "design voltage: %i mV\n", | ||
| 554 | battery->design_voltage * acpi_battery_vscale(battery)); | ||
| 555 | seq_printf(seq, "design capacity warning: unknown\n"); | ||
| 556 | seq_printf(seq, "design capacity low: unknown\n"); | ||
| 557 | seq_printf(seq, "cycle count: %i\n", battery->cycle_count); | ||
| 558 | seq_printf(seq, "capacity granularity 1: unknown\n"); | ||
| 559 | seq_printf(seq, "capacity granularity 2: unknown\n"); | ||
| 560 | seq_printf(seq, "model number: %s\n", battery->device_name); | ||
| 561 | seq_printf(seq, "serial number: %i\n", | ||
| 562 | battery->serial_number); | ||
| 563 | seq_printf(seq, "battery type: %s\n", | ||
| 564 | battery->device_chemistry); | ||
| 565 | seq_printf(seq, "OEM info: %s\n", | ||
| 566 | battery->manufacturer_name); | ||
| 567 | end: | ||
| 568 | mutex_unlock(&sbs->lock); | ||
| 569 | return result; | ||
| 570 | } | ||
| 571 | |||
| 572 | static int acpi_battery_info_open_fs(struct inode *inode, struct file *file) | ||
| 573 | { | ||
| 574 | return single_open(file, acpi_battery_read_info, PDE_DATA(inode)); | ||
| 575 | } | ||
| 576 | |||
| 577 | static int acpi_battery_read_state(struct seq_file *seq, void *offset) | ||
| 578 | { | ||
| 579 | struct acpi_battery *battery = seq->private; | ||
| 580 | struct acpi_sbs *sbs = battery->sbs; | ||
| 581 | int rate; | ||
| 582 | |||
| 583 | mutex_lock(&sbs->lock); | ||
| 584 | seq_printf(seq, "present: %s\n", | ||
| 585 | (battery->present) ? "yes" : "no"); | ||
| 586 | if (!battery->present) | ||
| 587 | goto end; | ||
| 588 | |||
| 589 | acpi_battery_get_state(battery); | ||
| 590 | seq_printf(seq, "capacity state: %s\n", | ||
| 591 | (battery->state & 0x0010) ? "critical" : "ok"); | ||
| 592 | seq_printf(seq, "charging state: %s\n", | ||
| 593 | (battery->rate_now < 0) ? "discharging" : | ||
| 594 | ((battery->rate_now > 0) ? "charging" : "charged")); | ||
| 595 | rate = abs(battery->rate_now) * acpi_battery_ipscale(battery); | ||
| 596 | rate *= (acpi_battery_mode(battery))?(battery->voltage_now * | ||
| 597 | acpi_battery_vscale(battery)/1000):1; | ||
| 598 | seq_printf(seq, "present rate: %d%s\n", rate, | ||
| 599 | acpi_battery_units(battery)); | ||
| 600 | seq_printf(seq, "remaining capacity: %i%sh\n", | ||
| 601 | battery->capacity_now * acpi_battery_scale(battery), | ||
| 602 | acpi_battery_units(battery)); | ||
| 603 | seq_printf(seq, "present voltage: %i mV\n", | ||
| 604 | battery->voltage_now * acpi_battery_vscale(battery)); | ||
| 605 | |||
| 606 | end: | ||
| 607 | mutex_unlock(&sbs->lock); | ||
| 608 | return 0; | ||
| 609 | } | ||
| 610 | |||
| 611 | static int acpi_battery_state_open_fs(struct inode *inode, struct file *file) | ||
| 612 | { | ||
| 613 | return single_open(file, acpi_battery_read_state, PDE_DATA(inode)); | ||
| 614 | } | ||
| 615 | |||
| 616 | static int acpi_battery_read_alarm(struct seq_file *seq, void *offset) | ||
| 617 | { | ||
| 618 | struct acpi_battery *battery = seq->private; | ||
| 619 | struct acpi_sbs *sbs = battery->sbs; | ||
| 620 | int result = 0; | ||
| 621 | |||
| 622 | mutex_lock(&sbs->lock); | ||
| 623 | |||
| 624 | if (!battery->present) { | ||
| 625 | seq_printf(seq, "present: no\n"); | ||
| 626 | goto end; | ||
| 627 | } | ||
| 628 | |||
| 629 | acpi_battery_get_alarm(battery); | ||
| 630 | seq_printf(seq, "alarm: "); | ||
| 631 | if (battery->alarm_capacity) | ||
| 632 | seq_printf(seq, "%i%sh\n", | ||
| 633 | battery->alarm_capacity * | ||
| 634 | acpi_battery_scale(battery), | ||
| 635 | acpi_battery_units(battery)); | ||
| 636 | else | ||
| 637 | seq_printf(seq, "disabled\n"); | ||
| 638 | end: | ||
| 639 | mutex_unlock(&sbs->lock); | ||
| 640 | return result; | ||
| 641 | } | ||
| 642 | |||
| 643 | static ssize_t | ||
| 644 | acpi_battery_write_alarm(struct file *file, const char __user * buffer, | ||
| 645 | size_t count, loff_t * ppos) | ||
| 646 | { | ||
| 647 | struct seq_file *seq = file->private_data; | ||
| 648 | struct acpi_battery *battery = seq->private; | ||
| 649 | struct acpi_sbs *sbs = battery->sbs; | ||
| 650 | char alarm_string[12] = { '\0' }; | ||
| 651 | int result = 0; | ||
| 652 | mutex_lock(&sbs->lock); | ||
| 653 | if (!battery->present) { | ||
| 654 | result = -ENODEV; | ||
| 655 | goto end; | ||
| 656 | } | ||
| 657 | if (count > sizeof(alarm_string) - 1) { | ||
| 658 | result = -EINVAL; | ||
| 659 | goto end; | ||
| 660 | } | ||
| 661 | if (copy_from_user(alarm_string, buffer, count)) { | ||
| 662 | result = -EFAULT; | ||
| 663 | goto end; | ||
| 664 | } | ||
| 665 | alarm_string[count] = 0; | ||
| 666 | battery->alarm_capacity = simple_strtoul(alarm_string, NULL, 0) / | ||
| 667 | acpi_battery_scale(battery); | ||
| 668 | acpi_battery_set_alarm(battery); | ||
| 669 | end: | ||
| 670 | mutex_unlock(&sbs->lock); | ||
| 671 | if (result) | ||
| 672 | return result; | ||
| 673 | return count; | ||
| 674 | } | ||
| 675 | |||
| 676 | static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file) | ||
| 677 | { | ||
| 678 | return single_open(file, acpi_battery_read_alarm, PDE_DATA(inode)); | ||
| 679 | } | ||
| 680 | |||
| 681 | static const struct file_operations acpi_battery_info_fops = { | ||
| 682 | .open = acpi_battery_info_open_fs, | ||
| 683 | .read = seq_read, | ||
| 684 | .llseek = seq_lseek, | ||
| 685 | .release = single_release, | ||
| 686 | .owner = THIS_MODULE, | ||
| 687 | }; | ||
| 688 | |||
| 689 | static const struct file_operations acpi_battery_state_fops = { | ||
| 690 | .open = acpi_battery_state_open_fs, | ||
| 691 | .read = seq_read, | ||
| 692 | .llseek = seq_lseek, | ||
| 693 | .release = single_release, | ||
| 694 | .owner = THIS_MODULE, | ||
| 695 | }; | ||
| 696 | |||
| 697 | static const struct file_operations acpi_battery_alarm_fops = { | ||
| 698 | .open = acpi_battery_alarm_open_fs, | ||
| 699 | .read = seq_read, | ||
| 700 | .write = acpi_battery_write_alarm, | ||
| 701 | .llseek = seq_lseek, | ||
| 702 | .release = single_release, | ||
| 703 | .owner = THIS_MODULE, | ||
| 704 | }; | ||
| 705 | |||
| 706 | /* Legacy AC Adapter Interface */ | ||
| 707 | |||
| 708 | static struct proc_dir_entry *acpi_ac_dir = NULL; | ||
| 709 | |||
| 710 | static int acpi_ac_read_state(struct seq_file *seq, void *offset) | ||
| 711 | { | ||
| 712 | |||
| 713 | struct acpi_sbs *sbs = seq->private; | ||
| 714 | |||
| 715 | mutex_lock(&sbs->lock); | ||
| 716 | |||
| 717 | seq_printf(seq, "state: %s\n", | ||
| 718 | sbs->charger_present ? "on-line" : "off-line"); | ||
| 719 | |||
| 720 | mutex_unlock(&sbs->lock); | ||
| 721 | return 0; | ||
| 722 | } | ||
| 723 | |||
| 724 | static int acpi_ac_state_open_fs(struct inode *inode, struct file *file) | ||
| 725 | { | ||
| 726 | return single_open(file, acpi_ac_read_state, PDE_DATA(inode)); | ||
| 727 | } | ||
| 728 | |||
| 729 | static const struct file_operations acpi_ac_state_fops = { | ||
| 730 | .open = acpi_ac_state_open_fs, | ||
| 731 | .read = seq_read, | ||
| 732 | .llseek = seq_lseek, | ||
| 733 | .release = single_release, | ||
| 734 | .owner = THIS_MODULE, | ||
| 735 | }; | ||
| 736 | |||
| 737 | #endif | ||
| 738 | |||
| 739 | /* -------------------------------------------------------------------------- | ||
| 740 | Driver Interface | 468 | Driver Interface |
| 741 | -------------------------------------------------------------------------- */ | 469 | -------------------------------------------------------------------------- */ |
| 742 | static int acpi_battery_read(struct acpi_battery *battery) | 470 | static int acpi_battery_read(struct acpi_battery *battery) |
| @@ -781,12 +509,6 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) | |||
| 781 | return result; | 509 | return result; |
| 782 | 510 | ||
| 783 | sprintf(battery->name, ACPI_BATTERY_DIR_NAME, id); | 511 | sprintf(battery->name, ACPI_BATTERY_DIR_NAME, id); |
| 784 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 785 | acpi_sbs_add_fs(&battery->proc_entry, acpi_battery_dir, | ||
| 786 | battery->name, &acpi_battery_info_fops, | ||
| 787 | &acpi_battery_state_fops, &acpi_battery_alarm_fops, | ||
| 788 | battery); | ||
| 789 | #endif | ||
| 790 | battery->bat.name = battery->name; | 512 | battery->bat.name = battery->name; |
| 791 | battery->bat.type = POWER_SUPPLY_TYPE_BATTERY; | 513 | battery->bat.type = POWER_SUPPLY_TYPE_BATTERY; |
| 792 | if (!acpi_battery_mode(battery)) { | 514 | if (!acpi_battery_mode(battery)) { |
| @@ -822,10 +544,6 @@ static void acpi_battery_remove(struct acpi_sbs *sbs, int id) | |||
| 822 | device_remove_file(battery->bat.dev, &alarm_attr); | 544 | device_remove_file(battery->bat.dev, &alarm_attr); |
| 823 | power_supply_unregister(&battery->bat); | 545 | power_supply_unregister(&battery->bat); |
| 824 | } | 546 | } |
| 825 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 826 | proc_remove(battery->proc_entry); | ||
| 827 | battery->proc_entry = NULL; | ||
| 828 | #endif | ||
| 829 | } | 547 | } |
| 830 | 548 | ||
| 831 | static int acpi_charger_add(struct acpi_sbs *sbs) | 549 | static int acpi_charger_add(struct acpi_sbs *sbs) |
| @@ -835,13 +553,7 @@ static int acpi_charger_add(struct acpi_sbs *sbs) | |||
| 835 | result = acpi_ac_get_present(sbs); | 553 | result = acpi_ac_get_present(sbs); |
| 836 | if (result) | 554 | if (result) |
| 837 | goto end; | 555 | goto end; |
| 838 | #ifdef CONFIG_ACPI_PROCFS_POWER | 556 | |
| 839 | result = acpi_sbs_add_fs(&sbs->charger_entry, acpi_ac_dir, | ||
| 840 | ACPI_AC_DIR_NAME, NULL, | ||
| 841 | &acpi_ac_state_fops, NULL, sbs); | ||
| 842 | if (result) | ||
| 843 | goto end; | ||
| 844 | #endif | ||
| 845 | sbs->charger.name = "sbs-charger"; | 557 | sbs->charger.name = "sbs-charger"; |
| 846 | sbs->charger.type = POWER_SUPPLY_TYPE_MAINS; | 558 | sbs->charger.type = POWER_SUPPLY_TYPE_MAINS; |
| 847 | sbs->charger.properties = sbs_ac_props; | 559 | sbs->charger.properties = sbs_ac_props; |
| @@ -859,10 +571,6 @@ static void acpi_charger_remove(struct acpi_sbs *sbs) | |||
| 859 | { | 571 | { |
| 860 | if (sbs->charger.dev) | 572 | if (sbs->charger.dev) |
| 861 | power_supply_unregister(&sbs->charger); | 573 | power_supply_unregister(&sbs->charger); |
| 862 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 863 | proc_remove(sbs->charger_entry); | ||
| 864 | sbs->charger_entry = NULL; | ||
| 865 | #endif | ||
| 866 | } | 574 | } |
| 867 | 575 | ||
| 868 | static void acpi_sbs_callback(void *context) | 576 | static void acpi_sbs_callback(void *context) |
| @@ -950,20 +658,6 @@ static int acpi_sbs_remove(struct acpi_device *device) | |||
| 950 | return 0; | 658 | return 0; |
| 951 | } | 659 | } |
| 952 | 660 | ||
| 953 | static void acpi_sbs_rmdirs(void) | ||
| 954 | { | ||
| 955 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
| 956 | if (acpi_ac_dir) { | ||
| 957 | acpi_unlock_ac_dir(acpi_ac_dir); | ||
| 958 | acpi_ac_dir = NULL; | ||
| 959 | } | ||
| 960 | if (acpi_battery_dir) { | ||
| 961 | acpi_unlock_battery_dir(acpi_battery_dir); | ||
| 962 | acpi_battery_dir = NULL; | ||
| 963 | } | ||
| 964 | #endif | ||
| 965 | } | ||
| 966 | |||
| 967 | #ifdef CONFIG_PM_SLEEP | 661 | #ifdef CONFIG_PM_SLEEP |
| 968 | static int acpi_sbs_resume(struct device *dev) | 662 | static int acpi_sbs_resume(struct device *dev) |
| 969 | { | 663 | { |
| @@ -995,28 +689,17 @@ static int __init acpi_sbs_init(void) | |||
| 995 | 689 | ||
| 996 | if (acpi_disabled) | 690 | if (acpi_disabled) |
| 997 | return -ENODEV; | 691 | return -ENODEV; |
| 998 | #ifdef CONFIG_ACPI_PROCFS_POWER | 692 | |
| 999 | acpi_ac_dir = acpi_lock_ac_dir(); | ||
| 1000 | if (!acpi_ac_dir) | ||
| 1001 | return -ENODEV; | ||
| 1002 | acpi_battery_dir = acpi_lock_battery_dir(); | ||
| 1003 | if (!acpi_battery_dir) { | ||
| 1004 | acpi_sbs_rmdirs(); | ||
| 1005 | return -ENODEV; | ||
| 1006 | } | ||
| 1007 | #endif | ||
| 1008 | result = acpi_bus_register_driver(&acpi_sbs_driver); | 693 | result = acpi_bus_register_driver(&acpi_sbs_driver); |
| 1009 | if (result < 0) { | 694 | if (result < 0) |
| 1010 | acpi_sbs_rmdirs(); | ||
| 1011 | return -ENODEV; | 695 | return -ENODEV; |
| 1012 | } | 696 | |
| 1013 | return 0; | 697 | return 0; |
| 1014 | } | 698 | } |
| 1015 | 699 | ||
| 1016 | static void __exit acpi_sbs_exit(void) | 700 | static void __exit acpi_sbs_exit(void) |
| 1017 | { | 701 | { |
| 1018 | acpi_bus_unregister_driver(&acpi_sbs_driver); | 702 | acpi_bus_unregister_driver(&acpi_sbs_driver); |
| 1019 | acpi_sbs_rmdirs(); | ||
| 1020 | return; | 703 | return; |
| 1021 | } | 704 | } |
| 1022 | 705 | ||
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 407ad13cac2f..fee8a297c7d9 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -999,7 +999,6 @@ int acpi_device_add(struct acpi_device *device, | |||
| 999 | INIT_LIST_HEAD(&device->wakeup_list); | 999 | INIT_LIST_HEAD(&device->wakeup_list); |
| 1000 | INIT_LIST_HEAD(&device->physical_node_list); | 1000 | INIT_LIST_HEAD(&device->physical_node_list); |
| 1001 | mutex_init(&device->physical_node_lock); | 1001 | mutex_init(&device->physical_node_lock); |
| 1002 | INIT_LIST_HEAD(&device->power_dependent); | ||
| 1003 | 1002 | ||
| 1004 | new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL); | 1003 | new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL); |
| 1005 | if (!new_bus_id) { | 1004 | if (!new_bus_id) { |
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c index b55778704444..db5293650f62 100644 --- a/drivers/acpi/sysfs.c +++ b/drivers/acpi/sysfs.c | |||
| @@ -767,13 +767,8 @@ void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug, | |||
| 767 | if (!hotplug_kobj) | 767 | if (!hotplug_kobj) |
| 768 | goto err_out; | 768 | goto err_out; |
| 769 | 769 | ||
| 770 | kobject_init(&hotplug->kobj, &acpi_hotplug_profile_ktype); | 770 | error = kobject_init_and_add(&hotplug->kobj, |
| 771 | error = kobject_set_name(&hotplug->kobj, "%s", name); | 771 | &acpi_hotplug_profile_ktype, hotplug_kobj, "%s", name); |
| 772 | if (error) | ||
| 773 | goto err_out; | ||
| 774 | |||
| 775 | hotplug->kobj.parent = hotplug_kobj; | ||
| 776 | error = kobject_add(&hotplug->kobj, hotplug_kobj, NULL); | ||
| 777 | if (error) | 772 | if (error) |
| 778 | goto err_out; | 773 | goto err_out; |
| 779 | 774 | ||
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 9d715ae5ff6b..8e28f923cf7f 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -1343,7 +1343,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1343 | if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss) | 1343 | if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss) |
| 1344 | host->flags |= ATA_HOST_PARALLEL_SCAN; | 1344 | host->flags |= ATA_HOST_PARALLEL_SCAN; |
| 1345 | else | 1345 | else |
| 1346 | printk(KERN_INFO "ahci: SSS flag set, parallel bus scan disabled\n"); | 1346 | dev_info(&pdev->dev, "SSS flag set, parallel bus scan disabled\n"); |
| 1347 | 1347 | ||
| 1348 | if (pi.flags & ATA_FLAG_EM) | 1348 | if (pi.flags & ATA_FLAG_EM) |
| 1349 | ahci_reset_em(host); | 1349 | ahci_reset_em(host); |
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index 2daaee05cab1..7d3b85385bfc 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c | |||
| @@ -184,7 +184,7 @@ static int ahci_probe(struct platform_device *pdev) | |||
| 184 | if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss) | 184 | if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss) |
| 185 | host->flags |= ATA_HOST_PARALLEL_SCAN; | 185 | host->flags |= ATA_HOST_PARALLEL_SCAN; |
| 186 | else | 186 | else |
| 187 | printk(KERN_INFO "ahci: SSS flag set, parallel bus scan disabled\n"); | 187 | dev_info(dev, "SSS flag set, parallel bus scan disabled\n"); |
| 188 | 188 | ||
| 189 | if (pi.flags & ATA_FLAG_EM) | 189 | if (pi.flags & ATA_FLAG_EM) |
| 190 | ahci_reset_em(host); | 190 | ahci_reset_em(host); |
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index acfd0f711069..aaac4fb0d564 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c | |||
| @@ -778,8 +778,16 @@ static void ahci_start_port(struct ata_port *ap) | |||
| 778 | rc = ap->ops->transmit_led_message(ap, | 778 | rc = ap->ops->transmit_led_message(ap, |
| 779 | emp->led_state, | 779 | emp->led_state, |
| 780 | 4); | 780 | 4); |
| 781 | /* | ||
| 782 | * If busy, give a breather but do not | ||
| 783 | * release EH ownership by using msleep() | ||
| 784 | * instead of ata_msleep(). EM Transmit | ||
| 785 | * bit is busy for the whole host and | ||
| 786 | * releasing ownership will cause other | ||
| 787 | * ports to fail the same way. | ||
| 788 | */ | ||
| 781 | if (rc == -EBUSY) | 789 | if (rc == -EBUSY) |
| 782 | ata_msleep(ap, 1); | 790 | msleep(1); |
| 783 | else | 791 | else |
| 784 | break; | 792 | break; |
| 785 | } | 793 | } |
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 4ba8b0405572..ab714d2ad978 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
| @@ -1035,17 +1035,3 @@ void ata_acpi_on_disable(struct ata_device *dev) | |||
| 1035 | { | 1035 | { |
| 1036 | ata_acpi_clear_gtf(dev); | 1036 | ata_acpi_clear_gtf(dev); |
| 1037 | } | 1037 | } |
| 1038 | |||
| 1039 | void ata_scsi_acpi_bind(struct ata_device *dev) | ||
| 1040 | { | ||
| 1041 | acpi_handle handle = ata_dev_acpi_handle(dev); | ||
| 1042 | if (handle) | ||
| 1043 | acpi_dev_pm_add_dependent(handle, &dev->sdev->sdev_gendev); | ||
| 1044 | } | ||
| 1045 | |||
| 1046 | void ata_scsi_acpi_unbind(struct ata_device *dev) | ||
| 1047 | { | ||
| 1048 | acpi_handle handle = ata_dev_acpi_handle(dev); | ||
| 1049 | if (handle) | ||
| 1050 | acpi_dev_pm_remove_dependent(handle, &dev->sdev->sdev_gendev); | ||
| 1051 | } | ||
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index c69fcce505c0..370462fa8e01 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
| @@ -1322,14 +1322,14 @@ void ata_eh_qc_complete(struct ata_queued_cmd *qc) | |||
| 1322 | * should be retried. To be used from EH. | 1322 | * should be retried. To be used from EH. |
| 1323 | * | 1323 | * |
| 1324 | * SCSI midlayer limits the number of retries to scmd->allowed. | 1324 | * SCSI midlayer limits the number of retries to scmd->allowed. |
| 1325 | * scmd->retries is decremented for commands which get retried | 1325 | * scmd->allowed is incremented for commands which get retried |
| 1326 | * due to unrelated failures (qc->err_mask is zero). | 1326 | * due to unrelated failures (qc->err_mask is zero). |
| 1327 | */ | 1327 | */ |
| 1328 | void ata_eh_qc_retry(struct ata_queued_cmd *qc) | 1328 | void ata_eh_qc_retry(struct ata_queued_cmd *qc) |
| 1329 | { | 1329 | { |
| 1330 | struct scsi_cmnd *scmd = qc->scsicmd; | 1330 | struct scsi_cmnd *scmd = qc->scsicmd; |
| 1331 | if (!qc->err_mask && scmd->retries) | 1331 | if (!qc->err_mask) |
| 1332 | scmd->retries--; | 1332 | scmd->allowed++; |
| 1333 | __ata_eh_qc_complete(qc); | 1333 | __ata_eh_qc_complete(qc); |
| 1334 | } | 1334 | } |
| 1335 | 1335 | ||
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 97a0cef12959..db6dfcfa3e2e 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
| @@ -3679,7 +3679,6 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync) | |||
| 3679 | if (!IS_ERR(sdev)) { | 3679 | if (!IS_ERR(sdev)) { |
| 3680 | dev->sdev = sdev; | 3680 | dev->sdev = sdev; |
| 3681 | scsi_device_put(sdev); | 3681 | scsi_device_put(sdev); |
| 3682 | ata_scsi_acpi_bind(dev); | ||
| 3683 | } else { | 3682 | } else { |
| 3684 | dev->sdev = NULL; | 3683 | dev->sdev = NULL; |
| 3685 | } | 3684 | } |
| @@ -3767,8 +3766,6 @@ static void ata_scsi_remove_dev(struct ata_device *dev) | |||
| 3767 | struct scsi_device *sdev; | 3766 | struct scsi_device *sdev; |
| 3768 | unsigned long flags; | 3767 | unsigned long flags; |
| 3769 | 3768 | ||
| 3770 | ata_scsi_acpi_unbind(dev); | ||
| 3771 | |||
| 3772 | /* Alas, we need to grab scan_mutex to ensure SCSI device | 3769 | /* Alas, we need to grab scan_mutex to ensure SCSI device |
| 3773 | * state doesn't change underneath us and thus | 3770 | * state doesn't change underneath us and thus |
| 3774 | * scsi_device_get() always succeeds. The mutex locking can | 3771 | * scsi_device_get() always succeeds. The mutex locking can |
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index eeeb77845d48..45b5ab3a95d5 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h | |||
| @@ -121,8 +121,6 @@ extern void ata_acpi_set_state(struct ata_port *ap, pm_message_t state); | |||
| 121 | extern void ata_acpi_bind_port(struct ata_port *ap); | 121 | extern void ata_acpi_bind_port(struct ata_port *ap); |
| 122 | extern void ata_acpi_bind_dev(struct ata_device *dev); | 122 | extern void ata_acpi_bind_dev(struct ata_device *dev); |
| 123 | extern acpi_handle ata_dev_acpi_handle(struct ata_device *dev); | 123 | extern acpi_handle ata_dev_acpi_handle(struct ata_device *dev); |
| 124 | extern void ata_scsi_acpi_bind(struct ata_device *dev); | ||
| 125 | extern void ata_scsi_acpi_unbind(struct ata_device *dev); | ||
| 126 | #else | 124 | #else |
| 127 | static inline void ata_acpi_dissociate(struct ata_host *host) { } | 125 | static inline void ata_acpi_dissociate(struct ata_host *host) { } |
| 128 | static inline int ata_acpi_on_suspend(struct ata_port *ap) { return 0; } | 126 | static inline int ata_acpi_on_suspend(struct ata_port *ap) { return 0; } |
| @@ -133,8 +131,6 @@ static inline void ata_acpi_set_state(struct ata_port *ap, | |||
| 133 | pm_message_t state) { } | 131 | pm_message_t state) { } |
| 134 | static inline void ata_acpi_bind_port(struct ata_port *ap) {} | 132 | static inline void ata_acpi_bind_port(struct ata_port *ap) {} |
| 135 | static inline void ata_acpi_bind_dev(struct ata_device *dev) {} | 133 | static inline void ata_acpi_bind_dev(struct ata_device *dev) {} |
| 136 | static inline void ata_scsi_acpi_bind(struct ata_device *dev) {} | ||
| 137 | static inline void ata_scsi_acpi_unbind(struct ata_device *dev) {} | ||
| 138 | #endif | 134 | #endif |
| 139 | 135 | ||
| 140 | /* libata-scsi.c */ | 136 | /* libata-scsi.c */ |
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c index 4bceb8803a10..b33d1f99b3a4 100644 --- a/drivers/ata/pata_isapnp.c +++ b/drivers/ata/pata_isapnp.c | |||
| @@ -78,7 +78,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev | |||
| 78 | 78 | ||
| 79 | ap->ioaddr.cmd_addr = cmd_addr; | 79 | ap->ioaddr.cmd_addr = cmd_addr; |
| 80 | 80 | ||
| 81 | if (pnp_port_valid(idev, 1) == 0) { | 81 | if (pnp_port_valid(idev, 1)) { |
| 82 | ctl_addr = devm_ioport_map(&idev->dev, | 82 | ctl_addr = devm_ioport_map(&idev->dev, |
| 83 | pnp_port_start(idev, 1), 1); | 83 | pnp_port_start(idev, 1), 1); |
| 84 | ap->ioaddr.altstatus_addr = ctl_addr; | 84 | ap->ioaddr.altstatus_addr = ctl_addr; |
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 848ebbd25717..f48370dfc908 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c | |||
| @@ -44,13 +44,11 @@ static int __ref cpu_subsys_online(struct device *dev) | |||
| 44 | struct cpu *cpu = container_of(dev, struct cpu, dev); | 44 | struct cpu *cpu = container_of(dev, struct cpu, dev); |
| 45 | int cpuid = dev->id; | 45 | int cpuid = dev->id; |
| 46 | int from_nid, to_nid; | 46 | int from_nid, to_nid; |
| 47 | int ret = -ENODEV; | 47 | int ret; |
| 48 | |||
| 49 | cpu_hotplug_driver_lock(); | ||
| 50 | 48 | ||
| 51 | from_nid = cpu_to_node(cpuid); | 49 | from_nid = cpu_to_node(cpuid); |
| 52 | if (from_nid == NUMA_NO_NODE) | 50 | if (from_nid == NUMA_NO_NODE) |
| 53 | goto out; | 51 | return -ENODEV; |
| 54 | 52 | ||
| 55 | ret = cpu_up(cpuid); | 53 | ret = cpu_up(cpuid); |
| 56 | /* | 54 | /* |
| @@ -61,19 +59,12 @@ static int __ref cpu_subsys_online(struct device *dev) | |||
| 61 | if (from_nid != to_nid) | 59 | if (from_nid != to_nid) |
| 62 | change_cpu_under_node(cpu, from_nid, to_nid); | 60 | change_cpu_under_node(cpu, from_nid, to_nid); |
| 63 | 61 | ||
| 64 | out: | ||
| 65 | cpu_hotplug_driver_unlock(); | ||
| 66 | return ret; | 62 | return ret; |
| 67 | } | 63 | } |
| 68 | 64 | ||
| 69 | static int cpu_subsys_offline(struct device *dev) | 65 | static int cpu_subsys_offline(struct device *dev) |
| 70 | { | 66 | { |
| 71 | int ret; | 67 | return cpu_down(dev->id); |
| 72 | |||
| 73 | cpu_hotplug_driver_lock(); | ||
| 74 | ret = cpu_down(dev->id); | ||
| 75 | cpu_hotplug_driver_unlock(); | ||
| 76 | return ret; | ||
| 77 | } | 68 | } |
| 78 | 69 | ||
| 79 | void unregister_cpu(struct cpu *cpu) | 70 | void unregister_cpu(struct cpu *cpu) |
| @@ -93,7 +84,17 @@ static ssize_t cpu_probe_store(struct device *dev, | |||
| 93 | const char *buf, | 84 | const char *buf, |
| 94 | size_t count) | 85 | size_t count) |
| 95 | { | 86 | { |
| 96 | return arch_cpu_probe(buf, count); | 87 | ssize_t cnt; |
| 88 | int ret; | ||
| 89 | |||
| 90 | ret = lock_device_hotplug_sysfs(); | ||
| 91 | if (ret) | ||
| 92 | return ret; | ||
| 93 | |||
| 94 | cnt = arch_cpu_probe(buf, count); | ||
| 95 | |||
| 96 | unlock_device_hotplug(); | ||
| 97 | return cnt; | ||
| 97 | } | 98 | } |
| 98 | 99 | ||
| 99 | static ssize_t cpu_release_store(struct device *dev, | 100 | static ssize_t cpu_release_store(struct device *dev, |
| @@ -101,7 +102,17 @@ static ssize_t cpu_release_store(struct device *dev, | |||
| 101 | const char *buf, | 102 | const char *buf, |
| 102 | size_t count) | 103 | size_t count) |
| 103 | { | 104 | { |
| 104 | return arch_cpu_release(buf, count); | 105 | ssize_t cnt; |
| 106 | int ret; | ||
| 107 | |||
| 108 | ret = lock_device_hotplug_sysfs(); | ||
| 109 | if (ret) | ||
| 110 | return ret; | ||
| 111 | |||
| 112 | cnt = arch_cpu_release(buf, count); | ||
| 113 | |||
| 114 | unlock_device_hotplug(); | ||
| 115 | return cnt; | ||
| 105 | } | 116 | } |
| 106 | 117 | ||
| 107 | static DEVICE_ATTR(probe, S_IWUSR, NULL, cpu_probe_store); | 118 | static DEVICE_ATTR(probe, S_IWUSR, NULL, cpu_probe_store); |
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 9e59f6535c44..bece691cb5d9 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c | |||
| @@ -333,8 +333,10 @@ store_mem_state(struct device *dev, | |||
| 333 | online_type = ONLINE_KEEP; | 333 | online_type = ONLINE_KEEP; |
| 334 | else if (!strncmp(buf, "offline", min_t(int, count, 7))) | 334 | else if (!strncmp(buf, "offline", min_t(int, count, 7))) |
| 335 | online_type = -1; | 335 | online_type = -1; |
| 336 | else | 336 | else { |
| 337 | return -EINVAL; | 337 | ret = -EINVAL; |
| 338 | goto err; | ||
| 339 | } | ||
| 338 | 340 | ||
| 339 | switch (online_type) { | 341 | switch (online_type) { |
| 340 | case ONLINE_KERNEL: | 342 | case ONLINE_KERNEL: |
| @@ -357,6 +359,7 @@ store_mem_state(struct device *dev, | |||
| 357 | ret = -EINVAL; /* should never happen */ | 359 | ret = -EINVAL; /* should never happen */ |
| 358 | } | 360 | } |
| 359 | 361 | ||
| 362 | err: | ||
| 360 | unlock_device_hotplug(); | 363 | unlock_device_hotplug(); |
| 361 | 364 | ||
| 362 | if (ret) | 365 | if (ret) |
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 9f098a82cf04..ee039afe9078 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
| @@ -30,6 +30,8 @@ | |||
| 30 | #include <linux/suspend.h> | 30 | #include <linux/suspend.h> |
| 31 | #include <trace/events/power.h> | 31 | #include <trace/events/power.h> |
| 32 | #include <linux/cpuidle.h> | 32 | #include <linux/cpuidle.h> |
| 33 | #include <linux/timer.h> | ||
| 34 | |||
| 33 | #include "../base.h" | 35 | #include "../base.h" |
| 34 | #include "power.h" | 36 | #include "power.h" |
| 35 | 37 | ||
| @@ -390,6 +392,71 @@ static int dpm_run_callback(pm_callback_t cb, struct device *dev, | |||
| 390 | return error; | 392 | return error; |
| 391 | } | 393 | } |
| 392 | 394 | ||
| 395 | #ifdef CONFIG_DPM_WATCHDOG | ||
| 396 | struct dpm_watchdog { | ||
| 397 | struct device *dev; | ||
| 398 | struct task_struct *tsk; | ||
| 399 | struct timer_list timer; | ||
| 400 | }; | ||
| 401 | |||
| 402 | #define DECLARE_DPM_WATCHDOG_ON_STACK(wd) \ | ||
| 403 | struct dpm_watchdog wd | ||
| 404 | |||
| 405 | /** | ||
| 406 | * dpm_watchdog_handler - Driver suspend / resume watchdog handler. | ||
| 407 | * @data: Watchdog object address. | ||
| 408 | * | ||
| 409 | * Called when a driver has timed out suspending or resuming. | ||
| 410 | * There's not much we can do here to recover so panic() to | ||
| 411 | * capture a crash-dump in pstore. | ||
| 412 | */ | ||
| 413 | static void dpm_watchdog_handler(unsigned long data) | ||
| 414 | { | ||
| 415 | struct dpm_watchdog *wd = (void *)data; | ||
| 416 | |||
| 417 | dev_emerg(wd->dev, "**** DPM device timeout ****\n"); | ||
| 418 | show_stack(wd->tsk, NULL); | ||
| 419 | panic("%s %s: unrecoverable failure\n", | ||
| 420 | dev_driver_string(wd->dev), dev_name(wd->dev)); | ||
| 421 | } | ||
| 422 | |||
| 423 | /** | ||
| 424 | * dpm_watchdog_set - Enable pm watchdog for given device. | ||
| 425 | * @wd: Watchdog. Must be allocated on the stack. | ||
| 426 | * @dev: Device to handle. | ||
| 427 | */ | ||
| 428 | static void dpm_watchdog_set(struct dpm_watchdog *wd, struct device *dev) | ||
| 429 | { | ||
| 430 | struct timer_list *timer = &wd->timer; | ||
| 431 | |||
| 432 | wd->dev = dev; | ||
| 433 | wd->tsk = current; | ||
| 434 | |||
| 435 | init_timer_on_stack(timer); | ||
| 436 | /* use same timeout value for both suspend and resume */ | ||
| 437 | timer->expires = jiffies + HZ * CONFIG_DPM_WATCHDOG_TIMEOUT; | ||
| 438 | timer->function = dpm_watchdog_handler; | ||
| 439 | timer->data = (unsigned long)wd; | ||
| 440 | add_timer(timer); | ||
| 441 | } | ||
| 442 | |||
| 443 | /** | ||
| 444 | * dpm_watchdog_clear - Disable suspend/resume watchdog. | ||
| 445 | * @wd: Watchdog to disable. | ||
| 446 | */ | ||
| 447 | static void dpm_watchdog_clear(struct dpm_watchdog *wd) | ||
| 448 | { | ||
| 449 | struct timer_list *timer = &wd->timer; | ||
| 450 | |||
| 451 | del_timer_sync(timer); | ||
| 452 | destroy_timer_on_stack(timer); | ||
| 453 | } | ||
| 454 | #else | ||
| 455 | #define DECLARE_DPM_WATCHDOG_ON_STACK(wd) | ||
| 456 | #define dpm_watchdog_set(x, y) | ||
| 457 | #define dpm_watchdog_clear(x) | ||
| 458 | #endif | ||
| 459 | |||
| 393 | /*------------------------- Resume routines -------------------------*/ | 460 | /*------------------------- Resume routines -------------------------*/ |
| 394 | 461 | ||
| 395 | /** | 462 | /** |
| @@ -576,6 +643,7 @@ static int device_resume(struct device *dev, pm_message_t state, bool async) | |||
| 576 | pm_callback_t callback = NULL; | 643 | pm_callback_t callback = NULL; |
| 577 | char *info = NULL; | 644 | char *info = NULL; |
| 578 | int error = 0; | 645 | int error = 0; |
| 646 | DECLARE_DPM_WATCHDOG_ON_STACK(wd); | ||
| 579 | 647 | ||
| 580 | TRACE_DEVICE(dev); | 648 | TRACE_DEVICE(dev); |
| 581 | TRACE_RESUME(0); | 649 | TRACE_RESUME(0); |
| @@ -584,6 +652,7 @@ static int device_resume(struct device *dev, pm_message_t state, bool async) | |||
| 584 | goto Complete; | 652 | goto Complete; |
| 585 | 653 | ||
| 586 | dpm_wait(dev->parent, async); | 654 | dpm_wait(dev->parent, async); |
| 655 | dpm_watchdog_set(&wd, dev); | ||
| 587 | device_lock(dev); | 656 | device_lock(dev); |
| 588 | 657 | ||
| 589 | /* | 658 | /* |
| @@ -642,6 +711,7 @@ static int device_resume(struct device *dev, pm_message_t state, bool async) | |||
| 642 | 711 | ||
| 643 | Unlock: | 712 | Unlock: |
| 644 | device_unlock(dev); | 713 | device_unlock(dev); |
| 714 | dpm_watchdog_clear(&wd); | ||
| 645 | 715 | ||
| 646 | Complete: | 716 | Complete: |
| 647 | complete_all(&dev->power.completion); | 717 | complete_all(&dev->power.completion); |
| @@ -1060,6 +1130,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) | |||
| 1060 | pm_callback_t callback = NULL; | 1130 | pm_callback_t callback = NULL; |
| 1061 | char *info = NULL; | 1131 | char *info = NULL; |
| 1062 | int error = 0; | 1132 | int error = 0; |
| 1133 | DECLARE_DPM_WATCHDOG_ON_STACK(wd); | ||
| 1063 | 1134 | ||
| 1064 | dpm_wait_for_children(dev, async); | 1135 | dpm_wait_for_children(dev, async); |
| 1065 | 1136 | ||
| @@ -1083,6 +1154,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) | |||
| 1083 | if (dev->power.syscore) | 1154 | if (dev->power.syscore) |
| 1084 | goto Complete; | 1155 | goto Complete; |
| 1085 | 1156 | ||
| 1157 | dpm_watchdog_set(&wd, dev); | ||
| 1086 | device_lock(dev); | 1158 | device_lock(dev); |
| 1087 | 1159 | ||
| 1088 | if (dev->pm_domain) { | 1160 | if (dev->pm_domain) { |
| @@ -1139,6 +1211,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) | |||
| 1139 | } | 1211 | } |
| 1140 | 1212 | ||
| 1141 | device_unlock(dev); | 1213 | device_unlock(dev); |
| 1214 | dpm_watchdog_clear(&wd); | ||
| 1142 | 1215 | ||
| 1143 | Complete: | 1216 | Complete: |
| 1144 | complete_all(&dev->power.completion); | 1217 | complete_all(&dev->power.completion); |
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index ef89897c6043..fa4187418440 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/list.h> | 21 | #include <linux/list.h> |
| 22 | #include <linux/rculist.h> | 22 | #include <linux/rculist.h> |
| 23 | #include <linux/rcupdate.h> | 23 | #include <linux/rcupdate.h> |
| 24 | #include <linux/opp.h> | 24 | #include <linux/pm_opp.h> |
| 25 | #include <linux/of.h> | 25 | #include <linux/of.h> |
| 26 | #include <linux/export.h> | 26 | #include <linux/export.h> |
| 27 | 27 | ||
| @@ -42,7 +42,7 @@ | |||
| 42 | */ | 42 | */ |
| 43 | 43 | ||
| 44 | /** | 44 | /** |
| 45 | * struct opp - Generic OPP description structure | 45 | * struct dev_pm_opp - Generic OPP description structure |
| 46 | * @node: opp list node. The nodes are maintained throughout the lifetime | 46 | * @node: opp list node. The nodes are maintained throughout the lifetime |
| 47 | * of boot. It is expected only an optimal set of OPPs are | 47 | * of boot. It is expected only an optimal set of OPPs are |
| 48 | * added to the library by the SoC framework. | 48 | * added to the library by the SoC framework. |
| @@ -59,7 +59,7 @@ | |||
| 59 | * | 59 | * |
| 60 | * This structure stores the OPP information for a given device. | 60 | * This structure stores the OPP information for a given device. |
| 61 | */ | 61 | */ |
| 62 | struct opp { | 62 | struct dev_pm_opp { |
| 63 | struct list_head node; | 63 | struct list_head node; |
| 64 | 64 | ||
| 65 | bool available; | 65 | bool available; |
| @@ -136,7 +136,7 @@ static struct device_opp *find_device_opp(struct device *dev) | |||
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | /** | 138 | /** |
| 139 | * opp_get_voltage() - Gets the voltage corresponding to an available opp | 139 | * dev_pm_opp_get_voltage() - Gets the voltage corresponding to an available opp |
| 140 | * @opp: opp for which voltage has to be returned for | 140 | * @opp: opp for which voltage has to be returned for |
| 141 | * | 141 | * |
| 142 | * Return voltage in micro volt corresponding to the opp, else | 142 | * Return voltage in micro volt corresponding to the opp, else |
| @@ -150,9 +150,9 @@ static struct device_opp *find_device_opp(struct device *dev) | |||
| 150 | * prior to unlocking with rcu_read_unlock() to maintain the integrity of the | 150 | * prior to unlocking with rcu_read_unlock() to maintain the integrity of the |
| 151 | * pointer. | 151 | * pointer. |
| 152 | */ | 152 | */ |
| 153 | unsigned long opp_get_voltage(struct opp *opp) | 153 | unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp) |
| 154 | { | 154 | { |
| 155 | struct opp *tmp_opp; | 155 | struct dev_pm_opp *tmp_opp; |
| 156 | unsigned long v = 0; | 156 | unsigned long v = 0; |
| 157 | 157 | ||
| 158 | tmp_opp = rcu_dereference(opp); | 158 | tmp_opp = rcu_dereference(opp); |
| @@ -163,10 +163,10 @@ unsigned long opp_get_voltage(struct opp *opp) | |||
| 163 | 163 | ||
| 164 | return v; | 164 | return v; |
| 165 | } | 165 | } |
| 166 | EXPORT_SYMBOL_GPL(opp_get_voltage); | 166 | EXPORT_SYMBOL_GPL(dev_pm_opp_get_voltage); |
| 167 | 167 | ||
| 168 | /** | 168 | /** |
| 169 | * opp_get_freq() - Gets the frequency corresponding to an available opp | 169 | * dev_pm_opp_get_freq() - Gets the frequency corresponding to an available opp |
| 170 | * @opp: opp for which frequency has to be returned for | 170 | * @opp: opp for which frequency has to be returned for |
| 171 | * | 171 | * |
| 172 | * Return frequency in hertz corresponding to the opp, else | 172 | * Return frequency in hertz corresponding to the opp, else |
| @@ -180,9 +180,9 @@ EXPORT_SYMBOL_GPL(opp_get_voltage); | |||
| 180 | * prior to unlocking with rcu_read_unlock() to maintain the integrity of the | 180 | * prior to unlocking with rcu_read_unlock() to maintain the integrity of the |
| 181 | * pointer. | 181 | * pointer. |
| 182 | */ | 182 | */ |
| 183 | unsigned long opp_get_freq(struct opp *opp) | 183 | unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp) |
| 184 | { | 184 | { |
| 185 | struct opp *tmp_opp; | 185 | struct dev_pm_opp *tmp_opp; |
| 186 | unsigned long f = 0; | 186 | unsigned long f = 0; |
| 187 | 187 | ||
| 188 | tmp_opp = rcu_dereference(opp); | 188 | tmp_opp = rcu_dereference(opp); |
| @@ -193,10 +193,10 @@ unsigned long opp_get_freq(struct opp *opp) | |||
| 193 | 193 | ||
| 194 | return f; | 194 | return f; |
| 195 | } | 195 | } |
| 196 | EXPORT_SYMBOL_GPL(opp_get_freq); | 196 | EXPORT_SYMBOL_GPL(dev_pm_opp_get_freq); |
| 197 | 197 | ||
| 198 | /** | 198 | /** |
| 199 | * opp_get_opp_count() - Get number of opps available in the opp list | 199 | * dev_pm_opp_get_opp_count() - Get number of opps available in the opp list |
| 200 | * @dev: device for which we do this operation | 200 | * @dev: device for which we do this operation |
| 201 | * | 201 | * |
| 202 | * This function returns the number of available opps if there are any, | 202 | * This function returns the number of available opps if there are any, |
| @@ -206,10 +206,10 @@ EXPORT_SYMBOL_GPL(opp_get_freq); | |||
| 206 | * internally references two RCU protected structures: device_opp and opp which | 206 | * internally references two RCU protected structures: device_opp and opp which |
| 207 | * are safe as long as we are under a common RCU locked section. | 207 | * are safe as long as we are under a common RCU locked section. |
| 208 | */ | 208 | */ |
| 209 | int opp_get_opp_count(struct device *dev) | 209 | int dev_pm_opp_get_opp_count(struct device *dev) |
| 210 | { | 210 | { |
| 211 | struct device_opp *dev_opp; | 211 | struct device_opp *dev_opp; |
| 212 | struct opp *temp_opp; | 212 | struct dev_pm_opp *temp_opp; |
| 213 | int count = 0; | 213 | int count = 0; |
| 214 | 214 | ||
| 215 | dev_opp = find_device_opp(dev); | 215 | dev_opp = find_device_opp(dev); |
| @@ -226,10 +226,10 @@ int opp_get_opp_count(struct device *dev) | |||
| 226 | 226 | ||
| 227 | return count; | 227 | return count; |
| 228 | } | 228 | } |
| 229 | EXPORT_SYMBOL_GPL(opp_get_opp_count); | 229 | EXPORT_SYMBOL_GPL(dev_pm_opp_get_opp_count); |
| 230 | 230 | ||
| 231 | /** | 231 | /** |
| 232 | * opp_find_freq_exact() - search for an exact frequency | 232 | * dev_pm_opp_find_freq_exact() - search for an exact frequency |
| 233 | * @dev: device for which we do this operation | 233 | * @dev: device for which we do this operation |
| 234 | * @freq: frequency to search for | 234 | * @freq: frequency to search for |
| 235 | * @available: true/false - match for available opp | 235 | * @available: true/false - match for available opp |
| @@ -254,11 +254,12 @@ EXPORT_SYMBOL_GPL(opp_get_opp_count); | |||
| 254 | * under the locked area. The pointer returned must be used prior to unlocking | 254 | * under the locked area. The pointer returned must be used prior to unlocking |
| 255 | * with rcu_read_unlock() to maintain the integrity of the pointer. | 255 | * with rcu_read_unlock() to maintain the integrity of the pointer. |
| 256 | */ | 256 | */ |
| 257 | struct opp *opp_find_freq_exact(struct device *dev, unsigned long freq, | 257 | struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev, |
| 258 | bool available) | 258 | unsigned long freq, |
| 259 | bool available) | ||
| 259 | { | 260 | { |
| 260 | struct device_opp *dev_opp; | 261 | struct device_opp *dev_opp; |
| 261 | struct opp *temp_opp, *opp = ERR_PTR(-ERANGE); | 262 | struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE); |
| 262 | 263 | ||
| 263 | dev_opp = find_device_opp(dev); | 264 | dev_opp = find_device_opp(dev); |
| 264 | if (IS_ERR(dev_opp)) { | 265 | if (IS_ERR(dev_opp)) { |
| @@ -277,10 +278,10 @@ struct opp *opp_find_freq_exact(struct device *dev, unsigned long freq, | |||
| 277 | 278 | ||
| 278 | return opp; | 279 | return opp; |
| 279 | } | 280 | } |
| 280 | EXPORT_SYMBOL_GPL(opp_find_freq_exact); | 281 | EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_exact); |
| 281 | 282 | ||
| 282 | /** | 283 | /** |
| 283 | * opp_find_freq_ceil() - Search for an rounded ceil freq | 284 | * dev_pm_opp_find_freq_ceil() - Search for an rounded ceil freq |
| 284 | * @dev: device for which we do this operation | 285 | * @dev: device for which we do this operation |
| 285 | * @freq: Start frequency | 286 | * @freq: Start frequency |
| 286 | * | 287 | * |
| @@ -300,10 +301,11 @@ EXPORT_SYMBOL_GPL(opp_find_freq_exact); | |||
| 300 | * under the locked area. The pointer returned must be used prior to unlocking | 301 | * under the locked area. The pointer returned must be used prior to unlocking |
| 301 | * with rcu_read_unlock() to maintain the integrity of the pointer. | 302 | * with rcu_read_unlock() to maintain the integrity of the pointer. |
| 302 | */ | 303 | */ |
| 303 | struct opp *opp_find_freq_ceil(struct device *dev, unsigned long *freq) | 304 | struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev, |
| 305 | unsigned long *freq) | ||
| 304 | { | 306 | { |
| 305 | struct device_opp *dev_opp; | 307 | struct device_opp *dev_opp; |
| 306 | struct opp *temp_opp, *opp = ERR_PTR(-ERANGE); | 308 | struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE); |
| 307 | 309 | ||
| 308 | if (!dev || !freq) { | 310 | if (!dev || !freq) { |
| 309 | dev_err(dev, "%s: Invalid argument freq=%p\n", __func__, freq); | 311 | dev_err(dev, "%s: Invalid argument freq=%p\n", __func__, freq); |
| @@ -324,10 +326,10 @@ struct opp *opp_find_freq_ceil(struct device *dev, unsigned long *freq) | |||
| 324 | 326 | ||
| 325 | return opp; | 327 | return opp; |
| 326 | } | 328 | } |
| 327 | EXPORT_SYMBOL_GPL(opp_find_freq_ceil); | 329 | EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_ceil); |
| 328 | 330 | ||
| 329 | /** | 331 | /** |
| 330 | * opp_find_freq_floor() - Search for a rounded floor freq | 332 | * dev_pm_opp_find_freq_floor() - Search for a rounded floor freq |
| 331 | * @dev: device for which we do this operation | 333 | * @dev: device for which we do this operation |
| 332 | * @freq: Start frequency | 334 | * @freq: Start frequency |
| 333 | * | 335 | * |
| @@ -347,10 +349,11 @@ EXPORT_SYMBOL_GPL(opp_find_freq_ceil); | |||
| 347 | * under the locked area. The pointer returned must be used prior to unlocking | 349 | * under the locked area. The pointer returned must be used prior to unlocking |
| 348 | * with rcu_read_unlock() to maintain the integrity of the pointer. | 350 | * with rcu_read_unlock() to maintain the integrity of the pointer. |
| 349 | */ | 351 | */ |
| 350 | struct opp *opp_find_freq_floor(struct device *dev, unsigned long *freq) | 352 | struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev, |
| 353 | unsigned long *freq) | ||
| 351 | { | 354 | { |
| 352 | struct device_opp *dev_opp; | 355 | struct device_opp *dev_opp; |
| 353 | struct opp *temp_opp, *opp = ERR_PTR(-ERANGE); | 356 | struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE); |
| 354 | 357 | ||
| 355 | if (!dev || !freq) { | 358 | if (!dev || !freq) { |
| 356 | dev_err(dev, "%s: Invalid argument freq=%p\n", __func__, freq); | 359 | dev_err(dev, "%s: Invalid argument freq=%p\n", __func__, freq); |
| @@ -375,17 +378,17 @@ struct opp *opp_find_freq_floor(struct device *dev, unsigned long *freq) | |||
| 375 | 378 | ||
| 376 | return opp; | 379 | return opp; |
| 377 | } | 380 | } |
| 378 | EXPORT_SYMBOL_GPL(opp_find_freq_floor); | 381 | EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_floor); |
| 379 | 382 | ||
| 380 | /** | 383 | /** |
| 381 | * opp_add() - Add an OPP table from a table definitions | 384 | * dev_pm_opp_add() - Add an OPP table from a table definitions |
| 382 | * @dev: device for which we do this operation | 385 | * @dev: device for which we do this operation |
| 383 | * @freq: Frequency in Hz for this OPP | 386 | * @freq: Frequency in Hz for this OPP |
| 384 | * @u_volt: Voltage in uVolts for this OPP | 387 | * @u_volt: Voltage in uVolts for this OPP |
| 385 | * | 388 | * |
| 386 | * This function adds an opp definition to the opp list and returns status. | 389 | * This function adds an opp definition to the opp list and returns status. |
| 387 | * The opp is made available by default and it can be controlled using | 390 | * The opp is made available by default and it can be controlled using |
| 388 | * opp_enable/disable functions. | 391 | * dev_pm_opp_enable/disable functions. |
| 389 | * | 392 | * |
| 390 | * Locking: The internal device_opp and opp structures are RCU protected. | 393 | * Locking: The internal device_opp and opp structures are RCU protected. |
| 391 | * Hence this function internally uses RCU updater strategy with mutex locks | 394 | * Hence this function internally uses RCU updater strategy with mutex locks |
| @@ -393,14 +396,14 @@ EXPORT_SYMBOL_GPL(opp_find_freq_floor); | |||
| 393 | * that this function is *NOT* called under RCU protection or in contexts where | 396 | * that this function is *NOT* called under RCU protection or in contexts where |
| 394 | * mutex cannot be locked. | 397 | * mutex cannot be locked. |
| 395 | */ | 398 | */ |
| 396 | int opp_add(struct device *dev, unsigned long freq, unsigned long u_volt) | 399 | int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt) |
| 397 | { | 400 | { |
| 398 | struct device_opp *dev_opp = NULL; | 401 | struct device_opp *dev_opp = NULL; |
| 399 | struct opp *opp, *new_opp; | 402 | struct dev_pm_opp *opp, *new_opp; |
| 400 | struct list_head *head; | 403 | struct list_head *head; |
| 401 | 404 | ||
| 402 | /* allocate new OPP node */ | 405 | /* allocate new OPP node */ |
| 403 | new_opp = kzalloc(sizeof(struct opp), GFP_KERNEL); | 406 | new_opp = kzalloc(sizeof(*new_opp), GFP_KERNEL); |
| 404 | if (!new_opp) { | 407 | if (!new_opp) { |
| 405 | dev_warn(dev, "%s: Unable to create new OPP node\n", __func__); | 408 | dev_warn(dev, "%s: Unable to create new OPP node\n", __func__); |
| 406 | return -ENOMEM; | 409 | return -ENOMEM; |
| @@ -460,7 +463,7 @@ int opp_add(struct device *dev, unsigned long freq, unsigned long u_volt) | |||
| 460 | srcu_notifier_call_chain(&dev_opp->head, OPP_EVENT_ADD, new_opp); | 463 | srcu_notifier_call_chain(&dev_opp->head, OPP_EVENT_ADD, new_opp); |
| 461 | return 0; | 464 | return 0; |
| 462 | } | 465 | } |
| 463 | EXPORT_SYMBOL_GPL(opp_add); | 466 | EXPORT_SYMBOL_GPL(dev_pm_opp_add); |
| 464 | 467 | ||
| 465 | /** | 468 | /** |
| 466 | * opp_set_availability() - helper to set the availability of an opp | 469 | * opp_set_availability() - helper to set the availability of an opp |
| @@ -485,11 +488,11 @@ static int opp_set_availability(struct device *dev, unsigned long freq, | |||
| 485 | bool availability_req) | 488 | bool availability_req) |
| 486 | { | 489 | { |
| 487 | struct device_opp *tmp_dev_opp, *dev_opp = ERR_PTR(-ENODEV); | 490 | struct device_opp *tmp_dev_opp, *dev_opp = ERR_PTR(-ENODEV); |
| 488 | struct opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV); | 491 | struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV); |
| 489 | int r = 0; | 492 | int r = 0; |
| 490 | 493 | ||
| 491 | /* keep the node allocated */ | 494 | /* keep the node allocated */ |
| 492 | new_opp = kmalloc(sizeof(struct opp), GFP_KERNEL); | 495 | new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL); |
| 493 | if (!new_opp) { | 496 | if (!new_opp) { |
| 494 | dev_warn(dev, "%s: Unable to create OPP\n", __func__); | 497 | dev_warn(dev, "%s: Unable to create OPP\n", __func__); |
| 495 | return -ENOMEM; | 498 | return -ENOMEM; |
| @@ -552,13 +555,13 @@ unlock: | |||
| 552 | } | 555 | } |
| 553 | 556 | ||
| 554 | /** | 557 | /** |
| 555 | * opp_enable() - Enable a specific OPP | 558 | * dev_pm_opp_enable() - Enable a specific OPP |
| 556 | * @dev: device for which we do this operation | 559 | * @dev: device for which we do this operation |
| 557 | * @freq: OPP frequency to enable | 560 | * @freq: OPP frequency to enable |
| 558 | * | 561 | * |
| 559 | * Enables a provided opp. If the operation is valid, this returns 0, else the | 562 | * Enables a provided opp. If the operation is valid, this returns 0, else the |
| 560 | * corresponding error value. It is meant to be used for users an OPP available | 563 | * corresponding error value. It is meant to be used for users an OPP available |
| 561 | * after being temporarily made unavailable with opp_disable. | 564 | * after being temporarily made unavailable with dev_pm_opp_disable. |
| 562 | * | 565 | * |
| 563 | * Locking: The internal device_opp and opp structures are RCU protected. | 566 | * Locking: The internal device_opp and opp structures are RCU protected. |
| 564 | * Hence this function indirectly uses RCU and mutex locks to keep the | 567 | * Hence this function indirectly uses RCU and mutex locks to keep the |
| @@ -566,21 +569,21 @@ unlock: | |||
| 566 | * this function is *NOT* called under RCU protection or in contexts where | 569 | * this function is *NOT* called under RCU protection or in contexts where |
| 567 | * mutex locking or synchronize_rcu() blocking calls cannot be used. | 570 | * mutex locking or synchronize_rcu() blocking calls cannot be used. |
| 568 | */ | 571 | */ |
| 569 | int opp_enable(struct device *dev, unsigned long freq) | 572 | int dev_pm_opp_enable(struct device *dev, unsigned long freq) |
| 570 | { | 573 | { |
| 571 | return opp_set_availability(dev, freq, true); | 574 | return opp_set_availability(dev, freq, true); |
| 572 | } | 575 | } |
| 573 | EXPORT_SYMBOL_GPL(opp_enable); | 576 | EXPORT_SYMBOL_GPL(dev_pm_opp_enable); |
| 574 | 577 | ||
| 575 | /** | 578 | /** |
| 576 | * opp_disable() - Disable a specific OPP | 579 | * dev_pm_opp_disable() - Disable a specific OPP |
| 577 | * @dev: device for which we do this operation | 580 | * @dev: device for which we do this operation |
| 578 | * @freq: OPP frequency to disable | 581 | * @freq: OPP frequency to disable |
| 579 | * | 582 | * |
| 580 | * Disables a provided opp. If the operation is valid, this returns | 583 | * Disables a provided opp. If the operation is valid, this returns |
| 581 | * 0, else the corresponding error value. It is meant to be a temporary | 584 | * 0, else the corresponding error value. It is meant to be a temporary |
| 582 | * control by users to make this OPP not available until the circumstances are | 585 | * control by users to make this OPP not available until the circumstances are |
| 583 | * right to make it available again (with a call to opp_enable). | 586 | * right to make it available again (with a call to dev_pm_opp_enable). |
| 584 | * | 587 | * |
| 585 | * Locking: The internal device_opp and opp structures are RCU protected. | 588 | * Locking: The internal device_opp and opp structures are RCU protected. |
| 586 | * Hence this function indirectly uses RCU and mutex locks to keep the | 589 | * Hence this function indirectly uses RCU and mutex locks to keep the |
| @@ -588,15 +591,15 @@ EXPORT_SYMBOL_GPL(opp_enable); | |||
| 588 | * this function is *NOT* called under RCU protection or in contexts where | 591 | * this function is *NOT* called under RCU protection or in contexts where |
| 589 | * mutex locking or synchronize_rcu() blocking calls cannot be used. | 592 | * mutex locking or synchronize_rcu() blocking calls cannot be used. |
| 590 | */ | 593 | */ |
| 591 | int opp_disable(struct device *dev, unsigned long freq) | 594 | int dev_pm_opp_disable(struct device *dev, unsigned long freq) |
| 592 | { | 595 | { |
| 593 | return opp_set_availability(dev, freq, false); | 596 | return opp_set_availability(dev, freq, false); |
| 594 | } | 597 | } |
| 595 | EXPORT_SYMBOL_GPL(opp_disable); | 598 | EXPORT_SYMBOL_GPL(dev_pm_opp_disable); |
| 596 | 599 | ||
| 597 | #ifdef CONFIG_CPU_FREQ | 600 | #ifdef CONFIG_CPU_FREQ |
| 598 | /** | 601 | /** |
| 599 | * opp_init_cpufreq_table() - create a cpufreq table for a device | 602 | * dev_pm_opp_init_cpufreq_table() - create a cpufreq table for a device |
| 600 | * @dev: device for which we do this operation | 603 | * @dev: device for which we do this operation |
| 601 | * @table: Cpufreq table returned back to caller | 604 | * @table: Cpufreq table returned back to caller |
| 602 | * | 605 | * |
| @@ -619,11 +622,11 @@ EXPORT_SYMBOL_GPL(opp_disable); | |||
| 619 | * Callers should ensure that this function is *NOT* called under RCU protection | 622 | * Callers should ensure that this function is *NOT* called under RCU protection |
| 620 | * or in contexts where mutex locking cannot be used. | 623 | * or in contexts where mutex locking cannot be used. |
| 621 | */ | 624 | */ |
| 622 | int opp_init_cpufreq_table(struct device *dev, | 625 | int dev_pm_opp_init_cpufreq_table(struct device *dev, |
| 623 | struct cpufreq_frequency_table **table) | 626 | struct cpufreq_frequency_table **table) |
| 624 | { | 627 | { |
| 625 | struct device_opp *dev_opp; | 628 | struct device_opp *dev_opp; |
| 626 | struct opp *opp; | 629 | struct dev_pm_opp *opp; |
| 627 | struct cpufreq_frequency_table *freq_table; | 630 | struct cpufreq_frequency_table *freq_table; |
| 628 | int i = 0; | 631 | int i = 0; |
| 629 | 632 | ||
| @@ -639,7 +642,7 @@ int opp_init_cpufreq_table(struct device *dev, | |||
| 639 | } | 642 | } |
| 640 | 643 | ||
| 641 | freq_table = kzalloc(sizeof(struct cpufreq_frequency_table) * | 644 | freq_table = kzalloc(sizeof(struct cpufreq_frequency_table) * |
| 642 | (opp_get_opp_count(dev) + 1), GFP_KERNEL); | 645 | (dev_pm_opp_get_opp_count(dev) + 1), GFP_KERNEL); |
| 643 | if (!freq_table) { | 646 | if (!freq_table) { |
| 644 | mutex_unlock(&dev_opp_list_lock); | 647 | mutex_unlock(&dev_opp_list_lock); |
| 645 | dev_warn(dev, "%s: Unable to allocate frequency table\n", | 648 | dev_warn(dev, "%s: Unable to allocate frequency table\n", |
| @@ -663,16 +666,16 @@ int opp_init_cpufreq_table(struct device *dev, | |||
| 663 | 666 | ||
| 664 | return 0; | 667 | return 0; |
| 665 | } | 668 | } |
| 666 | EXPORT_SYMBOL_GPL(opp_init_cpufreq_table); | 669 | EXPORT_SYMBOL_GPL(dev_pm_opp_init_cpufreq_table); |
| 667 | 670 | ||
| 668 | /** | 671 | /** |
| 669 | * opp_free_cpufreq_table() - free the cpufreq table | 672 | * dev_pm_opp_free_cpufreq_table() - free the cpufreq table |
| 670 | * @dev: device for which we do this operation | 673 | * @dev: device for which we do this operation |
| 671 | * @table: table to free | 674 | * @table: table to free |
| 672 | * | 675 | * |
| 673 | * Free up the table allocated by opp_init_cpufreq_table | 676 | * Free up the table allocated by dev_pm_opp_init_cpufreq_table |
| 674 | */ | 677 | */ |
| 675 | void opp_free_cpufreq_table(struct device *dev, | 678 | void dev_pm_opp_free_cpufreq_table(struct device *dev, |
| 676 | struct cpufreq_frequency_table **table) | 679 | struct cpufreq_frequency_table **table) |
| 677 | { | 680 | { |
| 678 | if (!table) | 681 | if (!table) |
| @@ -681,14 +684,14 @@ void opp_free_cpufreq_table(struct device *dev, | |||
| 681 | kfree(*table); | 684 | kfree(*table); |
| 682 | *table = NULL; | 685 | *table = NULL; |
| 683 | } | 686 | } |
| 684 | EXPORT_SYMBOL_GPL(opp_free_cpufreq_table); | 687 | EXPORT_SYMBOL_GPL(dev_pm_opp_free_cpufreq_table); |
| 685 | #endif /* CONFIG_CPU_FREQ */ | 688 | #endif /* CONFIG_CPU_FREQ */ |
| 686 | 689 | ||
| 687 | /** | 690 | /** |
| 688 | * opp_get_notifier() - find notifier_head of the device with opp | 691 | * dev_pm_opp_get_notifier() - find notifier_head of the device with opp |
| 689 | * @dev: device pointer used to lookup device OPPs. | 692 | * @dev: device pointer used to lookup device OPPs. |
| 690 | */ | 693 | */ |
| 691 | struct srcu_notifier_head *opp_get_notifier(struct device *dev) | 694 | struct srcu_notifier_head *dev_pm_opp_get_notifier(struct device *dev) |
| 692 | { | 695 | { |
| 693 | struct device_opp *dev_opp = find_device_opp(dev); | 696 | struct device_opp *dev_opp = find_device_opp(dev); |
| 694 | 697 | ||
| @@ -732,7 +735,7 @@ int of_init_opp_table(struct device *dev) | |||
| 732 | unsigned long freq = be32_to_cpup(val++) * 1000; | 735 | unsigned long freq = be32_to_cpup(val++) * 1000; |
| 733 | unsigned long volt = be32_to_cpup(val++); | 736 | unsigned long volt = be32_to_cpup(val++); |
| 734 | 737 | ||
| 735 | if (opp_add(dev, freq, volt)) { | 738 | if (dev_pm_opp_add(dev, freq, volt)) { |
| 736 | dev_warn(dev, "%s: Failed to add OPP %ld\n", | 739 | dev_warn(dev, "%s: Failed to add OPP %ld\n", |
| 737 | __func__, freq); | 740 | __func__, freq); |
| 738 | continue; | 741 | continue; |
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 268a35097578..72e00e66ecc5 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c | |||
| @@ -258,7 +258,8 @@ static int __rpm_callback(int (*cb)(struct device *), struct device *dev) | |||
| 258 | * Check if the device's runtime PM status allows it to be suspended. If | 258 | * Check if the device's runtime PM status allows it to be suspended. If |
| 259 | * another idle notification has been started earlier, return immediately. If | 259 | * another idle notification has been started earlier, return immediately. If |
| 260 | * the RPM_ASYNC flag is set then queue an idle-notification request; otherwise | 260 | * the RPM_ASYNC flag is set then queue an idle-notification request; otherwise |
| 261 | * run the ->runtime_idle() callback directly. | 261 | * run the ->runtime_idle() callback directly. If the ->runtime_idle callback |
| 262 | * doesn't exist or if it returns 0, call rpm_suspend with the RPM_AUTO flag. | ||
| 262 | * | 263 | * |
| 263 | * This function must be called under dev->power.lock with interrupts disabled. | 264 | * This function must be called under dev->power.lock with interrupts disabled. |
| 264 | */ | 265 | */ |
| @@ -331,7 +332,7 @@ static int rpm_idle(struct device *dev, int rpmflags) | |||
| 331 | 332 | ||
| 332 | out: | 333 | out: |
| 333 | trace_rpm_return_int(dev, _THIS_IP_, retval); | 334 | trace_rpm_return_int(dev, _THIS_IP_, retval); |
| 334 | return retval ? retval : rpm_suspend(dev, rpmflags); | 335 | return retval ? retval : rpm_suspend(dev, rpmflags | RPM_AUTO); |
| 335 | } | 336 | } |
| 336 | 337 | ||
| 337 | /** | 338 | /** |
diff --git a/drivers/char/random.c b/drivers/char/random.c index 7737b5bd26af..7a744d391756 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
| @@ -640,7 +640,7 @@ struct timer_rand_state { | |||
| 640 | */ | 640 | */ |
| 641 | void add_device_randomness(const void *buf, unsigned int size) | 641 | void add_device_randomness(const void *buf, unsigned int size) |
| 642 | { | 642 | { |
| 643 | unsigned long time = get_cycles() ^ jiffies; | 643 | unsigned long time = random_get_entropy() ^ jiffies; |
| 644 | 644 | ||
| 645 | mix_pool_bytes(&input_pool, buf, size, NULL); | 645 | mix_pool_bytes(&input_pool, buf, size, NULL); |
| 646 | mix_pool_bytes(&input_pool, &time, sizeof(time), NULL); | 646 | mix_pool_bytes(&input_pool, &time, sizeof(time), NULL); |
| @@ -677,7 +677,7 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num) | |||
| 677 | goto out; | 677 | goto out; |
| 678 | 678 | ||
| 679 | sample.jiffies = jiffies; | 679 | sample.jiffies = jiffies; |
| 680 | sample.cycles = get_cycles(); | 680 | sample.cycles = random_get_entropy(); |
| 681 | sample.num = num; | 681 | sample.num = num; |
| 682 | mix_pool_bytes(&input_pool, &sample, sizeof(sample), NULL); | 682 | mix_pool_bytes(&input_pool, &sample, sizeof(sample), NULL); |
| 683 | 683 | ||
| @@ -744,7 +744,7 @@ void add_interrupt_randomness(int irq, int irq_flags) | |||
| 744 | struct fast_pool *fast_pool = &__get_cpu_var(irq_randomness); | 744 | struct fast_pool *fast_pool = &__get_cpu_var(irq_randomness); |
| 745 | struct pt_regs *regs = get_irq_regs(); | 745 | struct pt_regs *regs = get_irq_regs(); |
| 746 | unsigned long now = jiffies; | 746 | unsigned long now = jiffies; |
| 747 | __u32 input[4], cycles = get_cycles(); | 747 | __u32 input[4], cycles = random_get_entropy(); |
| 748 | 748 | ||
| 749 | input[0] = cycles ^ jiffies; | 749 | input[0] = cycles ^ jiffies; |
| 750 | input[1] = irq; | 750 | input[1] = irq; |
| @@ -1459,12 +1459,11 @@ struct ctl_table random_table[] = { | |||
| 1459 | 1459 | ||
| 1460 | static u32 random_int_secret[MD5_MESSAGE_BYTES / 4] ____cacheline_aligned; | 1460 | static u32 random_int_secret[MD5_MESSAGE_BYTES / 4] ____cacheline_aligned; |
| 1461 | 1461 | ||
| 1462 | static int __init random_int_secret_init(void) | 1462 | int random_int_secret_init(void) |
| 1463 | { | 1463 | { |
| 1464 | get_random_bytes(random_int_secret, sizeof(random_int_secret)); | 1464 | get_random_bytes(random_int_secret, sizeof(random_int_secret)); |
| 1465 | return 0; | 1465 | return 0; |
| 1466 | } | 1466 | } |
| 1467 | late_initcall(random_int_secret_init); | ||
| 1468 | 1467 | ||
| 1469 | /* | 1468 | /* |
| 1470 | * Get a random word for internal kernel use only. Similar to urandom but | 1469 | * Get a random word for internal kernel use only. Similar to urandom but |
| @@ -1483,7 +1482,7 @@ unsigned int get_random_int(void) | |||
| 1483 | 1482 | ||
| 1484 | hash = get_cpu_var(get_random_int_hash); | 1483 | hash = get_cpu_var(get_random_int_hash); |
| 1485 | 1484 | ||
| 1486 | hash[0] += current->pid + jiffies + get_cycles(); | 1485 | hash[0] += current->pid + jiffies + random_get_entropy(); |
| 1487 | md5_transform(hash, random_int_secret); | 1486 | md5_transform(hash, random_int_secret); |
| 1488 | ret = hash[0]; | 1487 | ret = hash[0]; |
| 1489 | put_cpu_var(get_random_int_hash); | 1488 | put_cpu_var(get_random_int_hash); |
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c index 06189e55b4e5..94c280d36e8b 100644 --- a/drivers/char/tpm/xen-tpmfront.c +++ b/drivers/char/tpm/xen-tpmfront.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 11 | #include <linux/err.h> | 11 | #include <linux/err.h> |
| 12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
| 13 | #include <xen/xen.h> | ||
| 13 | #include <xen/events.h> | 14 | #include <xen/events.h> |
| 14 | #include <xen/interface/io/tpmif.h> | 15 | #include <xen/interface/io/tpmif.h> |
| 15 | #include <xen/grant_table.h> | 16 | #include <xen/grant_table.h> |
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c index 08ae128cce9b..c73fc2b74de2 100644 --- a/drivers/connector/cn_proc.c +++ b/drivers/connector/cn_proc.c | |||
| @@ -65,6 +65,7 @@ void proc_fork_connector(struct task_struct *task) | |||
| 65 | 65 | ||
| 66 | msg = (struct cn_msg *)buffer; | 66 | msg = (struct cn_msg *)buffer; |
| 67 | ev = (struct proc_event *)msg->data; | 67 | ev = (struct proc_event *)msg->data; |
| 68 | memset(&ev->event_data, 0, sizeof(ev->event_data)); | ||
| 68 | get_seq(&msg->seq, &ev->cpu); | 69 | get_seq(&msg->seq, &ev->cpu); |
| 69 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ | 70 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ |
| 70 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); | 71 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); |
| @@ -80,6 +81,7 @@ void proc_fork_connector(struct task_struct *task) | |||
| 80 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); | 81 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); |
| 81 | msg->ack = 0; /* not used */ | 82 | msg->ack = 0; /* not used */ |
| 82 | msg->len = sizeof(*ev); | 83 | msg->len = sizeof(*ev); |
| 84 | msg->flags = 0; /* not used */ | ||
| 83 | /* If cn_netlink_send() failed, the data is not sent */ | 85 | /* If cn_netlink_send() failed, the data is not sent */ |
| 84 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); | 86 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); |
| 85 | } | 87 | } |
| @@ -96,6 +98,7 @@ void proc_exec_connector(struct task_struct *task) | |||
| 96 | 98 | ||
| 97 | msg = (struct cn_msg *)buffer; | 99 | msg = (struct cn_msg *)buffer; |
| 98 | ev = (struct proc_event *)msg->data; | 100 | ev = (struct proc_event *)msg->data; |
| 101 | memset(&ev->event_data, 0, sizeof(ev->event_data)); | ||
| 99 | get_seq(&msg->seq, &ev->cpu); | 102 | get_seq(&msg->seq, &ev->cpu); |
| 100 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ | 103 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ |
| 101 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); | 104 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); |
| @@ -106,6 +109,7 @@ void proc_exec_connector(struct task_struct *task) | |||
| 106 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); | 109 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); |
| 107 | msg->ack = 0; /* not used */ | 110 | msg->ack = 0; /* not used */ |
| 108 | msg->len = sizeof(*ev); | 111 | msg->len = sizeof(*ev); |
| 112 | msg->flags = 0; /* not used */ | ||
| 109 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); | 113 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); |
| 110 | } | 114 | } |
| 111 | 115 | ||
| @@ -122,6 +126,7 @@ void proc_id_connector(struct task_struct *task, int which_id) | |||
| 122 | 126 | ||
| 123 | msg = (struct cn_msg *)buffer; | 127 | msg = (struct cn_msg *)buffer; |
| 124 | ev = (struct proc_event *)msg->data; | 128 | ev = (struct proc_event *)msg->data; |
| 129 | memset(&ev->event_data, 0, sizeof(ev->event_data)); | ||
| 125 | ev->what = which_id; | 130 | ev->what = which_id; |
| 126 | ev->event_data.id.process_pid = task->pid; | 131 | ev->event_data.id.process_pid = task->pid; |
| 127 | ev->event_data.id.process_tgid = task->tgid; | 132 | ev->event_data.id.process_tgid = task->tgid; |
| @@ -145,6 +150,7 @@ void proc_id_connector(struct task_struct *task, int which_id) | |||
| 145 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); | 150 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); |
| 146 | msg->ack = 0; /* not used */ | 151 | msg->ack = 0; /* not used */ |
| 147 | msg->len = sizeof(*ev); | 152 | msg->len = sizeof(*ev); |
| 153 | msg->flags = 0; /* not used */ | ||
| 148 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); | 154 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); |
| 149 | } | 155 | } |
| 150 | 156 | ||
| @@ -160,6 +166,7 @@ void proc_sid_connector(struct task_struct *task) | |||
| 160 | 166 | ||
| 161 | msg = (struct cn_msg *)buffer; | 167 | msg = (struct cn_msg *)buffer; |
| 162 | ev = (struct proc_event *)msg->data; | 168 | ev = (struct proc_event *)msg->data; |
| 169 | memset(&ev->event_data, 0, sizeof(ev->event_data)); | ||
| 163 | get_seq(&msg->seq, &ev->cpu); | 170 | get_seq(&msg->seq, &ev->cpu); |
| 164 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ | 171 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ |
| 165 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); | 172 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); |
| @@ -170,6 +177,7 @@ void proc_sid_connector(struct task_struct *task) | |||
| 170 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); | 177 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); |
| 171 | msg->ack = 0; /* not used */ | 178 | msg->ack = 0; /* not used */ |
| 172 | msg->len = sizeof(*ev); | 179 | msg->len = sizeof(*ev); |
| 180 | msg->flags = 0; /* not used */ | ||
| 173 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); | 181 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); |
| 174 | } | 182 | } |
| 175 | 183 | ||
| @@ -185,6 +193,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id) | |||
| 185 | 193 | ||
| 186 | msg = (struct cn_msg *)buffer; | 194 | msg = (struct cn_msg *)buffer; |
| 187 | ev = (struct proc_event *)msg->data; | 195 | ev = (struct proc_event *)msg->data; |
| 196 | memset(&ev->event_data, 0, sizeof(ev->event_data)); | ||
| 188 | get_seq(&msg->seq, &ev->cpu); | 197 | get_seq(&msg->seq, &ev->cpu); |
| 189 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ | 198 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ |
| 190 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); | 199 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); |
| @@ -203,6 +212,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id) | |||
| 203 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); | 212 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); |
| 204 | msg->ack = 0; /* not used */ | 213 | msg->ack = 0; /* not used */ |
| 205 | msg->len = sizeof(*ev); | 214 | msg->len = sizeof(*ev); |
| 215 | msg->flags = 0; /* not used */ | ||
| 206 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); | 216 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); |
| 207 | } | 217 | } |
| 208 | 218 | ||
| @@ -218,6 +228,7 @@ void proc_comm_connector(struct task_struct *task) | |||
| 218 | 228 | ||
| 219 | msg = (struct cn_msg *)buffer; | 229 | msg = (struct cn_msg *)buffer; |
| 220 | ev = (struct proc_event *)msg->data; | 230 | ev = (struct proc_event *)msg->data; |
| 231 | memset(&ev->event_data, 0, sizeof(ev->event_data)); | ||
| 221 | get_seq(&msg->seq, &ev->cpu); | 232 | get_seq(&msg->seq, &ev->cpu); |
| 222 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ | 233 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ |
| 223 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); | 234 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); |
| @@ -229,6 +240,7 @@ void proc_comm_connector(struct task_struct *task) | |||
| 229 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); | 240 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); |
| 230 | msg->ack = 0; /* not used */ | 241 | msg->ack = 0; /* not used */ |
| 231 | msg->len = sizeof(*ev); | 242 | msg->len = sizeof(*ev); |
| 243 | msg->flags = 0; /* not used */ | ||
| 232 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); | 244 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); |
| 233 | } | 245 | } |
| 234 | 246 | ||
| @@ -244,6 +256,7 @@ void proc_coredump_connector(struct task_struct *task) | |||
| 244 | 256 | ||
| 245 | msg = (struct cn_msg *)buffer; | 257 | msg = (struct cn_msg *)buffer; |
| 246 | ev = (struct proc_event *)msg->data; | 258 | ev = (struct proc_event *)msg->data; |
| 259 | memset(&ev->event_data, 0, sizeof(ev->event_data)); | ||
| 247 | get_seq(&msg->seq, &ev->cpu); | 260 | get_seq(&msg->seq, &ev->cpu); |
| 248 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ | 261 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ |
| 249 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); | 262 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); |
| @@ -254,6 +267,7 @@ void proc_coredump_connector(struct task_struct *task) | |||
| 254 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); | 267 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); |
| 255 | msg->ack = 0; /* not used */ | 268 | msg->ack = 0; /* not used */ |
| 256 | msg->len = sizeof(*ev); | 269 | msg->len = sizeof(*ev); |
| 270 | msg->flags = 0; /* not used */ | ||
| 257 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); | 271 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); |
| 258 | } | 272 | } |
| 259 | 273 | ||
| @@ -269,6 +283,7 @@ void proc_exit_connector(struct task_struct *task) | |||
| 269 | 283 | ||
| 270 | msg = (struct cn_msg *)buffer; | 284 | msg = (struct cn_msg *)buffer; |
| 271 | ev = (struct proc_event *)msg->data; | 285 | ev = (struct proc_event *)msg->data; |
| 286 | memset(&ev->event_data, 0, sizeof(ev->event_data)); | ||
| 272 | get_seq(&msg->seq, &ev->cpu); | 287 | get_seq(&msg->seq, &ev->cpu); |
| 273 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ | 288 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ |
| 274 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); | 289 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); |
| @@ -281,6 +296,7 @@ void proc_exit_connector(struct task_struct *task) | |||
| 281 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); | 296 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); |
| 282 | msg->ack = 0; /* not used */ | 297 | msg->ack = 0; /* not used */ |
| 283 | msg->len = sizeof(*ev); | 298 | msg->len = sizeof(*ev); |
| 299 | msg->flags = 0; /* not used */ | ||
| 284 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); | 300 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); |
| 285 | } | 301 | } |
| 286 | 302 | ||
| @@ -304,6 +320,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack) | |||
| 304 | 320 | ||
| 305 | msg = (struct cn_msg *)buffer; | 321 | msg = (struct cn_msg *)buffer; |
| 306 | ev = (struct proc_event *)msg->data; | 322 | ev = (struct proc_event *)msg->data; |
| 323 | memset(&ev->event_data, 0, sizeof(ev->event_data)); | ||
| 307 | msg->seq = rcvd_seq; | 324 | msg->seq = rcvd_seq; |
| 308 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ | 325 | ktime_get_ts(&ts); /* get high res monotonic timestamp */ |
| 309 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); | 326 | put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); |
| @@ -313,6 +330,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack) | |||
| 313 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); | 330 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); |
| 314 | msg->ack = rcvd_ack + 1; | 331 | msg->ack = rcvd_ack + 1; |
| 315 | msg->len = sizeof(*ev); | 332 | msg->len = sizeof(*ev); |
| 333 | msg->flags = 0; /* not used */ | ||
| 316 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); | 334 | cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); |
| 317 | } | 335 | } |
| 318 | 336 | ||
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index 6ecfa758942c..a36749f1e44a 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c | |||
| @@ -109,7 +109,7 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask) | |||
| 109 | 109 | ||
| 110 | data = nlmsg_data(nlh); | 110 | data = nlmsg_data(nlh); |
| 111 | 111 | ||
| 112 | memcpy(data, msg, sizeof(*data) + msg->len); | 112 | memcpy(data, msg, size); |
| 113 | 113 | ||
| 114 | NETLINK_CB(skb).dst_group = group; | 114 | NETLINK_CB(skb).dst_group = group; |
| 115 | 115 | ||
| @@ -157,17 +157,18 @@ static int cn_call_callback(struct sk_buff *skb) | |||
| 157 | static void cn_rx_skb(struct sk_buff *__skb) | 157 | static void cn_rx_skb(struct sk_buff *__skb) |
| 158 | { | 158 | { |
| 159 | struct nlmsghdr *nlh; | 159 | struct nlmsghdr *nlh; |
| 160 | int err; | ||
| 161 | struct sk_buff *skb; | 160 | struct sk_buff *skb; |
| 161 | int len, err; | ||
| 162 | 162 | ||
| 163 | skb = skb_get(__skb); | 163 | skb = skb_get(__skb); |
| 164 | 164 | ||
| 165 | if (skb->len >= NLMSG_HDRLEN) { | 165 | if (skb->len >= NLMSG_HDRLEN) { |
| 166 | nlh = nlmsg_hdr(skb); | 166 | nlh = nlmsg_hdr(skb); |
| 167 | len = nlmsg_len(nlh); | ||
| 167 | 168 | ||
| 168 | if (nlh->nlmsg_len < sizeof(struct cn_msg) || | 169 | if (len < (int)sizeof(struct cn_msg) || |
| 169 | skb->len < nlh->nlmsg_len || | 170 | skb->len < nlh->nlmsg_len || |
| 170 | nlh->nlmsg_len > CONNECTOR_MAX_MSG_SIZE) { | 171 | len > CONNECTOR_MAX_MSG_SIZE) { |
| 171 | kfree_skb(skb); | 172 | kfree_skb(skb); |
| 172 | return; | 173 | return; |
| 173 | } | 174 | } |
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index 534fcb825153..38093e272377 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig | |||
| @@ -17,15 +17,11 @@ config CPU_FREQ | |||
| 17 | 17 | ||
| 18 | if CPU_FREQ | 18 | if CPU_FREQ |
| 19 | 19 | ||
| 20 | config CPU_FREQ_TABLE | ||
| 21 | tristate | ||
| 22 | |||
| 23 | config CPU_FREQ_GOV_COMMON | 20 | config CPU_FREQ_GOV_COMMON |
| 24 | bool | 21 | bool |
| 25 | 22 | ||
| 26 | config CPU_FREQ_STAT | 23 | config CPU_FREQ_STAT |
| 27 | tristate "CPU frequency translation statistics" | 24 | tristate "CPU frequency translation statistics" |
| 28 | select CPU_FREQ_TABLE | ||
| 29 | default y | 25 | default y |
| 30 | help | 26 | help |
| 31 | This driver exports CPU frequency statistics information through sysfs | 27 | This driver exports CPU frequency statistics information through sysfs |
| @@ -143,7 +139,6 @@ config CPU_FREQ_GOV_USERSPACE | |||
| 143 | 139 | ||
| 144 | config CPU_FREQ_GOV_ONDEMAND | 140 | config CPU_FREQ_GOV_ONDEMAND |
| 145 | tristate "'ondemand' cpufreq policy governor" | 141 | tristate "'ondemand' cpufreq policy governor" |
| 146 | select CPU_FREQ_TABLE | ||
| 147 | select CPU_FREQ_GOV_COMMON | 142 | select CPU_FREQ_GOV_COMMON |
| 148 | help | 143 | help |
| 149 | 'ondemand' - This driver adds a dynamic cpufreq policy governor. | 144 | 'ondemand' - This driver adds a dynamic cpufreq policy governor. |
| @@ -187,7 +182,6 @@ config CPU_FREQ_GOV_CONSERVATIVE | |||
| 187 | config GENERIC_CPUFREQ_CPU0 | 182 | config GENERIC_CPUFREQ_CPU0 |
| 188 | tristate "Generic CPU0 cpufreq driver" | 183 | tristate "Generic CPU0 cpufreq driver" |
| 189 | depends on HAVE_CLK && REGULATOR && PM_OPP && OF | 184 | depends on HAVE_CLK && REGULATOR && PM_OPP && OF |
| 190 | select CPU_FREQ_TABLE | ||
| 191 | help | 185 | help |
| 192 | This adds a generic cpufreq driver for CPU0 frequency management. | 186 | This adds a generic cpufreq driver for CPU0 frequency management. |
| 193 | It supports both uniprocessor (UP) and symmetric multiprocessor (SMP) | 187 | It supports both uniprocessor (UP) and symmetric multiprocessor (SMP) |
| @@ -223,7 +217,6 @@ depends on IA64 | |||
| 223 | 217 | ||
| 224 | config IA64_ACPI_CPUFREQ | 218 | config IA64_ACPI_CPUFREQ |
| 225 | tristate "ACPI Processor P-States driver" | 219 | tristate "ACPI Processor P-States driver" |
| 226 | select CPU_FREQ_TABLE | ||
| 227 | depends on ACPI_PROCESSOR | 220 | depends on ACPI_PROCESSOR |
| 228 | help | 221 | help |
| 229 | This driver adds a CPUFreq driver which utilizes the ACPI | 222 | This driver adds a CPUFreq driver which utilizes the ACPI |
| @@ -240,7 +233,6 @@ depends on MIPS | |||
| 240 | 233 | ||
| 241 | config LOONGSON2_CPUFREQ | 234 | config LOONGSON2_CPUFREQ |
| 242 | tristate "Loongson2 CPUFreq Driver" | 235 | tristate "Loongson2 CPUFreq Driver" |
| 243 | select CPU_FREQ_TABLE | ||
| 244 | help | 236 | help |
| 245 | This option adds a CPUFreq driver for loongson processors which | 237 | This option adds a CPUFreq driver for loongson processors which |
| 246 | support software configurable cpu frequency. | 238 | support software configurable cpu frequency. |
| @@ -262,7 +254,6 @@ menu "SPARC CPU frequency scaling drivers" | |||
| 262 | depends on SPARC64 | 254 | depends on SPARC64 |
| 263 | config SPARC_US3_CPUFREQ | 255 | config SPARC_US3_CPUFREQ |
| 264 | tristate "UltraSPARC-III CPU Frequency driver" | 256 | tristate "UltraSPARC-III CPU Frequency driver" |
| 265 | select CPU_FREQ_TABLE | ||
| 266 | help | 257 | help |
| 267 | This adds the CPUFreq driver for UltraSPARC-III processors. | 258 | This adds the CPUFreq driver for UltraSPARC-III processors. |
| 268 | 259 | ||
| @@ -272,7 +263,6 @@ config SPARC_US3_CPUFREQ | |||
| 272 | 263 | ||
| 273 | config SPARC_US2E_CPUFREQ | 264 | config SPARC_US2E_CPUFREQ |
| 274 | tristate "UltraSPARC-IIe CPU Frequency driver" | 265 | tristate "UltraSPARC-IIe CPU Frequency driver" |
| 275 | select CPU_FREQ_TABLE | ||
| 276 | help | 266 | help |
| 277 | This adds the CPUFreq driver for UltraSPARC-IIe processors. | 267 | This adds the CPUFreq driver for UltraSPARC-IIe processors. |
| 278 | 268 | ||
| @@ -285,7 +275,6 @@ menu "SH CPU Frequency scaling" | |||
| 285 | depends on SUPERH | 275 | depends on SUPERH |
| 286 | config SH_CPU_FREQ | 276 | config SH_CPU_FREQ |
| 287 | tristate "SuperH CPU Frequency driver" | 277 | tristate "SuperH CPU Frequency driver" |
| 288 | select CPU_FREQ_TABLE | ||
| 289 | help | 278 | help |
| 290 | This adds the cpufreq driver for SuperH. Any CPU that supports | 279 | This adds the cpufreq driver for SuperH. Any CPU that supports |
| 291 | clock rate rounding through the clock framework can use this | 280 | clock rate rounding through the clock framework can use this |
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 0fa204b244bd..701ec95ce954 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | config ARM_BIG_LITTLE_CPUFREQ | 5 | config ARM_BIG_LITTLE_CPUFREQ |
| 6 | tristate "Generic ARM big LITTLE CPUfreq driver" | 6 | tristate "Generic ARM big LITTLE CPUfreq driver" |
| 7 | depends on ARM_CPU_TOPOLOGY && PM_OPP && HAVE_CLK | 7 | depends on ARM_CPU_TOPOLOGY && PM_OPP && HAVE_CLK |
| 8 | select CPU_FREQ_TABLE | ||
| 9 | help | 8 | help |
| 10 | This enables the Generic CPUfreq driver for ARM big.LITTLE platforms. | 9 | This enables the Generic CPUfreq driver for ARM big.LITTLE platforms. |
| 11 | 10 | ||
| @@ -18,7 +17,6 @@ config ARM_DT_BL_CPUFREQ | |||
| 18 | 17 | ||
| 19 | config ARM_EXYNOS_CPUFREQ | 18 | config ARM_EXYNOS_CPUFREQ |
| 20 | bool | 19 | bool |
| 21 | select CPU_FREQ_TABLE | ||
| 22 | 20 | ||
| 23 | config ARM_EXYNOS4210_CPUFREQ | 21 | config ARM_EXYNOS4210_CPUFREQ |
| 24 | bool "SAMSUNG EXYNOS4210" | 22 | bool "SAMSUNG EXYNOS4210" |
| @@ -58,7 +56,6 @@ config ARM_EXYNOS5440_CPUFREQ | |||
| 58 | depends on SOC_EXYNOS5440 | 56 | depends on SOC_EXYNOS5440 |
| 59 | depends on HAVE_CLK && PM_OPP && OF | 57 | depends on HAVE_CLK && PM_OPP && OF |
| 60 | default y | 58 | default y |
| 61 | select CPU_FREQ_TABLE | ||
| 62 | help | 59 | help |
| 63 | This adds the CPUFreq driver for Samsung EXYNOS5440 | 60 | This adds the CPUFreq driver for Samsung EXYNOS5440 |
| 64 | SoC. The nature of exynos5440 clock controller is | 61 | SoC. The nature of exynos5440 clock controller is |
| @@ -85,7 +82,6 @@ config ARM_IMX6Q_CPUFREQ | |||
| 85 | tristate "Freescale i.MX6Q cpufreq support" | 82 | tristate "Freescale i.MX6Q cpufreq support" |
| 86 | depends on SOC_IMX6Q | 83 | depends on SOC_IMX6Q |
| 87 | depends on REGULATOR_ANATOP | 84 | depends on REGULATOR_ANATOP |
| 88 | select CPU_FREQ_TABLE | ||
| 89 | help | 85 | help |
| 90 | This adds cpufreq driver support for Freescale i.MX6Q SOC. | 86 | This adds cpufreq driver support for Freescale i.MX6Q SOC. |
| 91 | 87 | ||
| @@ -101,7 +97,6 @@ config ARM_INTEGRATOR | |||
| 101 | 97 | ||
| 102 | config ARM_KIRKWOOD_CPUFREQ | 98 | config ARM_KIRKWOOD_CPUFREQ |
| 103 | def_bool ARCH_KIRKWOOD && OF | 99 | def_bool ARCH_KIRKWOOD && OF |
| 104 | select CPU_FREQ_TABLE | ||
| 105 | help | 100 | help |
| 106 | This adds the CPUFreq driver for Marvell Kirkwood | 101 | This adds the CPUFreq driver for Marvell Kirkwood |
| 107 | SoCs. | 102 | SoCs. |
| @@ -110,7 +105,6 @@ config ARM_OMAP2PLUS_CPUFREQ | |||
| 110 | bool "TI OMAP2+" | 105 | bool "TI OMAP2+" |
| 111 | depends on ARCH_OMAP2PLUS | 106 | depends on ARCH_OMAP2PLUS |
| 112 | default ARCH_OMAP2PLUS | 107 | default ARCH_OMAP2PLUS |
| 113 | select CPU_FREQ_TABLE | ||
| 114 | 108 | ||
| 115 | config ARM_S3C_CPUFREQ | 109 | config ARM_S3C_CPUFREQ |
| 116 | bool | 110 | bool |
| @@ -165,7 +159,6 @@ config ARM_S3C2412_CPUFREQ | |||
| 165 | config ARM_S3C2416_CPUFREQ | 159 | config ARM_S3C2416_CPUFREQ |
| 166 | bool "S3C2416 CPU Frequency scaling support" | 160 | bool "S3C2416 CPU Frequency scaling support" |
| 167 | depends on CPU_S3C2416 | 161 | depends on CPU_S3C2416 |
| 168 | select CPU_FREQ_TABLE | ||
| 169 | help | 162 | help |
| 170 | This adds the CPUFreq driver for the Samsung S3C2416 and | 163 | This adds the CPUFreq driver for the Samsung S3C2416 and |
| 171 | S3C2450 SoC. The S3C2416 supports changing the rate of the | 164 | S3C2450 SoC. The S3C2416 supports changing the rate of the |
| @@ -196,7 +189,6 @@ config ARM_S3C2440_CPUFREQ | |||
| 196 | config ARM_S3C64XX_CPUFREQ | 189 | config ARM_S3C64XX_CPUFREQ |
| 197 | bool "Samsung S3C64XX" | 190 | bool "Samsung S3C64XX" |
| 198 | depends on CPU_S3C6410 | 191 | depends on CPU_S3C6410 |
| 199 | select CPU_FREQ_TABLE | ||
| 200 | default y | 192 | default y |
| 201 | help | 193 | help |
| 202 | This adds the CPUFreq driver for Samsung S3C6410 SoC. | 194 | This adds the CPUFreq driver for Samsung S3C6410 SoC. |
| @@ -206,7 +198,6 @@ config ARM_S3C64XX_CPUFREQ | |||
| 206 | config ARM_S5PV210_CPUFREQ | 198 | config ARM_S5PV210_CPUFREQ |
| 207 | bool "Samsung S5PV210 and S5PC110" | 199 | bool "Samsung S5PV210 and S5PC110" |
| 208 | depends on CPU_S5PV210 | 200 | depends on CPU_S5PV210 |
| 209 | select CPU_FREQ_TABLE | ||
| 210 | default y | 201 | default y |
| 211 | help | 202 | help |
| 212 | This adds the CPUFreq driver for Samsung S5PV210 and | 203 | This adds the CPUFreq driver for Samsung S5PV210 and |
| @@ -223,7 +214,6 @@ config ARM_SA1110_CPUFREQ | |||
| 223 | config ARM_SPEAR_CPUFREQ | 214 | config ARM_SPEAR_CPUFREQ |
| 224 | bool "SPEAr CPUFreq support" | 215 | bool "SPEAr CPUFreq support" |
| 225 | depends on PLAT_SPEAR | 216 | depends on PLAT_SPEAR |
| 226 | select CPU_FREQ_TABLE | ||
| 227 | default y | 217 | default y |
| 228 | help | 218 | help |
| 229 | This adds the CPUFreq driver support for SPEAr SOCs. | 219 | This adds the CPUFreq driver support for SPEAr SOCs. |
| @@ -231,7 +221,6 @@ config ARM_SPEAR_CPUFREQ | |||
| 231 | config ARM_TEGRA_CPUFREQ | 221 | config ARM_TEGRA_CPUFREQ |
| 232 | bool "TEGRA CPUFreq support" | 222 | bool "TEGRA CPUFreq support" |
| 233 | depends on ARCH_TEGRA | 223 | depends on ARCH_TEGRA |
| 234 | select CPU_FREQ_TABLE | ||
| 235 | default y | 224 | default y |
| 236 | help | 225 | help |
| 237 | This adds the CPUFreq driver support for TEGRA SOCs. | 226 | This adds the CPUFreq driver support for TEGRA SOCs. |
diff --git a/drivers/cpufreq/Kconfig.powerpc b/drivers/cpufreq/Kconfig.powerpc index 25ca9db62e09..ca0021a96e19 100644 --- a/drivers/cpufreq/Kconfig.powerpc +++ b/drivers/cpufreq/Kconfig.powerpc | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | config CPU_FREQ_CBE | 1 | config CPU_FREQ_CBE |
| 2 | tristate "CBE frequency scaling" | 2 | tristate "CBE frequency scaling" |
| 3 | depends on CBE_RAS && PPC_CELL | 3 | depends on CBE_RAS && PPC_CELL |
| 4 | select CPU_FREQ_TABLE | ||
| 5 | default m | 4 | default m |
| 6 | help | 5 | help |
| 7 | This adds the cpufreq driver for Cell BE processors. | 6 | This adds the cpufreq driver for Cell BE processors. |
| @@ -20,7 +19,6 @@ config CPU_FREQ_CBE_PMI | |||
| 20 | config CPU_FREQ_MAPLE | 19 | config CPU_FREQ_MAPLE |
| 21 | bool "Support for Maple 970FX Evaluation Board" | 20 | bool "Support for Maple 970FX Evaluation Board" |
| 22 | depends on PPC_MAPLE | 21 | depends on PPC_MAPLE |
| 23 | select CPU_FREQ_TABLE | ||
| 24 | help | 22 | help |
| 25 | This adds support for frequency switching on Maple 970FX | 23 | This adds support for frequency switching on Maple 970FX |
| 26 | Evaluation Board and compatible boards (IBM JS2x blades). | 24 | Evaluation Board and compatible boards (IBM JS2x blades). |
| @@ -28,7 +26,6 @@ config CPU_FREQ_MAPLE | |||
| 28 | config PPC_CORENET_CPUFREQ | 26 | config PPC_CORENET_CPUFREQ |
| 29 | tristate "CPU frequency scaling driver for Freescale E500MC SoCs" | 27 | tristate "CPU frequency scaling driver for Freescale E500MC SoCs" |
| 30 | depends on PPC_E500MC && OF && COMMON_CLK | 28 | depends on PPC_E500MC && OF && COMMON_CLK |
| 31 | select CPU_FREQ_TABLE | ||
| 32 | select CLK_PPC_CORENET | 29 | select CLK_PPC_CORENET |
| 33 | help | 30 | help |
| 34 | This adds the CPUFreq driver support for Freescale e500mc, | 31 | This adds the CPUFreq driver support for Freescale e500mc, |
| @@ -38,7 +35,6 @@ config PPC_CORENET_CPUFREQ | |||
| 38 | config CPU_FREQ_PMAC | 35 | config CPU_FREQ_PMAC |
| 39 | bool "Support for Apple PowerBooks" | 36 | bool "Support for Apple PowerBooks" |
| 40 | depends on ADB_PMU && PPC32 | 37 | depends on ADB_PMU && PPC32 |
| 41 | select CPU_FREQ_TABLE | ||
| 42 | help | 38 | help |
| 43 | This adds support for frequency switching on Apple PowerBooks, | 39 | This adds support for frequency switching on Apple PowerBooks, |
| 44 | this currently includes some models of iBook & Titanium | 40 | this currently includes some models of iBook & Titanium |
| @@ -47,7 +43,6 @@ config CPU_FREQ_PMAC | |||
| 47 | config CPU_FREQ_PMAC64 | 43 | config CPU_FREQ_PMAC64 |
| 48 | bool "Support for some Apple G5s" | 44 | bool "Support for some Apple G5s" |
| 49 | depends on PPC_PMAC && PPC64 | 45 | depends on PPC_PMAC && PPC64 |
| 50 | select CPU_FREQ_TABLE | ||
| 51 | help | 46 | help |
| 52 | This adds support for frequency switching on Apple iMac G5, | 47 | This adds support for frequency switching on Apple iMac G5, |
| 53 | and some of the more recent desktop G5 machines as well. | 48 | and some of the more recent desktop G5 machines as well. |
| @@ -55,7 +50,6 @@ config CPU_FREQ_PMAC64 | |||
| 55 | config PPC_PASEMI_CPUFREQ | 50 | config PPC_PASEMI_CPUFREQ |
| 56 | bool "Support for PA Semi PWRficient" | 51 | bool "Support for PA Semi PWRficient" |
| 57 | depends on PPC_PASEMI | 52 | depends on PPC_PASEMI |
| 58 | select CPU_FREQ_TABLE | ||
| 59 | default y | 53 | default y |
| 60 | help | 54 | help |
| 61 | This adds the support for frequency switching on PA Semi | 55 | This adds the support for frequency switching on PA Semi |
diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86 index e2b6eabef221..6897ad85b046 100644 --- a/drivers/cpufreq/Kconfig.x86 +++ b/drivers/cpufreq/Kconfig.x86 | |||
| @@ -31,7 +31,6 @@ config X86_PCC_CPUFREQ | |||
| 31 | 31 | ||
| 32 | config X86_ACPI_CPUFREQ | 32 | config X86_ACPI_CPUFREQ |
| 33 | tristate "ACPI Processor P-States driver" | 33 | tristate "ACPI Processor P-States driver" |
| 34 | select CPU_FREQ_TABLE | ||
| 35 | depends on ACPI_PROCESSOR | 34 | depends on ACPI_PROCESSOR |
| 36 | help | 35 | help |
| 37 | This driver adds a CPUFreq driver which utilizes the ACPI | 36 | This driver adds a CPUFreq driver which utilizes the ACPI |
| @@ -60,7 +59,6 @@ config X86_ACPI_CPUFREQ_CPB | |||
| 60 | 59 | ||
| 61 | config ELAN_CPUFREQ | 60 | config ELAN_CPUFREQ |
| 62 | tristate "AMD Elan SC400 and SC410" | 61 | tristate "AMD Elan SC400 and SC410" |
| 63 | select CPU_FREQ_TABLE | ||
| 64 | depends on MELAN | 62 | depends on MELAN |
| 65 | ---help--- | 63 | ---help--- |
| 66 | This adds the CPUFreq driver for AMD Elan SC400 and SC410 | 64 | This adds the CPUFreq driver for AMD Elan SC400 and SC410 |
| @@ -76,7 +74,6 @@ config ELAN_CPUFREQ | |||
| 76 | 74 | ||
| 77 | config SC520_CPUFREQ | 75 | config SC520_CPUFREQ |
| 78 | tristate "AMD Elan SC520" | 76 | tristate "AMD Elan SC520" |
| 79 | select CPU_FREQ_TABLE | ||
| 80 | depends on MELAN | 77 | depends on MELAN |
| 81 | ---help--- | 78 | ---help--- |
| 82 | This adds the CPUFreq driver for AMD Elan SC520 processor. | 79 | This adds the CPUFreq driver for AMD Elan SC520 processor. |
| @@ -88,7 +85,6 @@ config SC520_CPUFREQ | |||
| 88 | 85 | ||
| 89 | config X86_POWERNOW_K6 | 86 | config X86_POWERNOW_K6 |
| 90 | tristate "AMD Mobile K6-2/K6-3 PowerNow!" | 87 | tristate "AMD Mobile K6-2/K6-3 PowerNow!" |
| 91 | select CPU_FREQ_TABLE | ||
| 92 | depends on X86_32 | 88 | depends on X86_32 |
| 93 | help | 89 | help |
| 94 | This adds the CPUFreq driver for mobile AMD K6-2+ and mobile | 90 | This adds the CPUFreq driver for mobile AMD K6-2+ and mobile |
| @@ -100,7 +96,6 @@ config X86_POWERNOW_K6 | |||
| 100 | 96 | ||
| 101 | config X86_POWERNOW_K7 | 97 | config X86_POWERNOW_K7 |
| 102 | tristate "AMD Mobile Athlon/Duron PowerNow!" | 98 | tristate "AMD Mobile Athlon/Duron PowerNow!" |
| 103 | select CPU_FREQ_TABLE | ||
| 104 | depends on X86_32 | 99 | depends on X86_32 |
| 105 | help | 100 | help |
| 106 | This adds the CPUFreq driver for mobile AMD K7 mobile processors. | 101 | This adds the CPUFreq driver for mobile AMD K7 mobile processors. |
| @@ -118,7 +113,6 @@ config X86_POWERNOW_K7_ACPI | |||
| 118 | 113 | ||
| 119 | config X86_POWERNOW_K8 | 114 | config X86_POWERNOW_K8 |
| 120 | tristate "AMD Opteron/Athlon64 PowerNow!" | 115 | tristate "AMD Opteron/Athlon64 PowerNow!" |
| 121 | select CPU_FREQ_TABLE | ||
| 122 | depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ | 116 | depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ |
| 123 | help | 117 | help |
| 124 | This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors. | 118 | This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors. |
| @@ -132,7 +126,6 @@ config X86_POWERNOW_K8 | |||
| 132 | config X86_AMD_FREQ_SENSITIVITY | 126 | config X86_AMD_FREQ_SENSITIVITY |
| 133 | tristate "AMD frequency sensitivity feedback powersave bias" | 127 | tristate "AMD frequency sensitivity feedback powersave bias" |
| 134 | depends on CPU_FREQ_GOV_ONDEMAND && X86_ACPI_CPUFREQ && CPU_SUP_AMD | 128 | depends on CPU_FREQ_GOV_ONDEMAND && X86_ACPI_CPUFREQ && CPU_SUP_AMD |
| 135 | select CPU_FREQ_TABLE | ||
| 136 | help | 129 | help |
| 137 | This adds AMD-specific powersave bias function to the ondemand | 130 | This adds AMD-specific powersave bias function to the ondemand |
| 138 | governor, which allows it to make more power-conscious frequency | 131 | governor, which allows it to make more power-conscious frequency |
| @@ -160,7 +153,6 @@ config X86_GX_SUSPMOD | |||
| 160 | 153 | ||
| 161 | config X86_SPEEDSTEP_CENTRINO | 154 | config X86_SPEEDSTEP_CENTRINO |
| 162 | tristate "Intel Enhanced SpeedStep (deprecated)" | 155 | tristate "Intel Enhanced SpeedStep (deprecated)" |
| 163 | select CPU_FREQ_TABLE | ||
| 164 | select X86_SPEEDSTEP_CENTRINO_TABLE if X86_32 | 156 | select X86_SPEEDSTEP_CENTRINO_TABLE if X86_32 |
| 165 | depends on X86_32 || (X86_64 && ACPI_PROCESSOR) | 157 | depends on X86_32 || (X86_64 && ACPI_PROCESSOR) |
| 166 | help | 158 | help |
| @@ -190,7 +182,6 @@ config X86_SPEEDSTEP_CENTRINO_TABLE | |||
| 190 | 182 | ||
| 191 | config X86_SPEEDSTEP_ICH | 183 | config X86_SPEEDSTEP_ICH |
| 192 | tristate "Intel Speedstep on ICH-M chipsets (ioport interface)" | 184 | tristate "Intel Speedstep on ICH-M chipsets (ioport interface)" |
| 193 | select CPU_FREQ_TABLE | ||
| 194 | depends on X86_32 | 185 | depends on X86_32 |
| 195 | help | 186 | help |
| 196 | This adds the CPUFreq driver for certain mobile Intel Pentium III | 187 | This adds the CPUFreq driver for certain mobile Intel Pentium III |
| @@ -204,7 +195,6 @@ config X86_SPEEDSTEP_ICH | |||
| 204 | 195 | ||
| 205 | config X86_SPEEDSTEP_SMI | 196 | config X86_SPEEDSTEP_SMI |
| 206 | tristate "Intel SpeedStep on 440BX/ZX/MX chipsets (SMI interface)" | 197 | tristate "Intel SpeedStep on 440BX/ZX/MX chipsets (SMI interface)" |
| 207 | select CPU_FREQ_TABLE | ||
| 208 | depends on X86_32 | 198 | depends on X86_32 |
| 209 | help | 199 | help |
| 210 | This adds the CPUFreq driver for certain mobile Intel Pentium III | 200 | This adds the CPUFreq driver for certain mobile Intel Pentium III |
| @@ -217,7 +207,6 @@ config X86_SPEEDSTEP_SMI | |||
| 217 | 207 | ||
| 218 | config X86_P4_CLOCKMOD | 208 | config X86_P4_CLOCKMOD |
| 219 | tristate "Intel Pentium 4 clock modulation" | 209 | tristate "Intel Pentium 4 clock modulation" |
| 220 | select CPU_FREQ_TABLE | ||
| 221 | help | 210 | help |
| 222 | This adds the CPUFreq driver for Intel Pentium 4 / XEON | 211 | This adds the CPUFreq driver for Intel Pentium 4 / XEON |
| 223 | processors. When enabled it will lower CPU temperature by skipping | 212 | processors. When enabled it will lower CPU temperature by skipping |
| @@ -259,7 +248,6 @@ config X86_LONGRUN | |||
| 259 | 248 | ||
| 260 | config X86_LONGHAUL | 249 | config X86_LONGHAUL |
| 261 | tristate "VIA Cyrix III Longhaul" | 250 | tristate "VIA Cyrix III Longhaul" |
| 262 | select CPU_FREQ_TABLE | ||
| 263 | depends on X86_32 && ACPI_PROCESSOR | 251 | depends on X86_32 && ACPI_PROCESSOR |
| 264 | help | 252 | help |
| 265 | This adds the CPUFreq driver for VIA Samuel/CyrixIII, | 253 | This adds the CPUFreq driver for VIA Samuel/CyrixIII, |
| @@ -272,7 +260,6 @@ config X86_LONGHAUL | |||
| 272 | 260 | ||
| 273 | config X86_E_POWERSAVER | 261 | config X86_E_POWERSAVER |
| 274 | tristate "VIA C7 Enhanced PowerSaver (DANGEROUS)" | 262 | tristate "VIA C7 Enhanced PowerSaver (DANGEROUS)" |
| 275 | select CPU_FREQ_TABLE | ||
| 276 | depends on X86_32 && ACPI_PROCESSOR | 263 | depends on X86_32 && ACPI_PROCESSOR |
| 277 | help | 264 | help |
| 278 | This adds the CPUFreq driver for VIA C7 processors. However, this driver | 265 | This adds the CPUFreq driver for VIA C7 processors. However, this driver |
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index ad5866c2ada0..b7948bbbbf1f 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # CPUfreq core | 1 | # CPUfreq core |
| 2 | obj-$(CONFIG_CPU_FREQ) += cpufreq.o | 2 | obj-$(CONFIG_CPU_FREQ) += cpufreq.o freq_table.o |
| 3 | # CPUfreq stats | 3 | # CPUfreq stats |
| 4 | obj-$(CONFIG_CPU_FREQ_STAT) += cpufreq_stats.o | 4 | obj-$(CONFIG_CPU_FREQ_STAT) += cpufreq_stats.o |
| 5 | 5 | ||
| @@ -11,9 +11,6 @@ obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND) += cpufreq_ondemand.o | |||
| 11 | obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o | 11 | obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o |
| 12 | obj-$(CONFIG_CPU_FREQ_GOV_COMMON) += cpufreq_governor.o | 12 | obj-$(CONFIG_CPU_FREQ_GOV_COMMON) += cpufreq_governor.o |
| 13 | 13 | ||
| 14 | # CPUfreq cross-arch helpers | ||
| 15 | obj-$(CONFIG_CPU_FREQ_TABLE) += freq_table.o | ||
| 16 | |||
| 17 | obj-$(CONFIG_GENERIC_CPUFREQ_CPU0) += cpufreq-cpu0.o | 14 | obj-$(CONFIG_GENERIC_CPUFREQ_CPU0) += cpufreq-cpu0.o |
| 18 | 15 | ||
| 19 | ################################################################################## | 16 | ################################################################################## |
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index d2c3253e015e..e4bc19552d2b 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c | |||
| @@ -424,17 +424,17 @@ static unsigned int check_freqs(const struct cpumask *mask, unsigned int freq, | |||
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | static int acpi_cpufreq_target(struct cpufreq_policy *policy, | 426 | static int acpi_cpufreq_target(struct cpufreq_policy *policy, |
| 427 | unsigned int target_freq, unsigned int relation) | 427 | unsigned int index) |
| 428 | { | 428 | { |
| 429 | struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu); | 429 | struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu); |
| 430 | struct acpi_processor_performance *perf; | 430 | struct acpi_processor_performance *perf; |
| 431 | struct cpufreq_freqs freqs; | 431 | struct cpufreq_freqs freqs; |
| 432 | struct drv_cmd cmd; | 432 | struct drv_cmd cmd; |
| 433 | unsigned int next_state = 0; /* Index into freq_table */ | ||
| 434 | unsigned int next_perf_state = 0; /* Index into perf table */ | 433 | unsigned int next_perf_state = 0; /* Index into perf table */ |
| 435 | int result = 0; | 434 | int result = 0; |
| 436 | 435 | ||
| 437 | pr_debug("acpi_cpufreq_target %d (%d)\n", target_freq, policy->cpu); | 436 | pr_debug("acpi_cpufreq_target %d (%d)\n", |
| 437 | data->freq_table[index].frequency, policy->cpu); | ||
| 438 | 438 | ||
| 439 | if (unlikely(data == NULL || | 439 | if (unlikely(data == NULL || |
| 440 | data->acpi_data == NULL || data->freq_table == NULL)) { | 440 | data->acpi_data == NULL || data->freq_table == NULL)) { |
| @@ -442,16 +442,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, | |||
| 442 | } | 442 | } |
| 443 | 443 | ||
| 444 | perf = data->acpi_data; | 444 | perf = data->acpi_data; |
| 445 | result = cpufreq_frequency_table_target(policy, | 445 | next_perf_state = data->freq_table[index].driver_data; |
| 446 | data->freq_table, | ||
| 447 | target_freq, | ||
| 448 | relation, &next_state); | ||
| 449 | if (unlikely(result)) { | ||
| 450 | result = -ENODEV; | ||
| 451 | goto out; | ||
| 452 | } | ||
| 453 | |||
| 454 | next_perf_state = data->freq_table[next_state].driver_data; | ||
| 455 | if (perf->state == next_perf_state) { | 446 | if (perf->state == next_perf_state) { |
| 456 | if (unlikely(data->resume)) { | 447 | if (unlikely(data->resume)) { |
| 457 | pr_debug("Called after resume, resetting to P%d\n", | 448 | pr_debug("Called after resume, resetting to P%d\n", |
| @@ -493,7 +484,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, | |||
| 493 | cmd.mask = cpumask_of(policy->cpu); | 484 | cmd.mask = cpumask_of(policy->cpu); |
| 494 | 485 | ||
| 495 | freqs.old = perf->states[perf->state].core_frequency * 1000; | 486 | freqs.old = perf->states[perf->state].core_frequency * 1000; |
| 496 | freqs.new = data->freq_table[next_state].frequency; | 487 | freqs.new = data->freq_table[index].frequency; |
| 497 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 488 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 498 | 489 | ||
| 499 | drv_write(&cmd); | 490 | drv_write(&cmd); |
| @@ -516,15 +507,6 @@ out: | |||
| 516 | return result; | 507 | return result; |
| 517 | } | 508 | } |
| 518 | 509 | ||
| 519 | static int acpi_cpufreq_verify(struct cpufreq_policy *policy) | ||
| 520 | { | ||
| 521 | struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu); | ||
| 522 | |||
| 523 | pr_debug("acpi_cpufreq_verify\n"); | ||
| 524 | |||
| 525 | return cpufreq_frequency_table_verify(policy, data->freq_table); | ||
| 526 | } | ||
| 527 | |||
| 528 | static unsigned long | 510 | static unsigned long |
| 529 | acpi_cpufreq_guess_freq(struct acpi_cpufreq_data *data, unsigned int cpu) | 511 | acpi_cpufreq_guess_freq(struct acpi_cpufreq_data *data, unsigned int cpu) |
| 530 | { | 512 | { |
| @@ -837,7 +819,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
| 837 | data->freq_table[valid_states].frequency = CPUFREQ_TABLE_END; | 819 | data->freq_table[valid_states].frequency = CPUFREQ_TABLE_END; |
| 838 | perf->state = 0; | 820 | perf->state = 0; |
| 839 | 821 | ||
| 840 | result = cpufreq_frequency_table_cpuinfo(policy, data->freq_table); | 822 | result = cpufreq_table_validate_and_show(policy, data->freq_table); |
| 841 | if (result) | 823 | if (result) |
| 842 | goto err_freqfree; | 824 | goto err_freqfree; |
| 843 | 825 | ||
| @@ -846,12 +828,16 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
| 846 | 828 | ||
| 847 | switch (perf->control_register.space_id) { | 829 | switch (perf->control_register.space_id) { |
| 848 | case ACPI_ADR_SPACE_SYSTEM_IO: | 830 | case ACPI_ADR_SPACE_SYSTEM_IO: |
| 849 | /* Current speed is unknown and not detectable by IO port */ | 831 | /* |
| 832 | * The core will not set policy->cur, because | ||
| 833 | * cpufreq_driver->get is NULL, so we need to set it here. | ||
| 834 | * However, we have to guess it, because the current speed is | ||
| 835 | * unknown and not detectable via IO ports. | ||
| 836 | */ | ||
| 850 | policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu); | 837 | policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu); |
| 851 | break; | 838 | break; |
| 852 | case ACPI_ADR_SPACE_FIXED_HARDWARE: | 839 | case ACPI_ADR_SPACE_FIXED_HARDWARE: |
| 853 | acpi_cpufreq_driver.get = get_cur_freq_on_cpu; | 840 | acpi_cpufreq_driver.get = get_cur_freq_on_cpu; |
| 854 | policy->cur = get_cur_freq_on_cpu(cpu); | ||
| 855 | break; | 841 | break; |
| 856 | default: | 842 | default: |
| 857 | break; | 843 | break; |
| @@ -868,8 +854,6 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
| 868 | (u32) perf->states[i].power, | 854 | (u32) perf->states[i].power, |
| 869 | (u32) perf->states[i].transition_latency); | 855 | (u32) perf->states[i].transition_latency); |
| 870 | 856 | ||
| 871 | cpufreq_frequency_table_get_attr(data->freq_table, policy->cpu); | ||
| 872 | |||
| 873 | /* | 857 | /* |
| 874 | * the first call to ->target() should result in us actually | 858 | * the first call to ->target() should result in us actually |
| 875 | * writing something to the appropriate registers. | 859 | * writing something to the appropriate registers. |
| @@ -929,8 +913,8 @@ static struct freq_attr *acpi_cpufreq_attr[] = { | |||
| 929 | }; | 913 | }; |
| 930 | 914 | ||
| 931 | static struct cpufreq_driver acpi_cpufreq_driver = { | 915 | static struct cpufreq_driver acpi_cpufreq_driver = { |
| 932 | .verify = acpi_cpufreq_verify, | 916 | .verify = cpufreq_generic_frequency_table_verify, |
| 933 | .target = acpi_cpufreq_target, | 917 | .target_index = acpi_cpufreq_target, |
| 934 | .bios_limit = acpi_processor_get_bios_limit, | 918 | .bios_limit = acpi_processor_get_bios_limit, |
| 935 | .init = acpi_cpufreq_cpu_init, | 919 | .init = acpi_cpufreq_cpu_init, |
| 936 | .exit = acpi_cpufreq_cpu_exit, | 920 | .exit = acpi_cpufreq_cpu_exit, |
| @@ -986,12 +970,12 @@ static int __init acpi_cpufreq_init(void) | |||
| 986 | { | 970 | { |
| 987 | int ret; | 971 | int ret; |
| 988 | 972 | ||
| 973 | if (acpi_disabled) | ||
| 974 | return -ENODEV; | ||
| 975 | |||
| 989 | /* don't keep reloading if cpufreq_driver exists */ | 976 | /* don't keep reloading if cpufreq_driver exists */ |
| 990 | if (cpufreq_get_current_driver()) | 977 | if (cpufreq_get_current_driver()) |
| 991 | return 0; | 978 | return -EEXIST; |
| 992 | |||
| 993 | if (acpi_disabled) | ||
| 994 | return 0; | ||
| 995 | 979 | ||
| 996 | pr_debug("acpi_cpufreq_init\n"); | 980 | pr_debug("acpi_cpufreq_init\n"); |
| 997 | 981 | ||
diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c index 3549f0784af1..163e3378fe17 100644 --- a/drivers/cpufreq/arm_big_little.c +++ b/drivers/cpufreq/arm_big_little.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <linux/cpumask.h> | 25 | #include <linux/cpumask.h> |
| 26 | #include <linux/export.h> | 26 | #include <linux/export.h> |
| 27 | #include <linux/of_platform.h> | 27 | #include <linux/of_platform.h> |
| 28 | #include <linux/opp.h> | 28 | #include <linux/pm_opp.h> |
| 29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
| 30 | #include <linux/topology.h> | 30 | #include <linux/topology.h> |
| 31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| @@ -47,38 +47,23 @@ static unsigned int bL_cpufreq_get(unsigned int cpu) | |||
| 47 | return clk_get_rate(clk[cur_cluster]) / 1000; | 47 | return clk_get_rate(clk[cur_cluster]) / 1000; |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | /* Validate policy frequency range */ | ||
| 51 | static int bL_cpufreq_verify_policy(struct cpufreq_policy *policy) | ||
| 52 | { | ||
| 53 | u32 cur_cluster = cpu_to_cluster(policy->cpu); | ||
| 54 | |||
| 55 | return cpufreq_frequency_table_verify(policy, freq_table[cur_cluster]); | ||
| 56 | } | ||
| 57 | |||
| 58 | /* Set clock frequency */ | 50 | /* Set clock frequency */ |
| 59 | static int bL_cpufreq_set_target(struct cpufreq_policy *policy, | 51 | static int bL_cpufreq_set_target(struct cpufreq_policy *policy, |
| 60 | unsigned int target_freq, unsigned int relation) | 52 | unsigned int index) |
| 61 | { | 53 | { |
| 62 | struct cpufreq_freqs freqs; | 54 | struct cpufreq_freqs freqs; |
| 63 | u32 cpu = policy->cpu, freq_tab_idx, cur_cluster; | 55 | u32 cpu = policy->cpu, cur_cluster; |
| 64 | int ret = 0; | 56 | int ret = 0; |
| 65 | 57 | ||
| 66 | cur_cluster = cpu_to_cluster(policy->cpu); | 58 | cur_cluster = cpu_to_cluster(policy->cpu); |
| 67 | 59 | ||
| 68 | freqs.old = bL_cpufreq_get(policy->cpu); | 60 | freqs.old = bL_cpufreq_get(policy->cpu); |
| 69 | 61 | freqs.new = freq_table[cur_cluster][index].frequency; | |
| 70 | /* Determine valid target frequency using freq_table */ | ||
| 71 | cpufreq_frequency_table_target(policy, freq_table[cur_cluster], | ||
| 72 | target_freq, relation, &freq_tab_idx); | ||
| 73 | freqs.new = freq_table[cur_cluster][freq_tab_idx].frequency; | ||
| 74 | 62 | ||
| 75 | pr_debug("%s: cpu: %d, cluster: %d, oldfreq: %d, target freq: %d, new freq: %d\n", | 63 | pr_debug("%s: cpu: %d, cluster: %d, oldfreq: %d, target freq: %d, new freq: %d\n", |
| 76 | __func__, cpu, cur_cluster, freqs.old, target_freq, | 64 | __func__, cpu, cur_cluster, freqs.old, freqs.new, |
| 77 | freqs.new); | 65 | freqs.new); |
| 78 | 66 | ||
| 79 | if (freqs.old == freqs.new) | ||
| 80 | return 0; | ||
| 81 | |||
| 82 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 67 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 83 | 68 | ||
| 84 | ret = clk_set_rate(clk[cur_cluster], freqs.new * 1000); | 69 | ret = clk_set_rate(clk[cur_cluster], freqs.new * 1000); |
| @@ -98,7 +83,7 @@ static void put_cluster_clk_and_freq_table(struct device *cpu_dev) | |||
| 98 | 83 | ||
| 99 | if (!atomic_dec_return(&cluster_usage[cluster])) { | 84 | if (!atomic_dec_return(&cluster_usage[cluster])) { |
| 100 | clk_put(clk[cluster]); | 85 | clk_put(clk[cluster]); |
| 101 | opp_free_cpufreq_table(cpu_dev, &freq_table[cluster]); | 86 | dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table[cluster]); |
| 102 | dev_dbg(cpu_dev, "%s: cluster: %d\n", __func__, cluster); | 87 | dev_dbg(cpu_dev, "%s: cluster: %d\n", __func__, cluster); |
| 103 | } | 88 | } |
| 104 | } | 89 | } |
| @@ -119,7 +104,7 @@ static int get_cluster_clk_and_freq_table(struct device *cpu_dev) | |||
| 119 | goto atomic_dec; | 104 | goto atomic_dec; |
| 120 | } | 105 | } |
| 121 | 106 | ||
| 122 | ret = opp_init_cpufreq_table(cpu_dev, &freq_table[cluster]); | 107 | ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table[cluster]); |
| 123 | if (ret) { | 108 | if (ret) { |
| 124 | dev_err(cpu_dev, "%s: failed to init cpufreq table, cpu: %d, err: %d\n", | 109 | dev_err(cpu_dev, "%s: failed to init cpufreq table, cpu: %d, err: %d\n", |
| 125 | __func__, cpu_dev->id, ret); | 110 | __func__, cpu_dev->id, ret); |
| @@ -127,7 +112,7 @@ static int get_cluster_clk_and_freq_table(struct device *cpu_dev) | |||
| 127 | } | 112 | } |
| 128 | 113 | ||
| 129 | name[12] = cluster + '0'; | 114 | name[12] = cluster + '0'; |
| 130 | clk[cluster] = clk_get_sys(name, NULL); | 115 | clk[cluster] = clk_get(cpu_dev, name); |
| 131 | if (!IS_ERR(clk[cluster])) { | 116 | if (!IS_ERR(clk[cluster])) { |
| 132 | dev_dbg(cpu_dev, "%s: clk: %p & freq table: %p, cluster: %d\n", | 117 | dev_dbg(cpu_dev, "%s: clk: %p & freq table: %p, cluster: %d\n", |
| 133 | __func__, clk[cluster], freq_table[cluster], | 118 | __func__, clk[cluster], freq_table[cluster], |
| @@ -138,7 +123,7 @@ static int get_cluster_clk_and_freq_table(struct device *cpu_dev) | |||
| 138 | dev_err(cpu_dev, "%s: Failed to get clk for cpu: %d, cluster: %d\n", | 123 | dev_err(cpu_dev, "%s: Failed to get clk for cpu: %d, cluster: %d\n", |
| 139 | __func__, cpu_dev->id, cluster); | 124 | __func__, cpu_dev->id, cluster); |
| 140 | ret = PTR_ERR(clk[cluster]); | 125 | ret = PTR_ERR(clk[cluster]); |
| 141 | opp_free_cpufreq_table(cpu_dev, &freq_table[cluster]); | 126 | dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table[cluster]); |
| 142 | 127 | ||
| 143 | atomic_dec: | 128 | atomic_dec: |
| 144 | atomic_dec(&cluster_usage[cluster]); | 129 | atomic_dec(&cluster_usage[cluster]); |
| @@ -165,7 +150,7 @@ static int bL_cpufreq_init(struct cpufreq_policy *policy) | |||
| 165 | if (ret) | 150 | if (ret) |
| 166 | return ret; | 151 | return ret; |
| 167 | 152 | ||
| 168 | ret = cpufreq_frequency_table_cpuinfo(policy, freq_table[cur_cluster]); | 153 | ret = cpufreq_table_validate_and_show(policy, freq_table[cur_cluster]); |
| 169 | if (ret) { | 154 | if (ret) { |
| 170 | dev_err(cpu_dev, "CPU %d, cluster: %d invalid freq table\n", | 155 | dev_err(cpu_dev, "CPU %d, cluster: %d invalid freq table\n", |
| 171 | policy->cpu, cur_cluster); | 156 | policy->cpu, cur_cluster); |
| @@ -173,16 +158,12 @@ static int bL_cpufreq_init(struct cpufreq_policy *policy) | |||
| 173 | return ret; | 158 | return ret; |
| 174 | } | 159 | } |
| 175 | 160 | ||
| 176 | cpufreq_frequency_table_get_attr(freq_table[cur_cluster], policy->cpu); | ||
| 177 | |||
| 178 | if (arm_bL_ops->get_transition_latency) | 161 | if (arm_bL_ops->get_transition_latency) |
| 179 | policy->cpuinfo.transition_latency = | 162 | policy->cpuinfo.transition_latency = |
| 180 | arm_bL_ops->get_transition_latency(cpu_dev); | 163 | arm_bL_ops->get_transition_latency(cpu_dev); |
| 181 | else | 164 | else |
| 182 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | 165 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; |
| 183 | 166 | ||
| 184 | policy->cur = bL_cpufreq_get(policy->cpu); | ||
| 185 | |||
| 186 | cpumask_copy(policy->cpus, topology_core_cpumask(policy->cpu)); | 167 | cpumask_copy(policy->cpus, topology_core_cpumask(policy->cpu)); |
| 187 | 168 | ||
| 188 | dev_info(cpu_dev, "%s: CPU %d initialized\n", __func__, policy->cpu); | 169 | dev_info(cpu_dev, "%s: CPU %d initialized\n", __func__, policy->cpu); |
| @@ -200,28 +181,23 @@ static int bL_cpufreq_exit(struct cpufreq_policy *policy) | |||
| 200 | return -ENODEV; | 181 | return -ENODEV; |
| 201 | } | 182 | } |
| 202 | 183 | ||
| 184 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 203 | put_cluster_clk_and_freq_table(cpu_dev); | 185 | put_cluster_clk_and_freq_table(cpu_dev); |
| 204 | dev_dbg(cpu_dev, "%s: Exited, cpu: %d\n", __func__, policy->cpu); | 186 | dev_dbg(cpu_dev, "%s: Exited, cpu: %d\n", __func__, policy->cpu); |
| 205 | 187 | ||
| 206 | return 0; | 188 | return 0; |
| 207 | } | 189 | } |
| 208 | 190 | ||
| 209 | /* Export freq_table to sysfs */ | ||
| 210 | static struct freq_attr *bL_cpufreq_attr[] = { | ||
| 211 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 212 | NULL, | ||
| 213 | }; | ||
| 214 | |||
| 215 | static struct cpufreq_driver bL_cpufreq_driver = { | 191 | static struct cpufreq_driver bL_cpufreq_driver = { |
| 216 | .name = "arm-big-little", | 192 | .name = "arm-big-little", |
| 217 | .flags = CPUFREQ_STICKY, | 193 | .flags = CPUFREQ_STICKY | |
| 218 | .verify = bL_cpufreq_verify_policy, | 194 | CPUFREQ_HAVE_GOVERNOR_PER_POLICY, |
| 219 | .target = bL_cpufreq_set_target, | 195 | .verify = cpufreq_generic_frequency_table_verify, |
| 196 | .target_index = bL_cpufreq_set_target, | ||
| 220 | .get = bL_cpufreq_get, | 197 | .get = bL_cpufreq_get, |
| 221 | .init = bL_cpufreq_init, | 198 | .init = bL_cpufreq_init, |
| 222 | .exit = bL_cpufreq_exit, | 199 | .exit = bL_cpufreq_exit, |
| 223 | .have_governor_per_policy = true, | 200 | .attr = cpufreq_generic_attr, |
| 224 | .attr = bL_cpufreq_attr, | ||
| 225 | }; | 201 | }; |
| 226 | 202 | ||
| 227 | int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops) | 203 | int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops) |
diff --git a/drivers/cpufreq/arm_big_little_dt.c b/drivers/cpufreq/arm_big_little_dt.c index 480c0bd0468d..8d9d59108906 100644 --- a/drivers/cpufreq/arm_big_little_dt.c +++ b/drivers/cpufreq/arm_big_little_dt.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <linux/export.h> | 24 | #include <linux/export.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/of_device.h> | 26 | #include <linux/of_device.h> |
| 27 | #include <linux/opp.h> | 27 | #include <linux/pm_opp.h> |
| 28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
| 30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
diff --git a/drivers/cpufreq/at32ap-cpufreq.c b/drivers/cpufreq/at32ap-cpufreq.c index e0c38d938997..81d07527bde6 100644 --- a/drivers/cpufreq/at32ap-cpufreq.c +++ b/drivers/cpufreq/at32ap-cpufreq.c | |||
| @@ -19,18 +19,10 @@ | |||
| 19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
| 20 | #include <linux/err.h> | 20 | #include <linux/err.h> |
| 21 | #include <linux/export.h> | 21 | #include <linux/export.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | static struct clk *cpuclk; | 24 | static struct clk *cpuclk; |
| 24 | 25 | static struct cpufreq_frequency_table *freq_table; | |
| 25 | static int at32_verify_speed(struct cpufreq_policy *policy) | ||
| 26 | { | ||
| 27 | if (policy->cpu != 0) | ||
| 28 | return -EINVAL; | ||
| 29 | |||
| 30 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, | ||
| 31 | policy->cpuinfo.max_freq); | ||
| 32 | return 0; | ||
| 33 | } | ||
| 34 | 26 | ||
| 35 | static unsigned int at32_get_speed(unsigned int cpu) | 27 | static unsigned int at32_get_speed(unsigned int cpu) |
| 36 | { | 28 | { |
| @@ -43,25 +35,12 @@ static unsigned int at32_get_speed(unsigned int cpu) | |||
| 43 | static unsigned int ref_freq; | 35 | static unsigned int ref_freq; |
| 44 | static unsigned long loops_per_jiffy_ref; | 36 | static unsigned long loops_per_jiffy_ref; |
| 45 | 37 | ||
| 46 | static int at32_set_target(struct cpufreq_policy *policy, | 38 | static int at32_set_target(struct cpufreq_policy *policy, unsigned int index) |
| 47 | unsigned int target_freq, | ||
| 48 | unsigned int relation) | ||
| 49 | { | 39 | { |
| 50 | struct cpufreq_freqs freqs; | 40 | struct cpufreq_freqs freqs; |
| 51 | long freq; | ||
| 52 | |||
| 53 | /* Convert target_freq from kHz to Hz */ | ||
| 54 | freq = clk_round_rate(cpuclk, target_freq * 1000); | ||
| 55 | |||
| 56 | /* Check if policy->min <= new_freq <= policy->max */ | ||
| 57 | if(freq < (policy->min * 1000) || freq > (policy->max * 1000)) | ||
| 58 | return -EINVAL; | ||
| 59 | |||
| 60 | pr_debug("cpufreq: requested frequency %u Hz\n", target_freq * 1000); | ||
| 61 | 41 | ||
| 62 | freqs.old = at32_get_speed(0); | 42 | freqs.old = at32_get_speed(0); |
| 63 | freqs.new = (freq + 500) / 1000; | 43 | freqs.new = freq_table[index].frequency; |
| 64 | freqs.flags = 0; | ||
| 65 | 44 | ||
| 66 | if (!ref_freq) { | 45 | if (!ref_freq) { |
| 67 | ref_freq = freqs.old; | 46 | ref_freq = freqs.old; |
| @@ -72,45 +51,82 @@ static int at32_set_target(struct cpufreq_policy *policy, | |||
| 72 | if (freqs.old < freqs.new) | 51 | if (freqs.old < freqs.new) |
| 73 | boot_cpu_data.loops_per_jiffy = cpufreq_scale( | 52 | boot_cpu_data.loops_per_jiffy = cpufreq_scale( |
| 74 | loops_per_jiffy_ref, ref_freq, freqs.new); | 53 | loops_per_jiffy_ref, ref_freq, freqs.new); |
| 75 | clk_set_rate(cpuclk, freq); | 54 | clk_set_rate(cpuclk, freqs.new * 1000); |
| 76 | if (freqs.new < freqs.old) | 55 | if (freqs.new < freqs.old) |
| 77 | boot_cpu_data.loops_per_jiffy = cpufreq_scale( | 56 | boot_cpu_data.loops_per_jiffy = cpufreq_scale( |
| 78 | loops_per_jiffy_ref, ref_freq, freqs.new); | 57 | loops_per_jiffy_ref, ref_freq, freqs.new); |
| 79 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 58 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 80 | 59 | ||
| 81 | pr_debug("cpufreq: set frequency %lu Hz\n", freq); | 60 | pr_debug("cpufreq: set frequency %u Hz\n", freqs.new * 1000); |
| 82 | 61 | ||
| 83 | return 0; | 62 | return 0; |
| 84 | } | 63 | } |
| 85 | 64 | ||
| 86 | static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy) | 65 | static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy) |
| 87 | { | 66 | { |
| 67 | unsigned int frequency, rate, min_freq; | ||
| 68 | int retval, steps, i; | ||
| 69 | |||
| 88 | if (policy->cpu != 0) | 70 | if (policy->cpu != 0) |
| 89 | return -EINVAL; | 71 | return -EINVAL; |
| 90 | 72 | ||
| 91 | cpuclk = clk_get(NULL, "cpu"); | 73 | cpuclk = clk_get(NULL, "cpu"); |
| 92 | if (IS_ERR(cpuclk)) { | 74 | if (IS_ERR(cpuclk)) { |
| 93 | pr_debug("cpufreq: could not get CPU clk\n"); | 75 | pr_debug("cpufreq: could not get CPU clk\n"); |
| 94 | return PTR_ERR(cpuclk); | 76 | retval = PTR_ERR(cpuclk); |
| 77 | goto out_err; | ||
| 95 | } | 78 | } |
| 96 | 79 | ||
| 97 | policy->cpuinfo.min_freq = (clk_round_rate(cpuclk, 1) + 500) / 1000; | 80 | min_freq = (clk_round_rate(cpuclk, 1) + 500) / 1000; |
| 98 | policy->cpuinfo.max_freq = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000; | 81 | frequency = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000; |
| 99 | policy->cpuinfo.transition_latency = 0; | 82 | policy->cpuinfo.transition_latency = 0; |
| 100 | policy->cur = at32_get_speed(0); | ||
| 101 | policy->min = policy->cpuinfo.min_freq; | ||
| 102 | policy->max = policy->cpuinfo.max_freq; | ||
| 103 | 83 | ||
| 104 | printk("cpufreq: AT32AP CPU frequency driver\n"); | 84 | /* |
| 85 | * AVR32 CPU frequency rate scales in power of two between maximum and | ||
| 86 | * minimum, also add space for the table end marker. | ||
| 87 | * | ||
| 88 | * Further validate that the frequency is usable, and append it to the | ||
| 89 | * frequency table. | ||
| 90 | */ | ||
| 91 | steps = fls(frequency / min_freq) + 1; | ||
| 92 | freq_table = kzalloc(steps * sizeof(struct cpufreq_frequency_table), | ||
| 93 | GFP_KERNEL); | ||
| 94 | if (!freq_table) { | ||
| 95 | retval = -ENOMEM; | ||
| 96 | goto out_err_put_clk; | ||
| 97 | } | ||
| 105 | 98 | ||
| 106 | return 0; | 99 | for (i = 0; i < (steps - 1); i++) { |
| 100 | rate = clk_round_rate(cpuclk, frequency * 1000) / 1000; | ||
| 101 | |||
| 102 | if (rate != frequency) | ||
| 103 | freq_table[i].frequency = CPUFREQ_ENTRY_INVALID; | ||
| 104 | else | ||
| 105 | freq_table[i].frequency = frequency; | ||
| 106 | |||
| 107 | frequency /= 2; | ||
| 108 | } | ||
| 109 | |||
| 110 | freq_table[steps - 1].frequency = CPUFREQ_TABLE_END; | ||
| 111 | |||
| 112 | retval = cpufreq_table_validate_and_show(policy, freq_table); | ||
| 113 | if (!retval) { | ||
| 114 | printk("cpufreq: AT32AP CPU frequency driver\n"); | ||
| 115 | return 0; | ||
| 116 | } | ||
| 117 | |||
| 118 | kfree(freq_table); | ||
| 119 | out_err_put_clk: | ||
| 120 | clk_put(cpuclk); | ||
| 121 | out_err: | ||
| 122 | return retval; | ||
| 107 | } | 123 | } |
| 108 | 124 | ||
| 109 | static struct cpufreq_driver at32_driver = { | 125 | static struct cpufreq_driver at32_driver = { |
| 110 | .name = "at32ap", | 126 | .name = "at32ap", |
| 111 | .init = at32_cpufreq_driver_init, | 127 | .init = at32_cpufreq_driver_init, |
| 112 | .verify = at32_verify_speed, | 128 | .verify = cpufreq_generic_frequency_table_verify, |
| 113 | .target = at32_set_target, | 129 | .target_index = at32_set_target, |
| 114 | .get = at32_get_speed, | 130 | .get = at32_get_speed, |
| 115 | .flags = CPUFREQ_STICKY, | 131 | .flags = CPUFREQ_STICKY, |
| 116 | }; | 132 | }; |
diff --git a/drivers/cpufreq/blackfin-cpufreq.c b/drivers/cpufreq/blackfin-cpufreq.c index ef05978a7237..12528b28d45d 100644 --- a/drivers/cpufreq/blackfin-cpufreq.c +++ b/drivers/cpufreq/blackfin-cpufreq.c | |||
| @@ -127,14 +127,11 @@ unsigned long cpu_set_cclk(int cpu, unsigned long new) | |||
| 127 | } | 127 | } |
| 128 | #endif | 128 | #endif |
| 129 | 129 | ||
| 130 | static int bfin_target(struct cpufreq_policy *policy, | 130 | static int bfin_target(struct cpufreq_policy *policy, unsigned int index) |
| 131 | unsigned int target_freq, unsigned int relation) | ||
| 132 | { | 131 | { |
| 133 | #ifndef CONFIG_BF60x | 132 | #ifndef CONFIG_BF60x |
| 134 | unsigned int plldiv; | 133 | unsigned int plldiv; |
| 135 | #endif | 134 | #endif |
| 136 | unsigned int index; | ||
| 137 | unsigned long cclk_hz; | ||
| 138 | struct cpufreq_freqs freqs; | 135 | struct cpufreq_freqs freqs; |
| 139 | static unsigned long lpj_ref; | 136 | static unsigned long lpj_ref; |
| 140 | static unsigned int lpj_ref_freq; | 137 | static unsigned int lpj_ref_freq; |
| @@ -144,17 +141,11 @@ static int bfin_target(struct cpufreq_policy *policy, | |||
| 144 | cycles_t cycles; | 141 | cycles_t cycles; |
| 145 | #endif | 142 | #endif |
| 146 | 143 | ||
| 147 | if (cpufreq_frequency_table_target(policy, bfin_freq_table, target_freq, | ||
| 148 | relation, &index)) | ||
| 149 | return -EINVAL; | ||
| 150 | |||
| 151 | cclk_hz = bfin_freq_table[index].frequency; | ||
| 152 | |||
| 153 | freqs.old = bfin_getfreq_khz(0); | 144 | freqs.old = bfin_getfreq_khz(0); |
| 154 | freqs.new = cclk_hz; | 145 | freqs.new = bfin_freq_table[index].frequency; |
| 155 | 146 | ||
| 156 | pr_debug("cpufreq: changing cclk to %lu; target = %u, oldfreq = %u\n", | 147 | pr_debug("cpufreq: changing cclk to %lu; target = %u, oldfreq = %u\n", |
| 157 | cclk_hz, target_freq, freqs.old); | 148 | freqs.new, freqs.new, freqs.old); |
| 158 | 149 | ||
| 159 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 150 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 160 | #ifndef CONFIG_BF60x | 151 | #ifndef CONFIG_BF60x |
| @@ -191,11 +182,6 @@ static int bfin_target(struct cpufreq_policy *policy, | |||
| 191 | return ret; | 182 | return ret; |
| 192 | } | 183 | } |
| 193 | 184 | ||
| 194 | static int bfin_verify_speed(struct cpufreq_policy *policy) | ||
| 195 | { | ||
| 196 | return cpufreq_frequency_table_verify(policy, bfin_freq_table); | ||
| 197 | } | ||
| 198 | |||
| 199 | static int __bfin_cpu_init(struct cpufreq_policy *policy) | 185 | static int __bfin_cpu_init(struct cpufreq_policy *policy) |
| 200 | { | 186 | { |
| 201 | 187 | ||
| @@ -209,23 +195,17 @@ static int __bfin_cpu_init(struct cpufreq_policy *policy) | |||
| 209 | 195 | ||
| 210 | policy->cpuinfo.transition_latency = 50000; /* 50us assumed */ | 196 | policy->cpuinfo.transition_latency = 50000; /* 50us assumed */ |
| 211 | 197 | ||
| 212 | policy->cur = cclk; | 198 | return cpufreq_table_validate_and_show(policy, bfin_freq_table); |
| 213 | cpufreq_frequency_table_get_attr(bfin_freq_table, policy->cpu); | ||
| 214 | return cpufreq_frequency_table_cpuinfo(policy, bfin_freq_table); | ||
| 215 | } | 199 | } |
| 216 | 200 | ||
| 217 | static struct freq_attr *bfin_freq_attr[] = { | ||
| 218 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 219 | NULL, | ||
| 220 | }; | ||
| 221 | |||
| 222 | static struct cpufreq_driver bfin_driver = { | 201 | static struct cpufreq_driver bfin_driver = { |
| 223 | .verify = bfin_verify_speed, | 202 | .verify = cpufreq_generic_frequency_table_verify, |
| 224 | .target = bfin_target, | 203 | .target_index = bfin_target, |
| 225 | .get = bfin_getfreq_khz, | 204 | .get = bfin_getfreq_khz, |
| 226 | .init = __bfin_cpu_init, | 205 | .init = __bfin_cpu_init, |
| 206 | .exit = cpufreq_generic_exit, | ||
| 227 | .name = "bfin cpufreq", | 207 | .name = "bfin cpufreq", |
| 228 | .attr = bfin_freq_attr, | 208 | .attr = cpufreq_generic_attr, |
| 229 | }; | 209 | }; |
| 230 | 210 | ||
| 231 | static int __init bfin_cpu_init(void) | 211 | static int __init bfin_cpu_init(void) |
diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c index c522a95c0e16..4dbe7efd86e5 100644 --- a/drivers/cpufreq/cpufreq-cpu0.c +++ b/drivers/cpufreq/cpufreq-cpu0.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/of.h> | 19 | #include <linux/of.h> |
| 20 | #include <linux/opp.h> | 20 | #include <linux/pm_opp.h> |
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <linux/regulator/consumer.h> | 22 | #include <linux/regulator/consumer.h> |
| 23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| @@ -30,34 +30,19 @@ static struct clk *cpu_clk; | |||
| 30 | static struct regulator *cpu_reg; | 30 | static struct regulator *cpu_reg; |
| 31 | static struct cpufreq_frequency_table *freq_table; | 31 | static struct cpufreq_frequency_table *freq_table; |
| 32 | 32 | ||
| 33 | static int cpu0_verify_speed(struct cpufreq_policy *policy) | ||
| 34 | { | ||
| 35 | return cpufreq_frequency_table_verify(policy, freq_table); | ||
| 36 | } | ||
| 37 | |||
| 38 | static unsigned int cpu0_get_speed(unsigned int cpu) | 33 | static unsigned int cpu0_get_speed(unsigned int cpu) |
| 39 | { | 34 | { |
| 40 | return clk_get_rate(cpu_clk) / 1000; | 35 | return clk_get_rate(cpu_clk) / 1000; |
| 41 | } | 36 | } |
| 42 | 37 | ||
| 43 | static int cpu0_set_target(struct cpufreq_policy *policy, | 38 | static int cpu0_set_target(struct cpufreq_policy *policy, unsigned int index) |
| 44 | unsigned int target_freq, unsigned int relation) | ||
| 45 | { | 39 | { |
| 46 | struct cpufreq_freqs freqs; | 40 | struct cpufreq_freqs freqs; |
| 47 | struct opp *opp; | 41 | struct dev_pm_opp *opp; |
| 48 | unsigned long volt = 0, volt_old = 0, tol = 0; | 42 | unsigned long volt = 0, volt_old = 0, tol = 0; |
| 49 | long freq_Hz, freq_exact; | 43 | long freq_Hz, freq_exact; |
| 50 | unsigned int index; | ||
| 51 | int ret; | 44 | int ret; |
| 52 | 45 | ||
| 53 | ret = cpufreq_frequency_table_target(policy, freq_table, target_freq, | ||
| 54 | relation, &index); | ||
| 55 | if (ret) { | ||
| 56 | pr_err("failed to match target freqency %d: %d\n", | ||
| 57 | target_freq, ret); | ||
| 58 | return ret; | ||
| 59 | } | ||
| 60 | |||
| 61 | freq_Hz = clk_round_rate(cpu_clk, freq_table[index].frequency * 1000); | 46 | freq_Hz = clk_round_rate(cpu_clk, freq_table[index].frequency * 1000); |
| 62 | if (freq_Hz < 0) | 47 | if (freq_Hz < 0) |
| 63 | freq_Hz = freq_table[index].frequency * 1000; | 48 | freq_Hz = freq_table[index].frequency * 1000; |
| @@ -65,14 +50,11 @@ static int cpu0_set_target(struct cpufreq_policy *policy, | |||
| 65 | freqs.new = freq_Hz / 1000; | 50 | freqs.new = freq_Hz / 1000; |
| 66 | freqs.old = clk_get_rate(cpu_clk) / 1000; | 51 | freqs.old = clk_get_rate(cpu_clk) / 1000; |
| 67 | 52 | ||
| 68 | if (freqs.old == freqs.new) | ||
| 69 | return 0; | ||
| 70 | |||
| 71 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 53 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 72 | 54 | ||
| 73 | if (!IS_ERR(cpu_reg)) { | 55 | if (!IS_ERR(cpu_reg)) { |
| 74 | rcu_read_lock(); | 56 | rcu_read_lock(); |
| 75 | opp = opp_find_freq_ceil(cpu_dev, &freq_Hz); | 57 | opp = dev_pm_opp_find_freq_ceil(cpu_dev, &freq_Hz); |
| 76 | if (IS_ERR(opp)) { | 58 | if (IS_ERR(opp)) { |
| 77 | rcu_read_unlock(); | 59 | rcu_read_unlock(); |
| 78 | pr_err("failed to find OPP for %ld\n", freq_Hz); | 60 | pr_err("failed to find OPP for %ld\n", freq_Hz); |
| @@ -80,7 +62,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy, | |||
| 80 | ret = PTR_ERR(opp); | 62 | ret = PTR_ERR(opp); |
| 81 | goto post_notify; | 63 | goto post_notify; |
| 82 | } | 64 | } |
| 83 | volt = opp_get_voltage(opp); | 65 | volt = dev_pm_opp_get_voltage(opp); |
| 84 | rcu_read_unlock(); | 66 | rcu_read_unlock(); |
| 85 | tol = volt * voltage_tolerance / 100; | 67 | tol = volt * voltage_tolerance / 100; |
| 86 | volt_old = regulator_get_voltage(cpu_reg); | 68 | volt_old = regulator_get_voltage(cpu_reg); |
| @@ -127,50 +109,18 @@ post_notify: | |||
| 127 | 109 | ||
| 128 | static int cpu0_cpufreq_init(struct cpufreq_policy *policy) | 110 | static int cpu0_cpufreq_init(struct cpufreq_policy *policy) |
| 129 | { | 111 | { |
| 130 | int ret; | 112 | return cpufreq_generic_init(policy, freq_table, transition_latency); |
| 131 | |||
| 132 | ret = cpufreq_frequency_table_cpuinfo(policy, freq_table); | ||
| 133 | if (ret) { | ||
| 134 | pr_err("invalid frequency table: %d\n", ret); | ||
| 135 | return ret; | ||
| 136 | } | ||
| 137 | |||
| 138 | policy->cpuinfo.transition_latency = transition_latency; | ||
| 139 | policy->cur = clk_get_rate(cpu_clk) / 1000; | ||
| 140 | |||
| 141 | /* | ||
| 142 | * The driver only supports the SMP configuartion where all processors | ||
| 143 | * share the clock and voltage and clock. Use cpufreq affected_cpus | ||
| 144 | * interface to have all CPUs scaled together. | ||
| 145 | */ | ||
| 146 | cpumask_setall(policy->cpus); | ||
| 147 | |||
| 148 | cpufreq_frequency_table_get_attr(freq_table, policy->cpu); | ||
| 149 | |||
| 150 | return 0; | ||
| 151 | } | 113 | } |
| 152 | 114 | ||
| 153 | static int cpu0_cpufreq_exit(struct cpufreq_policy *policy) | ||
| 154 | { | ||
| 155 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 156 | |||
| 157 | return 0; | ||
| 158 | } | ||
| 159 | |||
| 160 | static struct freq_attr *cpu0_cpufreq_attr[] = { | ||
| 161 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 162 | NULL, | ||
| 163 | }; | ||
| 164 | |||
| 165 | static struct cpufreq_driver cpu0_cpufreq_driver = { | 115 | static struct cpufreq_driver cpu0_cpufreq_driver = { |
| 166 | .flags = CPUFREQ_STICKY, | 116 | .flags = CPUFREQ_STICKY, |
| 167 | .verify = cpu0_verify_speed, | 117 | .verify = cpufreq_generic_frequency_table_verify, |
| 168 | .target = cpu0_set_target, | 118 | .target_index = cpu0_set_target, |
| 169 | .get = cpu0_get_speed, | 119 | .get = cpu0_get_speed, |
| 170 | .init = cpu0_cpufreq_init, | 120 | .init = cpu0_cpufreq_init, |
| 171 | .exit = cpu0_cpufreq_exit, | 121 | .exit = cpufreq_generic_exit, |
| 172 | .name = "generic_cpu0", | 122 | .name = "generic_cpu0", |
| 173 | .attr = cpu0_cpufreq_attr, | 123 | .attr = cpufreq_generic_attr, |
| 174 | }; | 124 | }; |
| 175 | 125 | ||
| 176 | static int cpu0_cpufreq_probe(struct platform_device *pdev) | 126 | static int cpu0_cpufreq_probe(struct platform_device *pdev) |
| @@ -218,7 +168,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) | |||
| 218 | goto out_put_node; | 168 | goto out_put_node; |
| 219 | } | 169 | } |
| 220 | 170 | ||
| 221 | ret = opp_init_cpufreq_table(cpu_dev, &freq_table); | 171 | ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table); |
| 222 | if (ret) { | 172 | if (ret) { |
| 223 | pr_err("failed to init cpufreq table: %d\n", ret); | 173 | pr_err("failed to init cpufreq table: %d\n", ret); |
| 224 | goto out_put_node; | 174 | goto out_put_node; |
| @@ -230,7 +180,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) | |||
| 230 | transition_latency = CPUFREQ_ETERNAL; | 180 | transition_latency = CPUFREQ_ETERNAL; |
| 231 | 181 | ||
| 232 | if (!IS_ERR(cpu_reg)) { | 182 | if (!IS_ERR(cpu_reg)) { |
| 233 | struct opp *opp; | 183 | struct dev_pm_opp *opp; |
| 234 | unsigned long min_uV, max_uV; | 184 | unsigned long min_uV, max_uV; |
| 235 | int i; | 185 | int i; |
| 236 | 186 | ||
| @@ -242,12 +192,12 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) | |||
| 242 | for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) | 192 | for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) |
| 243 | ; | 193 | ; |
| 244 | rcu_read_lock(); | 194 | rcu_read_lock(); |
| 245 | opp = opp_find_freq_exact(cpu_dev, | 195 | opp = dev_pm_opp_find_freq_exact(cpu_dev, |
| 246 | freq_table[0].frequency * 1000, true); | 196 | freq_table[0].frequency * 1000, true); |
| 247 | min_uV = opp_get_voltage(opp); | 197 | min_uV = dev_pm_opp_get_voltage(opp); |
| 248 | opp = opp_find_freq_exact(cpu_dev, | 198 | opp = dev_pm_opp_find_freq_exact(cpu_dev, |
| 249 | freq_table[i-1].frequency * 1000, true); | 199 | freq_table[i-1].frequency * 1000, true); |
| 250 | max_uV = opp_get_voltage(opp); | 200 | max_uV = dev_pm_opp_get_voltage(opp); |
| 251 | rcu_read_unlock(); | 201 | rcu_read_unlock(); |
| 252 | ret = regulator_set_voltage_time(cpu_reg, min_uV, max_uV); | 202 | ret = regulator_set_voltage_time(cpu_reg, min_uV, max_uV); |
| 253 | if (ret > 0) | 203 | if (ret > 0) |
| @@ -264,7 +214,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) | |||
| 264 | return 0; | 214 | return 0; |
| 265 | 215 | ||
| 266 | out_free_table: | 216 | out_free_table: |
| 267 | opp_free_cpufreq_table(cpu_dev, &freq_table); | 217 | dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table); |
| 268 | out_put_node: | 218 | out_put_node: |
| 269 | of_node_put(np); | 219 | of_node_put(np); |
| 270 | return ret; | 220 | return ret; |
| @@ -273,7 +223,7 @@ out_put_node: | |||
| 273 | static int cpu0_cpufreq_remove(struct platform_device *pdev) | 223 | static int cpu0_cpufreq_remove(struct platform_device *pdev) |
| 274 | { | 224 | { |
| 275 | cpufreq_unregister_driver(&cpu0_cpufreq_driver); | 225 | cpufreq_unregister_driver(&cpu0_cpufreq_driver); |
| 276 | opp_free_cpufreq_table(cpu_dev, &freq_table); | 226 | dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table); |
| 277 | 227 | ||
| 278 | return 0; | 228 | return 0; |
| 279 | } | 229 | } |
diff --git a/drivers/cpufreq/cpufreq-nforce2.c b/drivers/cpufreq/cpufreq-nforce2.c index b83d45f68574..a05b876f375e 100644 --- a/drivers/cpufreq/cpufreq-nforce2.c +++ b/drivers/cpufreq/cpufreq-nforce2.c | |||
| @@ -303,9 +303,7 @@ static int nforce2_verify(struct cpufreq_policy *policy) | |||
| 303 | if (policy->min < (fsb_pol_max * fid * 100)) | 303 | if (policy->min < (fsb_pol_max * fid * 100)) |
| 304 | policy->max = (fsb_pol_max + 1) * fid * 100; | 304 | policy->max = (fsb_pol_max + 1) * fid * 100; |
| 305 | 305 | ||
| 306 | cpufreq_verify_within_limits(policy, | 306 | cpufreq_verify_within_cpu_limits(policy); |
| 307 | policy->cpuinfo.min_freq, | ||
| 308 | policy->cpuinfo.max_freq); | ||
| 309 | return 0; | 307 | return 0; |
| 310 | } | 308 | } |
| 311 | 309 | ||
| @@ -362,7 +360,6 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy) | |||
| 362 | policy->min = policy->cpuinfo.min_freq = min_fsb * fid * 100; | 360 | policy->min = policy->cpuinfo.min_freq = min_fsb * fid * 100; |
| 363 | policy->max = policy->cpuinfo.max_freq = max_fsb * fid * 100; | 361 | policy->max = policy->cpuinfo.max_freq = max_fsb * fid * 100; |
| 364 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | 362 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; |
| 365 | policy->cur = nforce2_get(policy->cpu); | ||
| 366 | 363 | ||
| 367 | return 0; | 364 | return 0; |
| 368 | } | 365 | } |
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 04548f7023af..6c9cbb9ebd1f 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
| @@ -47,49 +47,11 @@ static LIST_HEAD(cpufreq_policy_list); | |||
| 47 | static DEFINE_PER_CPU(char[CPUFREQ_NAME_LEN], cpufreq_cpu_governor); | 47 | static DEFINE_PER_CPU(char[CPUFREQ_NAME_LEN], cpufreq_cpu_governor); |
| 48 | #endif | 48 | #endif |
| 49 | 49 | ||
| 50 | /* | 50 | static inline bool has_target(void) |
| 51 | * cpu_policy_rwsem is a per CPU reader-writer semaphore designed to cure | 51 | { |
| 52 | * all cpufreq/hotplug/workqueue/etc related lock issues. | 52 | return cpufreq_driver->target_index || cpufreq_driver->target; |
| 53 | * | ||
| 54 | * The rules for this semaphore: | ||
| 55 | * - Any routine that wants to read from the policy structure will | ||
| 56 | * do a down_read on this semaphore. | ||
| 57 | * - Any routine that will write to the policy structure and/or may take away | ||
| 58 | * the policy altogether (eg. CPU hotplug), will hold this lock in write | ||
| 59 | * mode before doing so. | ||
| 60 | * | ||
| 61 | * Additional rules: | ||
| 62 | * - Governor routines that can be called in cpufreq hotplug path should not | ||
| 63 | * take this sem as top level hotplug notifier handler takes this. | ||
| 64 | * - Lock should not be held across | ||
| 65 | * __cpufreq_governor(data, CPUFREQ_GOV_STOP); | ||
| 66 | */ | ||
| 67 | static DEFINE_PER_CPU(struct rw_semaphore, cpu_policy_rwsem); | ||
| 68 | |||
| 69 | #define lock_policy_rwsem(mode, cpu) \ | ||
| 70 | static int lock_policy_rwsem_##mode(int cpu) \ | ||
| 71 | { \ | ||
| 72 | struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu); \ | ||
| 73 | BUG_ON(!policy); \ | ||
| 74 | down_##mode(&per_cpu(cpu_policy_rwsem, policy->cpu)); \ | ||
| 75 | \ | ||
| 76 | return 0; \ | ||
| 77 | } | ||
| 78 | |||
| 79 | lock_policy_rwsem(read, cpu); | ||
| 80 | lock_policy_rwsem(write, cpu); | ||
| 81 | |||
| 82 | #define unlock_policy_rwsem(mode, cpu) \ | ||
| 83 | static void unlock_policy_rwsem_##mode(int cpu) \ | ||
| 84 | { \ | ||
| 85 | struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu); \ | ||
| 86 | BUG_ON(!policy); \ | ||
| 87 | up_##mode(&per_cpu(cpu_policy_rwsem, policy->cpu)); \ | ||
| 88 | } | 53 | } |
| 89 | 54 | ||
| 90 | unlock_policy_rwsem(read, cpu); | ||
| 91 | unlock_policy_rwsem(write, cpu); | ||
| 92 | |||
| 93 | /* | 55 | /* |
| 94 | * rwsem to guarantee that cpufreq driver module doesn't unload during critical | 56 | * rwsem to guarantee that cpufreq driver module doesn't unload during critical |
| 95 | * sections | 57 | * sections |
| @@ -135,7 +97,7 @@ static DEFINE_MUTEX(cpufreq_governor_mutex); | |||
| 135 | 97 | ||
| 136 | bool have_governor_per_policy(void) | 98 | bool have_governor_per_policy(void) |
| 137 | { | 99 | { |
| 138 | return cpufreq_driver->have_governor_per_policy; | 100 | return !!(cpufreq_driver->flags & CPUFREQ_HAVE_GOVERNOR_PER_POLICY); |
| 139 | } | 101 | } |
| 140 | EXPORT_SYMBOL_GPL(have_governor_per_policy); | 102 | EXPORT_SYMBOL_GPL(have_governor_per_policy); |
| 141 | 103 | ||
| @@ -183,6 +145,37 @@ u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy) | |||
| 183 | } | 145 | } |
| 184 | EXPORT_SYMBOL_GPL(get_cpu_idle_time); | 146 | EXPORT_SYMBOL_GPL(get_cpu_idle_time); |
| 185 | 147 | ||
| 148 | /* | ||
| 149 | * This is a generic cpufreq init() routine which can be used by cpufreq | ||
| 150 | * drivers of SMP systems. It will do following: | ||
| 151 | * - validate & show freq table passed | ||
| 152 | * - set policies transition latency | ||
| 153 | * - policy->cpus with all possible CPUs | ||
| 154 | */ | ||
| 155 | int cpufreq_generic_init(struct cpufreq_policy *policy, | ||
| 156 | struct cpufreq_frequency_table *table, | ||
| 157 | unsigned int transition_latency) | ||
| 158 | { | ||
| 159 | int ret; | ||
| 160 | |||
| 161 | ret = cpufreq_table_validate_and_show(policy, table); | ||
| 162 | if (ret) { | ||
| 163 | pr_err("%s: invalid frequency table: %d\n", __func__, ret); | ||
| 164 | return ret; | ||
| 165 | } | ||
| 166 | |||
| 167 | policy->cpuinfo.transition_latency = transition_latency; | ||
| 168 | |||
| 169 | /* | ||
| 170 | * The driver only supports the SMP configuartion where all processors | ||
| 171 | * share the clock and voltage and clock. | ||
| 172 | */ | ||
| 173 | cpumask_setall(policy->cpus); | ||
| 174 | |||
| 175 | return 0; | ||
| 176 | } | ||
| 177 | EXPORT_SYMBOL_GPL(cpufreq_generic_init); | ||
| 178 | |||
| 186 | struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu) | 179 | struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu) |
| 187 | { | 180 | { |
| 188 | struct cpufreq_policy *policy = NULL; | 181 | struct cpufreq_policy *policy = NULL; |
| @@ -363,7 +356,7 @@ static int cpufreq_parse_governor(char *str_governor, unsigned int *policy, | |||
| 363 | *policy = CPUFREQ_POLICY_POWERSAVE; | 356 | *policy = CPUFREQ_POLICY_POWERSAVE; |
| 364 | err = 0; | 357 | err = 0; |
| 365 | } | 358 | } |
| 366 | } else if (cpufreq_driver->target) { | 359 | } else if (has_target()) { |
| 367 | struct cpufreq_governor *t; | 360 | struct cpufreq_governor *t; |
| 368 | 361 | ||
| 369 | mutex_lock(&cpufreq_governor_mutex); | 362 | mutex_lock(&cpufreq_governor_mutex); |
| @@ -414,7 +407,7 @@ show_one(scaling_min_freq, min); | |||
| 414 | show_one(scaling_max_freq, max); | 407 | show_one(scaling_max_freq, max); |
| 415 | show_one(scaling_cur_freq, cur); | 408 | show_one(scaling_cur_freq, cur); |
| 416 | 409 | ||
| 417 | static int __cpufreq_set_policy(struct cpufreq_policy *policy, | 410 | static int cpufreq_set_policy(struct cpufreq_policy *policy, |
| 418 | struct cpufreq_policy *new_policy); | 411 | struct cpufreq_policy *new_policy); |
| 419 | 412 | ||
| 420 | /** | 413 | /** |
| @@ -435,7 +428,7 @@ static ssize_t store_##file_name \ | |||
| 435 | if (ret != 1) \ | 428 | if (ret != 1) \ |
| 436 | return -EINVAL; \ | 429 | return -EINVAL; \ |
| 437 | \ | 430 | \ |
| 438 | ret = __cpufreq_set_policy(policy, &new_policy); \ | 431 | ret = cpufreq_set_policy(policy, &new_policy); \ |
| 439 | policy->user_policy.object = policy->object; \ | 432 | policy->user_policy.object = policy->object; \ |
| 440 | \ | 433 | \ |
| 441 | return ret ? ret : count; \ | 434 | return ret ? ret : count; \ |
| @@ -493,11 +486,7 @@ static ssize_t store_scaling_governor(struct cpufreq_policy *policy, | |||
| 493 | &new_policy.governor)) | 486 | &new_policy.governor)) |
| 494 | return -EINVAL; | 487 | return -EINVAL; |
| 495 | 488 | ||
| 496 | /* | 489 | ret = cpufreq_set_policy(policy, &new_policy); |
| 497 | * Do not use cpufreq_set_policy here or the user_policy.max | ||
| 498 | * will be wrongly overridden | ||
| 499 | */ | ||
| 500 | ret = __cpufreq_set_policy(policy, &new_policy); | ||
| 501 | 490 | ||
| 502 | policy->user_policy.policy = policy->policy; | 491 | policy->user_policy.policy = policy->policy; |
| 503 | policy->user_policy.governor = policy->governor; | 492 | policy->user_policy.governor = policy->governor; |
| @@ -525,7 +514,7 @@ static ssize_t show_scaling_available_governors(struct cpufreq_policy *policy, | |||
| 525 | ssize_t i = 0; | 514 | ssize_t i = 0; |
| 526 | struct cpufreq_governor *t; | 515 | struct cpufreq_governor *t; |
| 527 | 516 | ||
| 528 | if (!cpufreq_driver->target) { | 517 | if (!has_target()) { |
| 529 | i += sprintf(buf, "performance powersave"); | 518 | i += sprintf(buf, "performance powersave"); |
| 530 | goto out; | 519 | goto out; |
| 531 | } | 520 | } |
| @@ -653,24 +642,21 @@ static ssize_t show(struct kobject *kobj, struct attribute *attr, char *buf) | |||
| 653 | { | 642 | { |
| 654 | struct cpufreq_policy *policy = to_policy(kobj); | 643 | struct cpufreq_policy *policy = to_policy(kobj); |
| 655 | struct freq_attr *fattr = to_attr(attr); | 644 | struct freq_attr *fattr = to_attr(attr); |
| 656 | ssize_t ret = -EINVAL; | 645 | ssize_t ret; |
| 657 | 646 | ||
| 658 | if (!down_read_trylock(&cpufreq_rwsem)) | 647 | if (!down_read_trylock(&cpufreq_rwsem)) |
| 659 | goto exit; | 648 | return -EINVAL; |
| 660 | 649 | ||
| 661 | if (lock_policy_rwsem_read(policy->cpu) < 0) | 650 | down_read(&policy->rwsem); |
| 662 | goto up_read; | ||
| 663 | 651 | ||
| 664 | if (fattr->show) | 652 | if (fattr->show) |
| 665 | ret = fattr->show(policy, buf); | 653 | ret = fattr->show(policy, buf); |
| 666 | else | 654 | else |
| 667 | ret = -EIO; | 655 | ret = -EIO; |
| 668 | 656 | ||
| 669 | unlock_policy_rwsem_read(policy->cpu); | 657 | up_read(&policy->rwsem); |
| 670 | |||
| 671 | up_read: | ||
| 672 | up_read(&cpufreq_rwsem); | 658 | up_read(&cpufreq_rwsem); |
| 673 | exit: | 659 | |
| 674 | return ret; | 660 | return ret; |
| 675 | } | 661 | } |
| 676 | 662 | ||
| @@ -689,17 +675,15 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr, | |||
| 689 | if (!down_read_trylock(&cpufreq_rwsem)) | 675 | if (!down_read_trylock(&cpufreq_rwsem)) |
| 690 | goto unlock; | 676 | goto unlock; |
| 691 | 677 | ||
| 692 | if (lock_policy_rwsem_write(policy->cpu) < 0) | 678 | down_write(&policy->rwsem); |
| 693 | goto up_read; | ||
| 694 | 679 | ||
| 695 | if (fattr->store) | 680 | if (fattr->store) |
| 696 | ret = fattr->store(policy, buf, count); | 681 | ret = fattr->store(policy, buf, count); |
| 697 | else | 682 | else |
| 698 | ret = -EIO; | 683 | ret = -EIO; |
| 699 | 684 | ||
| 700 | unlock_policy_rwsem_write(policy->cpu); | 685 | up_write(&policy->rwsem); |
| 701 | 686 | ||
| 702 | up_read: | ||
| 703 | up_read(&cpufreq_rwsem); | 687 | up_read(&cpufreq_rwsem); |
| 704 | unlock: | 688 | unlock: |
| 705 | put_online_cpus(); | 689 | put_online_cpus(); |
| @@ -815,7 +799,7 @@ static int cpufreq_add_dev_interface(struct cpufreq_policy *policy, | |||
| 815 | if (ret) | 799 | if (ret) |
| 816 | goto err_out_kobj_put; | 800 | goto err_out_kobj_put; |
| 817 | } | 801 | } |
| 818 | if (cpufreq_driver->target) { | 802 | if (has_target()) { |
| 819 | ret = sysfs_create_file(&policy->kobj, &scaling_cur_freq.attr); | 803 | ret = sysfs_create_file(&policy->kobj, &scaling_cur_freq.attr); |
| 820 | if (ret) | 804 | if (ret) |
| 821 | goto err_out_kobj_put; | 805 | goto err_out_kobj_put; |
| @@ -844,11 +828,11 @@ static void cpufreq_init_policy(struct cpufreq_policy *policy) | |||
| 844 | int ret = 0; | 828 | int ret = 0; |
| 845 | 829 | ||
| 846 | memcpy(&new_policy, policy, sizeof(*policy)); | 830 | memcpy(&new_policy, policy, sizeof(*policy)); |
| 847 | /* assure that the starting sequence is run in __cpufreq_set_policy */ | 831 | /* assure that the starting sequence is run in cpufreq_set_policy */ |
| 848 | policy->governor = NULL; | 832 | policy->governor = NULL; |
| 849 | 833 | ||
| 850 | /* set default policy */ | 834 | /* set default policy */ |
| 851 | ret = __cpufreq_set_policy(policy, &new_policy); | 835 | ret = cpufreq_set_policy(policy, &new_policy); |
| 852 | policy->user_policy.policy = policy->policy; | 836 | policy->user_policy.policy = policy->policy; |
| 853 | policy->user_policy.governor = policy->governor; | 837 | policy->user_policy.governor = policy->governor; |
| 854 | 838 | ||
| @@ -864,10 +848,10 @@ static int cpufreq_add_policy_cpu(struct cpufreq_policy *policy, | |||
| 864 | unsigned int cpu, struct device *dev, | 848 | unsigned int cpu, struct device *dev, |
| 865 | bool frozen) | 849 | bool frozen) |
| 866 | { | 850 | { |
| 867 | int ret = 0, has_target = !!cpufreq_driver->target; | 851 | int ret = 0; |
| 868 | unsigned long flags; | 852 | unsigned long flags; |
| 869 | 853 | ||
| 870 | if (has_target) { | 854 | if (has_target()) { |
| 871 | ret = __cpufreq_governor(policy, CPUFREQ_GOV_STOP); | 855 | ret = __cpufreq_governor(policy, CPUFREQ_GOV_STOP); |
| 872 | if (ret) { | 856 | if (ret) { |
| 873 | pr_err("%s: Failed to stop governor\n", __func__); | 857 | pr_err("%s: Failed to stop governor\n", __func__); |
| @@ -875,7 +859,7 @@ static int cpufreq_add_policy_cpu(struct cpufreq_policy *policy, | |||
| 875 | } | 859 | } |
| 876 | } | 860 | } |
| 877 | 861 | ||
| 878 | lock_policy_rwsem_write(policy->cpu); | 862 | down_write(&policy->rwsem); |
| 879 | 863 | ||
| 880 | write_lock_irqsave(&cpufreq_driver_lock, flags); | 864 | write_lock_irqsave(&cpufreq_driver_lock, flags); |
| 881 | 865 | ||
| @@ -883,9 +867,9 @@ static int cpufreq_add_policy_cpu(struct cpufreq_policy *policy, | |||
| 883 | per_cpu(cpufreq_cpu_data, cpu) = policy; | 867 | per_cpu(cpufreq_cpu_data, cpu) = policy; |
| 884 | write_unlock_irqrestore(&cpufreq_driver_lock, flags); | 868 | write_unlock_irqrestore(&cpufreq_driver_lock, flags); |
| 885 | 869 | ||
| 886 | unlock_policy_rwsem_write(policy->cpu); | 870 | up_write(&policy->rwsem); |
| 887 | 871 | ||
| 888 | if (has_target) { | 872 | if (has_target()) { |
| 889 | if ((ret = __cpufreq_governor(policy, CPUFREQ_GOV_START)) || | 873 | if ((ret = __cpufreq_governor(policy, CPUFREQ_GOV_START)) || |
| 890 | (ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS))) { | 874 | (ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS))) { |
| 891 | pr_err("%s: Failed to start governor\n", __func__); | 875 | pr_err("%s: Failed to start governor\n", __func__); |
| @@ -930,6 +914,8 @@ static struct cpufreq_policy *cpufreq_policy_alloc(void) | |||
| 930 | goto err_free_cpumask; | 914 | goto err_free_cpumask; |
| 931 | 915 | ||
| 932 | INIT_LIST_HEAD(&policy->policy_list); | 916 | INIT_LIST_HEAD(&policy->policy_list); |
| 917 | init_rwsem(&policy->rwsem); | ||
| 918 | |||
| 933 | return policy; | 919 | return policy; |
| 934 | 920 | ||
| 935 | err_free_cpumask: | 921 | err_free_cpumask: |
| @@ -949,26 +935,17 @@ static void cpufreq_policy_free(struct cpufreq_policy *policy) | |||
| 949 | 935 | ||
| 950 | static void update_policy_cpu(struct cpufreq_policy *policy, unsigned int cpu) | 936 | static void update_policy_cpu(struct cpufreq_policy *policy, unsigned int cpu) |
| 951 | { | 937 | { |
| 952 | if (cpu == policy->cpu) | 938 | if (WARN_ON(cpu == policy->cpu)) |
| 953 | return; | 939 | return; |
| 954 | 940 | ||
| 955 | /* | 941 | down_write(&policy->rwsem); |
| 956 | * Take direct locks as lock_policy_rwsem_write wouldn't work here. | ||
| 957 | * Also lock for last cpu is enough here as contention will happen only | ||
| 958 | * after policy->cpu is changed and after it is changed, other threads | ||
| 959 | * will try to acquire lock for new cpu. And policy is already updated | ||
| 960 | * by then. | ||
| 961 | */ | ||
| 962 | down_write(&per_cpu(cpu_policy_rwsem, policy->cpu)); | ||
| 963 | 942 | ||
| 964 | policy->last_cpu = policy->cpu; | 943 | policy->last_cpu = policy->cpu; |
| 965 | policy->cpu = cpu; | 944 | policy->cpu = cpu; |
| 966 | 945 | ||
| 967 | up_write(&per_cpu(cpu_policy_rwsem, policy->last_cpu)); | 946 | up_write(&policy->rwsem); |
| 968 | 947 | ||
| 969 | #ifdef CONFIG_CPU_FREQ_TABLE | ||
| 970 | cpufreq_frequency_table_update_policy_cpu(policy); | 948 | cpufreq_frequency_table_update_policy_cpu(policy); |
| 971 | #endif | ||
| 972 | blocking_notifier_call_chain(&cpufreq_policy_notifier_list, | 949 | blocking_notifier_call_chain(&cpufreq_policy_notifier_list, |
| 973 | CPUFREQ_UPDATE_POLICY_CPU, policy); | 950 | CPUFREQ_UPDATE_POLICY_CPU, policy); |
| 974 | } | 951 | } |
| @@ -1053,6 +1030,14 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif, | |||
| 1053 | goto err_set_policy_cpu; | 1030 | goto err_set_policy_cpu; |
| 1054 | } | 1031 | } |
| 1055 | 1032 | ||
| 1033 | if (cpufreq_driver->get) { | ||
| 1034 | policy->cur = cpufreq_driver->get(policy->cpu); | ||
| 1035 | if (!policy->cur) { | ||
| 1036 | pr_err("%s: ->get() failed\n", __func__); | ||
| 1037 | goto err_get_freq; | ||
| 1038 | } | ||
| 1039 | } | ||
| 1040 | |||
| 1056 | /* related cpus should atleast have policy->cpus */ | 1041 | /* related cpus should atleast have policy->cpus */ |
| 1057 | cpumask_or(policy->related_cpus, policy->related_cpus, policy->cpus); | 1042 | cpumask_or(policy->related_cpus, policy->related_cpus, policy->cpus); |
| 1058 | 1043 | ||
| @@ -1107,6 +1092,9 @@ err_out_unregister: | |||
| 1107 | per_cpu(cpufreq_cpu_data, j) = NULL; | 1092 | per_cpu(cpufreq_cpu_data, j) = NULL; |
| 1108 | write_unlock_irqrestore(&cpufreq_driver_lock, flags); | 1093 | write_unlock_irqrestore(&cpufreq_driver_lock, flags); |
| 1109 | 1094 | ||
| 1095 | err_get_freq: | ||
| 1096 | if (cpufreq_driver->exit) | ||
| 1097 | cpufreq_driver->exit(policy); | ||
| 1110 | err_set_policy_cpu: | 1098 | err_set_policy_cpu: |
| 1111 | cpufreq_policy_free(policy); | 1099 | cpufreq_policy_free(policy); |
| 1112 | nomem_out: | 1100 | nomem_out: |
| @@ -1147,9 +1135,9 @@ static int cpufreq_nominate_new_policy_cpu(struct cpufreq_policy *policy, | |||
| 1147 | if (ret) { | 1135 | if (ret) { |
| 1148 | pr_err("%s: Failed to move kobj: %d", __func__, ret); | 1136 | pr_err("%s: Failed to move kobj: %d", __func__, ret); |
| 1149 | 1137 | ||
| 1150 | WARN_ON(lock_policy_rwsem_write(old_cpu)); | 1138 | down_write(&policy->rwsem); |
| 1151 | cpumask_set_cpu(old_cpu, policy->cpus); | 1139 | cpumask_set_cpu(old_cpu, policy->cpus); |
| 1152 | unlock_policy_rwsem_write(old_cpu); | 1140 | up_write(&policy->rwsem); |
| 1153 | 1141 | ||
| 1154 | ret = sysfs_create_link(&cpu_dev->kobj, &policy->kobj, | 1142 | ret = sysfs_create_link(&cpu_dev->kobj, &policy->kobj, |
| 1155 | "cpufreq"); | 1143 | "cpufreq"); |
| @@ -1186,7 +1174,7 @@ static int __cpufreq_remove_dev_prepare(struct device *dev, | |||
| 1186 | return -EINVAL; | 1174 | return -EINVAL; |
| 1187 | } | 1175 | } |
| 1188 | 1176 | ||
| 1189 | if (cpufreq_driver->target) { | 1177 | if (has_target()) { |
| 1190 | ret = __cpufreq_governor(policy, CPUFREQ_GOV_STOP); | 1178 | ret = __cpufreq_governor(policy, CPUFREQ_GOV_STOP); |
| 1191 | if (ret) { | 1179 | if (ret) { |
| 1192 | pr_err("%s: Failed to stop governor\n", __func__); | 1180 | pr_err("%s: Failed to stop governor\n", __func__); |
| @@ -1200,22 +1188,21 @@ static int __cpufreq_remove_dev_prepare(struct device *dev, | |||
| 1200 | policy->governor->name, CPUFREQ_NAME_LEN); | 1188 | policy->governor->name, CPUFREQ_NAME_LEN); |
| 1201 | #endif | 1189 | #endif |
| 1202 | 1190 | ||
| 1203 | lock_policy_rwsem_read(cpu); | 1191 | down_read(&policy->rwsem); |
| 1204 | cpus = cpumask_weight(policy->cpus); | 1192 | cpus = cpumask_weight(policy->cpus); |
| 1205 | unlock_policy_rwsem_read(cpu); | 1193 | up_read(&policy->rwsem); |
| 1206 | 1194 | ||
| 1207 | if (cpu != policy->cpu) { | 1195 | if (cpu != policy->cpu) { |
| 1208 | if (!frozen) | 1196 | if (!frozen) |
| 1209 | sysfs_remove_link(&dev->kobj, "cpufreq"); | 1197 | sysfs_remove_link(&dev->kobj, "cpufreq"); |
| 1210 | } else if (cpus > 1) { | 1198 | } else if (cpus > 1) { |
| 1211 | |||
| 1212 | new_cpu = cpufreq_nominate_new_policy_cpu(policy, cpu, frozen); | 1199 | new_cpu = cpufreq_nominate_new_policy_cpu(policy, cpu, frozen); |
| 1213 | if (new_cpu >= 0) { | 1200 | if (new_cpu >= 0) { |
| 1214 | update_policy_cpu(policy, new_cpu); | 1201 | update_policy_cpu(policy, new_cpu); |
| 1215 | 1202 | ||
| 1216 | if (!frozen) { | 1203 | if (!frozen) { |
| 1217 | pr_debug("%s: policy Kobject moved to cpu: %d " | 1204 | pr_debug("%s: policy Kobject moved to cpu: %d from: %d\n", |
| 1218 | "from: %d\n",__func__, new_cpu, cpu); | 1205 | __func__, new_cpu, cpu); |
| 1219 | } | 1206 | } |
| 1220 | } | 1207 | } |
| 1221 | } | 1208 | } |
| @@ -1243,16 +1230,16 @@ static int __cpufreq_remove_dev_finish(struct device *dev, | |||
| 1243 | return -EINVAL; | 1230 | return -EINVAL; |
| 1244 | } | 1231 | } |
| 1245 | 1232 | ||
| 1246 | WARN_ON(lock_policy_rwsem_write(cpu)); | 1233 | down_write(&policy->rwsem); |
| 1247 | cpus = cpumask_weight(policy->cpus); | 1234 | cpus = cpumask_weight(policy->cpus); |
| 1248 | 1235 | ||
| 1249 | if (cpus > 1) | 1236 | if (cpus > 1) |
| 1250 | cpumask_clear_cpu(cpu, policy->cpus); | 1237 | cpumask_clear_cpu(cpu, policy->cpus); |
| 1251 | unlock_policy_rwsem_write(cpu); | 1238 | up_write(&policy->rwsem); |
| 1252 | 1239 | ||
| 1253 | /* If cpu is last user of policy, free policy */ | 1240 | /* If cpu is last user of policy, free policy */ |
| 1254 | if (cpus == 1) { | 1241 | if (cpus == 1) { |
| 1255 | if (cpufreq_driver->target) { | 1242 | if (has_target()) { |
| 1256 | ret = __cpufreq_governor(policy, | 1243 | ret = __cpufreq_governor(policy, |
| 1257 | CPUFREQ_GOV_POLICY_EXIT); | 1244 | CPUFREQ_GOV_POLICY_EXIT); |
| 1258 | if (ret) { | 1245 | if (ret) { |
| @@ -1263,10 +1250,10 @@ static int __cpufreq_remove_dev_finish(struct device *dev, | |||
| 1263 | } | 1250 | } |
| 1264 | 1251 | ||
| 1265 | if (!frozen) { | 1252 | if (!frozen) { |
| 1266 | lock_policy_rwsem_read(cpu); | 1253 | down_read(&policy->rwsem); |
| 1267 | kobj = &policy->kobj; | 1254 | kobj = &policy->kobj; |
| 1268 | cmp = &policy->kobj_unregister; | 1255 | cmp = &policy->kobj_unregister; |
| 1269 | unlock_policy_rwsem_read(cpu); | 1256 | up_read(&policy->rwsem); |
| 1270 | kobject_put(kobj); | 1257 | kobject_put(kobj); |
| 1271 | 1258 | ||
| 1272 | /* | 1259 | /* |
| @@ -1295,7 +1282,7 @@ static int __cpufreq_remove_dev_finish(struct device *dev, | |||
| 1295 | if (!frozen) | 1282 | if (!frozen) |
| 1296 | cpufreq_policy_free(policy); | 1283 | cpufreq_policy_free(policy); |
| 1297 | } else { | 1284 | } else { |
| 1298 | if (cpufreq_driver->target) { | 1285 | if (has_target()) { |
| 1299 | if ((ret = __cpufreq_governor(policy, CPUFREQ_GOV_START)) || | 1286 | if ((ret = __cpufreq_governor(policy, CPUFREQ_GOV_START)) || |
| 1300 | (ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS))) { | 1287 | (ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS))) { |
| 1301 | pr_err("%s: Failed to start governor\n", | 1288 | pr_err("%s: Failed to start governor\n", |
| @@ -1310,36 +1297,24 @@ static int __cpufreq_remove_dev_finish(struct device *dev, | |||
| 1310 | } | 1297 | } |
| 1311 | 1298 | ||
| 1312 | /** | 1299 | /** |
| 1313 | * __cpufreq_remove_dev - remove a CPU device | 1300 | * cpufreq_remove_dev - remove a CPU device |
| 1314 | * | 1301 | * |
| 1315 | * Removes the cpufreq interface for a CPU device. | 1302 | * Removes the cpufreq interface for a CPU device. |
| 1316 | * Caller should already have policy_rwsem in write mode for this CPU. | ||
| 1317 | * This routine frees the rwsem before returning. | ||
| 1318 | */ | 1303 | */ |
| 1319 | static inline int __cpufreq_remove_dev(struct device *dev, | ||
| 1320 | struct subsys_interface *sif, | ||
| 1321 | bool frozen) | ||
| 1322 | { | ||
| 1323 | int ret; | ||
| 1324 | |||
| 1325 | ret = __cpufreq_remove_dev_prepare(dev, sif, frozen); | ||
| 1326 | |||
| 1327 | if (!ret) | ||
| 1328 | ret = __cpufreq_remove_dev_finish(dev, sif, frozen); | ||
| 1329 | |||
| 1330 | return ret; | ||
| 1331 | } | ||
| 1332 | |||
| 1333 | static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif) | 1304 | static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif) |
| 1334 | { | 1305 | { |
| 1335 | unsigned int cpu = dev->id; | 1306 | unsigned int cpu = dev->id; |
| 1336 | int retval; | 1307 | int ret; |
| 1337 | 1308 | ||
| 1338 | if (cpu_is_offline(cpu)) | 1309 | if (cpu_is_offline(cpu)) |
| 1339 | return 0; | 1310 | return 0; |
| 1340 | 1311 | ||
| 1341 | retval = __cpufreq_remove_dev(dev, sif, false); | 1312 | ret = __cpufreq_remove_dev_prepare(dev, sif, false); |
| 1342 | return retval; | 1313 | |
| 1314 | if (!ret) | ||
| 1315 | ret = __cpufreq_remove_dev_finish(dev, sif, false); | ||
| 1316 | |||
| 1317 | return ret; | ||
| 1343 | } | 1318 | } |
| 1344 | 1319 | ||
| 1345 | static void handle_update(struct work_struct *work) | 1320 | static void handle_update(struct work_struct *work) |
| @@ -1458,22 +1433,22 @@ static unsigned int __cpufreq_get(unsigned int cpu) | |||
| 1458 | */ | 1433 | */ |
| 1459 | unsigned int cpufreq_get(unsigned int cpu) | 1434 | unsigned int cpufreq_get(unsigned int cpu) |
| 1460 | { | 1435 | { |
| 1436 | struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu); | ||
| 1461 | unsigned int ret_freq = 0; | 1437 | unsigned int ret_freq = 0; |
| 1462 | 1438 | ||
| 1463 | if (cpufreq_disabled() || !cpufreq_driver) | 1439 | if (cpufreq_disabled() || !cpufreq_driver) |
| 1464 | return -ENOENT; | 1440 | return -ENOENT; |
| 1465 | 1441 | ||
| 1442 | BUG_ON(!policy); | ||
| 1443 | |||
| 1466 | if (!down_read_trylock(&cpufreq_rwsem)) | 1444 | if (!down_read_trylock(&cpufreq_rwsem)) |
| 1467 | return 0; | 1445 | return 0; |
| 1468 | 1446 | ||
| 1469 | if (unlikely(lock_policy_rwsem_read(cpu))) | 1447 | down_read(&policy->rwsem); |
| 1470 | goto out_policy; | ||
| 1471 | 1448 | ||
| 1472 | ret_freq = __cpufreq_get(cpu); | 1449 | ret_freq = __cpufreq_get(cpu); |
| 1473 | 1450 | ||
| 1474 | unlock_policy_rwsem_read(cpu); | 1451 | up_read(&policy->rwsem); |
| 1475 | |||
| 1476 | out_policy: | ||
| 1477 | up_read(&cpufreq_rwsem); | 1452 | up_read(&cpufreq_rwsem); |
| 1478 | 1453 | ||
| 1479 | return ret_freq; | 1454 | return ret_freq; |
| @@ -1681,12 +1656,41 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, | |||
| 1681 | pr_debug("target for CPU %u: %u kHz, relation %u, requested %u kHz\n", | 1656 | pr_debug("target for CPU %u: %u kHz, relation %u, requested %u kHz\n", |
| 1682 | policy->cpu, target_freq, relation, old_target_freq); | 1657 | policy->cpu, target_freq, relation, old_target_freq); |
| 1683 | 1658 | ||
| 1659 | /* | ||
| 1660 | * This might look like a redundant call as we are checking it again | ||
| 1661 | * after finding index. But it is left intentionally for cases where | ||
| 1662 | * exactly same freq is called again and so we can save on few function | ||
| 1663 | * calls. | ||
| 1664 | */ | ||
| 1684 | if (target_freq == policy->cur) | 1665 | if (target_freq == policy->cur) |
| 1685 | return 0; | 1666 | return 0; |
| 1686 | 1667 | ||
| 1687 | if (cpufreq_driver->target) | 1668 | if (cpufreq_driver->target) |
| 1688 | retval = cpufreq_driver->target(policy, target_freq, relation); | 1669 | retval = cpufreq_driver->target(policy, target_freq, relation); |
| 1670 | else if (cpufreq_driver->target_index) { | ||
| 1671 | struct cpufreq_frequency_table *freq_table; | ||
| 1672 | int index; | ||
| 1673 | |||
| 1674 | freq_table = cpufreq_frequency_get_table(policy->cpu); | ||
| 1675 | if (unlikely(!freq_table)) { | ||
| 1676 | pr_err("%s: Unable to find freq_table\n", __func__); | ||
| 1677 | goto out; | ||
| 1678 | } | ||
| 1679 | |||
| 1680 | retval = cpufreq_frequency_table_target(policy, freq_table, | ||
| 1681 | target_freq, relation, &index); | ||
| 1682 | if (unlikely(retval)) { | ||
| 1683 | pr_err("%s: Unable to find matching freq\n", __func__); | ||
| 1684 | goto out; | ||
| 1685 | } | ||
| 1689 | 1686 | ||
| 1687 | if (freq_table[index].frequency == policy->cur) | ||
| 1688 | retval = 0; | ||
| 1689 | else | ||
| 1690 | retval = cpufreq_driver->target_index(policy, index); | ||
| 1691 | } | ||
| 1692 | |||
| 1693 | out: | ||
| 1690 | return retval; | 1694 | return retval; |
| 1691 | } | 1695 | } |
| 1692 | EXPORT_SYMBOL_GPL(__cpufreq_driver_target); | 1696 | EXPORT_SYMBOL_GPL(__cpufreq_driver_target); |
| @@ -1697,14 +1701,12 @@ int cpufreq_driver_target(struct cpufreq_policy *policy, | |||
| 1697 | { | 1701 | { |
| 1698 | int ret = -EINVAL; | 1702 | int ret = -EINVAL; |
| 1699 | 1703 | ||
| 1700 | if (unlikely(lock_policy_rwsem_write(policy->cpu))) | 1704 | down_write(&policy->rwsem); |
| 1701 | goto fail; | ||
| 1702 | 1705 | ||
| 1703 | ret = __cpufreq_driver_target(policy, target_freq, relation); | 1706 | ret = __cpufreq_driver_target(policy, target_freq, relation); |
| 1704 | 1707 | ||
| 1705 | unlock_policy_rwsem_write(policy->cpu); | 1708 | up_write(&policy->rwsem); |
| 1706 | 1709 | ||
| 1707 | fail: | ||
| 1708 | return ret; | 1710 | return ret; |
| 1709 | } | 1711 | } |
| 1710 | EXPORT_SYMBOL_GPL(cpufreq_driver_target); | 1712 | EXPORT_SYMBOL_GPL(cpufreq_driver_target); |
| @@ -1871,10 +1873,10 @@ int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu) | |||
| 1871 | EXPORT_SYMBOL(cpufreq_get_policy); | 1873 | EXPORT_SYMBOL(cpufreq_get_policy); |
| 1872 | 1874 | ||
| 1873 | /* | 1875 | /* |
| 1874 | * data : current policy. | 1876 | * policy : current policy. |
| 1875 | * policy : policy to be set. | 1877 | * new_policy: policy to be set. |
| 1876 | */ | 1878 | */ |
| 1877 | static int __cpufreq_set_policy(struct cpufreq_policy *policy, | 1879 | static int cpufreq_set_policy(struct cpufreq_policy *policy, |
| 1878 | struct cpufreq_policy *new_policy) | 1880 | struct cpufreq_policy *new_policy) |
| 1879 | { | 1881 | { |
| 1880 | int ret = 0, failed = 1; | 1882 | int ret = 0, failed = 1; |
| @@ -1934,10 +1936,10 @@ static int __cpufreq_set_policy(struct cpufreq_policy *policy, | |||
| 1934 | /* end old governor */ | 1936 | /* end old governor */ |
| 1935 | if (policy->governor) { | 1937 | if (policy->governor) { |
| 1936 | __cpufreq_governor(policy, CPUFREQ_GOV_STOP); | 1938 | __cpufreq_governor(policy, CPUFREQ_GOV_STOP); |
| 1937 | unlock_policy_rwsem_write(new_policy->cpu); | 1939 | up_write(&policy->rwsem); |
| 1938 | __cpufreq_governor(policy, | 1940 | __cpufreq_governor(policy, |
| 1939 | CPUFREQ_GOV_POLICY_EXIT); | 1941 | CPUFREQ_GOV_POLICY_EXIT); |
| 1940 | lock_policy_rwsem_write(new_policy->cpu); | 1942 | down_write(&policy->rwsem); |
| 1941 | } | 1943 | } |
| 1942 | 1944 | ||
| 1943 | /* start new governor */ | 1945 | /* start new governor */ |
| @@ -1946,10 +1948,10 @@ static int __cpufreq_set_policy(struct cpufreq_policy *policy, | |||
| 1946 | if (!__cpufreq_governor(policy, CPUFREQ_GOV_START)) { | 1948 | if (!__cpufreq_governor(policy, CPUFREQ_GOV_START)) { |
| 1947 | failed = 0; | 1949 | failed = 0; |
| 1948 | } else { | 1950 | } else { |
| 1949 | unlock_policy_rwsem_write(new_policy->cpu); | 1951 | up_write(&policy->rwsem); |
| 1950 | __cpufreq_governor(policy, | 1952 | __cpufreq_governor(policy, |
| 1951 | CPUFREQ_GOV_POLICY_EXIT); | 1953 | CPUFREQ_GOV_POLICY_EXIT); |
| 1952 | lock_policy_rwsem_write(new_policy->cpu); | 1954 | down_write(&policy->rwsem); |
| 1953 | } | 1955 | } |
| 1954 | } | 1956 | } |
| 1955 | 1957 | ||
| @@ -1995,10 +1997,7 @@ int cpufreq_update_policy(unsigned int cpu) | |||
| 1995 | goto no_policy; | 1997 | goto no_policy; |
| 1996 | } | 1998 | } |
| 1997 | 1999 | ||
| 1998 | if (unlikely(lock_policy_rwsem_write(cpu))) { | 2000 | down_write(&policy->rwsem); |
| 1999 | ret = -EINVAL; | ||
| 2000 | goto fail; | ||
| 2001 | } | ||
| 2002 | 2001 | ||
| 2003 | pr_debug("updating policy for CPU %u\n", cpu); | 2002 | pr_debug("updating policy for CPU %u\n", cpu); |
| 2004 | memcpy(&new_policy, policy, sizeof(*policy)); | 2003 | memcpy(&new_policy, policy, sizeof(*policy)); |
| @@ -2017,17 +2016,16 @@ int cpufreq_update_policy(unsigned int cpu) | |||
| 2017 | pr_debug("Driver did not initialize current freq"); | 2016 | pr_debug("Driver did not initialize current freq"); |
| 2018 | policy->cur = new_policy.cur; | 2017 | policy->cur = new_policy.cur; |
| 2019 | } else { | 2018 | } else { |
| 2020 | if (policy->cur != new_policy.cur && cpufreq_driver->target) | 2019 | if (policy->cur != new_policy.cur && has_target()) |
| 2021 | cpufreq_out_of_sync(cpu, policy->cur, | 2020 | cpufreq_out_of_sync(cpu, policy->cur, |
| 2022 | new_policy.cur); | 2021 | new_policy.cur); |
| 2023 | } | 2022 | } |
| 2024 | } | 2023 | } |
| 2025 | 2024 | ||
| 2026 | ret = __cpufreq_set_policy(policy, &new_policy); | 2025 | ret = cpufreq_set_policy(policy, &new_policy); |
| 2027 | 2026 | ||
| 2028 | unlock_policy_rwsem_write(cpu); | 2027 | up_write(&policy->rwsem); |
| 2029 | 2028 | ||
| 2030 | fail: | ||
| 2031 | cpufreq_cpu_put(policy); | 2029 | cpufreq_cpu_put(policy); |
| 2032 | no_policy: | 2030 | no_policy: |
| 2033 | return ret; | 2031 | return ret; |
| @@ -2096,7 +2094,8 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) | |||
| 2096 | return -ENODEV; | 2094 | return -ENODEV; |
| 2097 | 2095 | ||
| 2098 | if (!driver_data || !driver_data->verify || !driver_data->init || | 2096 | if (!driver_data || !driver_data->verify || !driver_data->init || |
| 2099 | ((!driver_data->setpolicy) && (!driver_data->target))) | 2097 | !(driver_data->setpolicy || driver_data->target_index || |
| 2098 | driver_data->target)) | ||
| 2100 | return -EINVAL; | 2099 | return -EINVAL; |
| 2101 | 2100 | ||
| 2102 | pr_debug("trying to register driver %s\n", driver_data->name); | 2101 | pr_debug("trying to register driver %s\n", driver_data->name); |
| @@ -2183,14 +2182,9 @@ EXPORT_SYMBOL_GPL(cpufreq_unregister_driver); | |||
| 2183 | 2182 | ||
| 2184 | static int __init cpufreq_core_init(void) | 2183 | static int __init cpufreq_core_init(void) |
| 2185 | { | 2184 | { |
| 2186 | int cpu; | ||
| 2187 | |||
| 2188 | if (cpufreq_disabled()) | 2185 | if (cpufreq_disabled()) |
| 2189 | return -ENODEV; | 2186 | return -ENODEV; |
| 2190 | 2187 | ||
| 2191 | for_each_possible_cpu(cpu) | ||
| 2192 | init_rwsem(&per_cpu(cpu_policy_rwsem, cpu)); | ||
| 2193 | |||
| 2194 | cpufreq_global_kobject = kobject_create(); | 2188 | cpufreq_global_kobject = kobject_create(); |
| 2195 | BUG_ON(!cpufreq_global_kobject); | 2189 | BUG_ON(!cpufreq_global_kobject); |
| 2196 | register_syscore_ops(&cpufreq_syscore_ops); | 2190 | register_syscore_ops(&cpufreq_syscore_ops); |
diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h index 88cd39f7b0e9..b5f2b8618949 100644 --- a/drivers/cpufreq/cpufreq_governor.h +++ b/drivers/cpufreq/cpufreq_governor.h | |||
| @@ -191,7 +191,10 @@ struct common_dbs_data { | |||
| 191 | struct attribute_group *attr_group_gov_sys; /* one governor - system */ | 191 | struct attribute_group *attr_group_gov_sys; /* one governor - system */ |
| 192 | struct attribute_group *attr_group_gov_pol; /* one governor - policy */ | 192 | struct attribute_group *attr_group_gov_pol; /* one governor - policy */ |
| 193 | 193 | ||
| 194 | /* Common data for platforms that don't set have_governor_per_policy */ | 194 | /* |
| 195 | * Common data for platforms that don't set | ||
| 196 | * CPUFREQ_HAVE_GOVERNOR_PER_POLICY | ||
| 197 | */ | ||
| 195 | struct dbs_data *gdbs_data; | 198 | struct dbs_data *gdbs_data; |
| 196 | 199 | ||
| 197 | struct cpu_dbs_common_info *(*get_cpu_cdbs)(int cpu); | 200 | struct cpu_dbs_common_info *(*get_cpu_cdbs)(int cpu); |
diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c index 03078090b5f7..4dbf1db16aca 100644 --- a/drivers/cpufreq/cpufreq_userspace.c +++ b/drivers/cpufreq/cpufreq_userspace.c | |||
| @@ -38,18 +38,7 @@ static int cpufreq_set(struct cpufreq_policy *policy, unsigned int freq) | |||
| 38 | if (!per_cpu(cpu_is_managed, policy->cpu)) | 38 | if (!per_cpu(cpu_is_managed, policy->cpu)) |
| 39 | goto err; | 39 | goto err; |
| 40 | 40 | ||
| 41 | /* | ||
| 42 | * We're safe from concurrent calls to ->target() here | ||
| 43 | * as we hold the userspace_mutex lock. If we were calling | ||
| 44 | * cpufreq_driver_target, a deadlock situation might occur: | ||
| 45 | * A: cpufreq_set (lock userspace_mutex) -> | ||
| 46 | * cpufreq_driver_target(lock policy->lock) | ||
| 47 | * B: cpufreq_set_policy(lock policy->lock) -> | ||
| 48 | * __cpufreq_governor -> | ||
| 49 | * cpufreq_governor_userspace (lock userspace_mutex) | ||
| 50 | */ | ||
| 51 | ret = __cpufreq_driver_target(policy, freq, CPUFREQ_RELATION_L); | 41 | ret = __cpufreq_driver_target(policy, freq, CPUFREQ_RELATION_L); |
| 52 | |||
| 53 | err: | 42 | err: |
| 54 | mutex_unlock(&userspace_mutex); | 43 | mutex_unlock(&userspace_mutex); |
| 55 | return ret; | 44 | return ret; |
diff --git a/drivers/cpufreq/cris-artpec3-cpufreq.c b/drivers/cpufreq/cris-artpec3-cpufreq.c index cb8276dd19ca..841857cf1562 100644 --- a/drivers/cpufreq/cris-artpec3-cpufreq.c +++ b/drivers/cpufreq/cris-artpec3-cpufreq.c | |||
| @@ -27,8 +27,7 @@ static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu) | |||
| 27 | return clk_ctrl.pll ? 200000 : 6000; | 27 | return clk_ctrl.pll ? 200000 : 6000; |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | static void cris_freq_set_cpu_state(struct cpufreq_policy *policy, | 30 | static int cris_freq_target(struct cpufreq_policy *policy, unsigned int state) |
| 31 | unsigned int state) | ||
| 32 | { | 31 | { |
| 33 | struct cpufreq_freqs freqs; | 32 | struct cpufreq_freqs freqs; |
| 34 | reg_clkgen_rw_clk_ctrl clk_ctrl; | 33 | reg_clkgen_rw_clk_ctrl clk_ctrl; |
| @@ -52,66 +51,23 @@ static void cris_freq_set_cpu_state(struct cpufreq_policy *policy, | |||
| 52 | local_irq_enable(); | 51 | local_irq_enable(); |
| 53 | 52 | ||
| 54 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 53 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 55 | }; | ||
| 56 | |||
| 57 | static int cris_freq_verify(struct cpufreq_policy *policy) | ||
| 58 | { | ||
| 59 | return cpufreq_frequency_table_verify(policy, &cris_freq_table[0]); | ||
| 60 | } | ||
| 61 | |||
| 62 | static int cris_freq_target(struct cpufreq_policy *policy, | ||
| 63 | unsigned int target_freq, | ||
| 64 | unsigned int relation) | ||
| 65 | { | ||
| 66 | unsigned int newstate = 0; | ||
| 67 | |||
| 68 | if (cpufreq_frequency_table_target(policy, cris_freq_table, | ||
| 69 | target_freq, relation, &newstate)) | ||
| 70 | return -EINVAL; | ||
| 71 | |||
| 72 | cris_freq_set_cpu_state(policy, newstate); | ||
| 73 | 54 | ||
| 74 | return 0; | 55 | return 0; |
| 75 | } | 56 | } |
| 76 | 57 | ||
| 77 | static int cris_freq_cpu_init(struct cpufreq_policy *policy) | 58 | static int cris_freq_cpu_init(struct cpufreq_policy *policy) |
| 78 | { | 59 | { |
| 79 | int result; | 60 | return cpufreq_generic_init(policy, cris_freq_table, 1000000); |
| 80 | |||
| 81 | /* cpuinfo and default policy values */ | ||
| 82 | policy->cpuinfo.transition_latency = 1000000; /* 1ms */ | ||
| 83 | policy->cur = cris_freq_get_cpu_frequency(0); | ||
| 84 | |||
| 85 | result = cpufreq_frequency_table_cpuinfo(policy, cris_freq_table); | ||
| 86 | if (result) | ||
| 87 | return (result); | ||
| 88 | |||
| 89 | cpufreq_frequency_table_get_attr(cris_freq_table, policy->cpu); | ||
| 90 | |||
| 91 | return 0; | ||
| 92 | } | ||
| 93 | |||
| 94 | |||
| 95 | static int cris_freq_cpu_exit(struct cpufreq_policy *policy) | ||
| 96 | { | ||
| 97 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 98 | return 0; | ||
| 99 | } | 61 | } |
| 100 | 62 | ||
| 101 | |||
| 102 | static struct freq_attr *cris_freq_attr[] = { | ||
| 103 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 104 | NULL, | ||
| 105 | }; | ||
| 106 | |||
| 107 | static struct cpufreq_driver cris_freq_driver = { | 63 | static struct cpufreq_driver cris_freq_driver = { |
| 108 | .get = cris_freq_get_cpu_frequency, | 64 | .get = cris_freq_get_cpu_frequency, |
| 109 | .verify = cris_freq_verify, | 65 | .verify = cpufreq_generic_frequency_table_verify, |
| 110 | .target = cris_freq_target, | 66 | .target_index = cris_freq_target, |
| 111 | .init = cris_freq_cpu_init, | 67 | .init = cris_freq_cpu_init, |
| 112 | .exit = cris_freq_cpu_exit, | 68 | .exit = cpufreq_generic_exit, |
| 113 | .name = "cris_freq", | 69 | .name = "cris_freq", |
| 114 | .attr = cris_freq_attr, | 70 | .attr = cpufreq_generic_attr, |
| 115 | }; | 71 | }; |
| 116 | 72 | ||
| 117 | static int __init cris_freq_init(void) | 73 | static int __init cris_freq_init(void) |
diff --git a/drivers/cpufreq/cris-etraxfs-cpufreq.c b/drivers/cpufreq/cris-etraxfs-cpufreq.c index 72328f77dc53..c58811abd961 100644 --- a/drivers/cpufreq/cris-etraxfs-cpufreq.c +++ b/drivers/cpufreq/cris-etraxfs-cpufreq.c | |||
| @@ -27,8 +27,7 @@ static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu) | |||
| 27 | return clk_ctrl.pll ? 200000 : 6000; | 27 | return clk_ctrl.pll ? 200000 : 6000; |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | static void cris_freq_set_cpu_state(struct cpufreq_policy *policy, | 30 | static int cris_freq_target(struct cpufreq_policy *policy, unsigned int state) |
| 31 | unsigned int state) | ||
| 32 | { | 31 | { |
| 33 | struct cpufreq_freqs freqs; | 32 | struct cpufreq_freqs freqs; |
| 34 | reg_config_rw_clk_ctrl clk_ctrl; | 33 | reg_config_rw_clk_ctrl clk_ctrl; |
| @@ -52,63 +51,23 @@ static void cris_freq_set_cpu_state(struct cpufreq_policy *policy, | |||
| 52 | local_irq_enable(); | 51 | local_irq_enable(); |
| 53 | 52 | ||
| 54 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 53 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 55 | }; | ||
| 56 | |||
| 57 | static int cris_freq_verify(struct cpufreq_policy *policy) | ||
| 58 | { | ||
| 59 | return cpufreq_frequency_table_verify(policy, &cris_freq_table[0]); | ||
| 60 | } | ||
| 61 | |||
| 62 | static int cris_freq_target(struct cpufreq_policy *policy, | ||
| 63 | unsigned int target_freq, unsigned int relation) | ||
| 64 | { | ||
| 65 | unsigned int newstate = 0; | ||
| 66 | |||
| 67 | if (cpufreq_frequency_table_target | ||
| 68 | (policy, cris_freq_table, target_freq, relation, &newstate)) | ||
| 69 | return -EINVAL; | ||
| 70 | |||
| 71 | cris_freq_set_cpu_state(policy, newstate); | ||
| 72 | 54 | ||
| 73 | return 0; | 55 | return 0; |
| 74 | } | 56 | } |
| 75 | 57 | ||
| 76 | static int cris_freq_cpu_init(struct cpufreq_policy *policy) | 58 | static int cris_freq_cpu_init(struct cpufreq_policy *policy) |
| 77 | { | 59 | { |
| 78 | int result; | 60 | return cpufreq_generic_init(policy, cris_freq_table, 1000000); |
| 79 | |||
| 80 | /* cpuinfo and default policy values */ | ||
| 81 | policy->cpuinfo.transition_latency = 1000000; /* 1ms */ | ||
| 82 | policy->cur = cris_freq_get_cpu_frequency(0); | ||
| 83 | |||
| 84 | result = cpufreq_frequency_table_cpuinfo(policy, cris_freq_table); | ||
| 85 | if (result) | ||
| 86 | return (result); | ||
| 87 | |||
| 88 | cpufreq_frequency_table_get_attr(cris_freq_table, policy->cpu); | ||
| 89 | |||
| 90 | return 0; | ||
| 91 | } | 61 | } |
| 92 | 62 | ||
| 93 | static int cris_freq_cpu_exit(struct cpufreq_policy *policy) | ||
| 94 | { | ||
| 95 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 96 | return 0; | ||
| 97 | } | ||
| 98 | |||
| 99 | static struct freq_attr *cris_freq_attr[] = { | ||
| 100 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 101 | NULL, | ||
| 102 | }; | ||
| 103 | |||
| 104 | static struct cpufreq_driver cris_freq_driver = { | 63 | static struct cpufreq_driver cris_freq_driver = { |
| 105 | .get = cris_freq_get_cpu_frequency, | 64 | .get = cris_freq_get_cpu_frequency, |
| 106 | .verify = cris_freq_verify, | 65 | .verify = cpufreq_generic_frequency_table_verify, |
| 107 | .target = cris_freq_target, | 66 | .target_index = cris_freq_target, |
| 108 | .init = cris_freq_cpu_init, | 67 | .init = cris_freq_cpu_init, |
| 109 | .exit = cris_freq_cpu_exit, | 68 | .exit = cpufreq_generic_exit, |
| 110 | .name = "cris_freq", | 69 | .name = "cris_freq", |
| 111 | .attr = cris_freq_attr, | 70 | .attr = cpufreq_generic_attr, |
| 112 | }; | 71 | }; |
| 113 | 72 | ||
| 114 | static int __init cris_freq_init(void) | 73 | static int __init cris_freq_init(void) |
diff --git a/drivers/cpufreq/davinci-cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c index 551dd655c6f2..1f5d8a569c77 100644 --- a/drivers/cpufreq/davinci-cpufreq.c +++ b/drivers/cpufreq/davinci-cpufreq.c | |||
| @@ -50,9 +50,7 @@ static int davinci_verify_speed(struct cpufreq_policy *policy) | |||
| 50 | if (policy->cpu) | 50 | if (policy->cpu) |
| 51 | return -EINVAL; | 51 | return -EINVAL; |
| 52 | 52 | ||
| 53 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, | 53 | cpufreq_verify_within_cpu_limits(policy); |
| 54 | policy->cpuinfo.max_freq); | ||
| 55 | |||
| 56 | policy->min = clk_round_rate(armclk, policy->min * 1000) / 1000; | 54 | policy->min = clk_round_rate(armclk, policy->min * 1000) / 1000; |
| 57 | policy->max = clk_round_rate(armclk, policy->max * 1000) / 1000; | 55 | policy->max = clk_round_rate(armclk, policy->max * 1000) / 1000; |
| 58 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, | 56 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, |
| @@ -68,28 +66,18 @@ static unsigned int davinci_getspeed(unsigned int cpu) | |||
| 68 | return clk_get_rate(cpufreq.armclk) / 1000; | 66 | return clk_get_rate(cpufreq.armclk) / 1000; |
| 69 | } | 67 | } |
| 70 | 68 | ||
| 71 | static int davinci_target(struct cpufreq_policy *policy, | 69 | static int davinci_target(struct cpufreq_policy *policy, unsigned int idx) |
| 72 | unsigned int target_freq, unsigned int relation) | ||
| 73 | { | 70 | { |
| 74 | int ret = 0; | 71 | int ret = 0; |
| 75 | unsigned int idx; | ||
| 76 | struct cpufreq_freqs freqs; | 72 | struct cpufreq_freqs freqs; |
| 77 | struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data; | 73 | struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data; |
| 78 | struct clk *armclk = cpufreq.armclk; | 74 | struct clk *armclk = cpufreq.armclk; |
| 79 | 75 | ||
| 80 | freqs.old = davinci_getspeed(0); | 76 | freqs.old = davinci_getspeed(0); |
| 81 | freqs.new = clk_round_rate(armclk, target_freq * 1000) / 1000; | 77 | freqs.new = pdata->freq_table[idx].frequency; |
| 82 | |||
| 83 | if (freqs.old == freqs.new) | ||
| 84 | return ret; | ||
| 85 | 78 | ||
| 86 | dev_dbg(cpufreq.dev, "transition: %u --> %u\n", freqs.old, freqs.new); | 79 | dev_dbg(cpufreq.dev, "transition: %u --> %u\n", freqs.old, freqs.new); |
| 87 | 80 | ||
| 88 | ret = cpufreq_frequency_table_target(policy, pdata->freq_table, | ||
| 89 | freqs.new, relation, &idx); | ||
| 90 | if (ret) | ||
| 91 | return -EINVAL; | ||
| 92 | |||
| 93 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 81 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 94 | 82 | ||
| 95 | /* if moving to higher frequency, up the voltage beforehand */ | 83 | /* if moving to higher frequency, up the voltage beforehand */ |
| @@ -138,47 +126,24 @@ static int davinci_cpu_init(struct cpufreq_policy *policy) | |||
| 138 | return result; | 126 | return result; |
| 139 | } | 127 | } |
| 140 | 128 | ||
| 141 | policy->cur = davinci_getspeed(0); | ||
| 142 | |||
| 143 | result = cpufreq_frequency_table_cpuinfo(policy, freq_table); | ||
| 144 | if (result) { | ||
| 145 | pr_err("%s: cpufreq_frequency_table_cpuinfo() failed", | ||
| 146 | __func__); | ||
| 147 | return result; | ||
| 148 | } | ||
| 149 | |||
| 150 | cpufreq_frequency_table_get_attr(freq_table, policy->cpu); | ||
| 151 | |||
| 152 | /* | 129 | /* |
| 153 | * Time measurement across the target() function yields ~1500-1800us | 130 | * Time measurement across the target() function yields ~1500-1800us |
| 154 | * time taken with no drivers on notification list. | 131 | * time taken with no drivers on notification list. |
| 155 | * Setting the latency to 2000 us to accommodate addition of drivers | 132 | * Setting the latency to 2000 us to accommodate addition of drivers |
| 156 | * to pre/post change notification list. | 133 | * to pre/post change notification list. |
| 157 | */ | 134 | */ |
| 158 | policy->cpuinfo.transition_latency = 2000 * 1000; | 135 | return cpufreq_generic_init(policy, freq_table, 2000 * 1000); |
| 159 | return 0; | ||
| 160 | } | ||
| 161 | |||
| 162 | static int davinci_cpu_exit(struct cpufreq_policy *policy) | ||
| 163 | { | ||
| 164 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 165 | return 0; | ||
| 166 | } | 136 | } |
| 167 | 137 | ||
| 168 | static struct freq_attr *davinci_cpufreq_attr[] = { | ||
| 169 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 170 | NULL, | ||
| 171 | }; | ||
| 172 | |||
| 173 | static struct cpufreq_driver davinci_driver = { | 138 | static struct cpufreq_driver davinci_driver = { |
| 174 | .flags = CPUFREQ_STICKY, | 139 | .flags = CPUFREQ_STICKY, |
| 175 | .verify = davinci_verify_speed, | 140 | .verify = davinci_verify_speed, |
| 176 | .target = davinci_target, | 141 | .target_index = davinci_target, |
| 177 | .get = davinci_getspeed, | 142 | .get = davinci_getspeed, |
| 178 | .init = davinci_cpu_init, | 143 | .init = davinci_cpu_init, |
| 179 | .exit = davinci_cpu_exit, | 144 | .exit = cpufreq_generic_exit, |
| 180 | .name = "davinci", | 145 | .name = "davinci", |
| 181 | .attr = davinci_cpufreq_attr, | 146 | .attr = cpufreq_generic_attr, |
| 182 | }; | 147 | }; |
| 183 | 148 | ||
| 184 | static int __init davinci_cpufreq_probe(struct platform_device *pdev) | 149 | static int __init davinci_cpufreq_probe(struct platform_device *pdev) |
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c index 26321cdc1946..238b16976be1 100644 --- a/drivers/cpufreq/dbx500-cpufreq.c +++ b/drivers/cpufreq/dbx500-cpufreq.c | |||
| @@ -19,34 +19,14 @@ | |||
| 19 | static struct cpufreq_frequency_table *freq_table; | 19 | static struct cpufreq_frequency_table *freq_table; |
| 20 | static struct clk *armss_clk; | 20 | static struct clk *armss_clk; |
| 21 | 21 | ||
| 22 | static struct freq_attr *dbx500_cpufreq_attr[] = { | ||
| 23 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 24 | NULL, | ||
| 25 | }; | ||
| 26 | |||
| 27 | static int dbx500_cpufreq_verify_speed(struct cpufreq_policy *policy) | ||
| 28 | { | ||
| 29 | return cpufreq_frequency_table_verify(policy, freq_table); | ||
| 30 | } | ||
| 31 | |||
| 32 | static int dbx500_cpufreq_target(struct cpufreq_policy *policy, | 22 | static int dbx500_cpufreq_target(struct cpufreq_policy *policy, |
| 33 | unsigned int target_freq, | 23 | unsigned int index) |
| 34 | unsigned int relation) | ||
| 35 | { | 24 | { |
| 36 | struct cpufreq_freqs freqs; | 25 | struct cpufreq_freqs freqs; |
| 37 | unsigned int idx; | ||
| 38 | int ret; | 26 | int ret; |
| 39 | 27 | ||
| 40 | /* Lookup the next frequency */ | ||
| 41 | if (cpufreq_frequency_table_target(policy, freq_table, target_freq, | ||
| 42 | relation, &idx)) | ||
| 43 | return -EINVAL; | ||
| 44 | |||
| 45 | freqs.old = policy->cur; | 28 | freqs.old = policy->cur; |
| 46 | freqs.new = freq_table[idx].frequency; | 29 | freqs.new = freq_table[index].frequency; |
| 47 | |||
| 48 | if (freqs.old == freqs.new) | ||
| 49 | return 0; | ||
| 50 | 30 | ||
| 51 | /* pre-change notification */ | 31 | /* pre-change notification */ |
| 52 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 32 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| @@ -84,43 +64,17 @@ static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu) | |||
| 84 | 64 | ||
| 85 | static int dbx500_cpufreq_init(struct cpufreq_policy *policy) | 65 | static int dbx500_cpufreq_init(struct cpufreq_policy *policy) |
| 86 | { | 66 | { |
| 87 | int res; | 67 | return cpufreq_generic_init(policy, freq_table, 20 * 1000); |
| 88 | |||
| 89 | /* get policy fields based on the table */ | ||
| 90 | res = cpufreq_frequency_table_cpuinfo(policy, freq_table); | ||
| 91 | if (!res) | ||
| 92 | cpufreq_frequency_table_get_attr(freq_table, policy->cpu); | ||
| 93 | else { | ||
| 94 | pr_err("dbx500-cpufreq: Failed to read policy table\n"); | ||
| 95 | return res; | ||
| 96 | } | ||
| 97 | |||
| 98 | policy->min = policy->cpuinfo.min_freq; | ||
| 99 | policy->max = policy->cpuinfo.max_freq; | ||
| 100 | policy->cur = dbx500_cpufreq_getspeed(policy->cpu); | ||
| 101 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
| 102 | |||
| 103 | /* | ||
| 104 | * FIXME : Need to take time measurement across the target() | ||
| 105 | * function with no/some/all drivers in the notification | ||
| 106 | * list. | ||
| 107 | */ | ||
| 108 | policy->cpuinfo.transition_latency = 20 * 1000; /* in ns */ | ||
| 109 | |||
| 110 | /* policy sharing between dual CPUs */ | ||
| 111 | cpumask_setall(policy->cpus); | ||
| 112 | |||
| 113 | return 0; | ||
| 114 | } | 68 | } |
| 115 | 69 | ||
| 116 | static struct cpufreq_driver dbx500_cpufreq_driver = { | 70 | static struct cpufreq_driver dbx500_cpufreq_driver = { |
| 117 | .flags = CPUFREQ_STICKY | CPUFREQ_CONST_LOOPS, | 71 | .flags = CPUFREQ_STICKY | CPUFREQ_CONST_LOOPS, |
| 118 | .verify = dbx500_cpufreq_verify_speed, | 72 | .verify = cpufreq_generic_frequency_table_verify, |
| 119 | .target = dbx500_cpufreq_target, | 73 | .target_index = dbx500_cpufreq_target, |
| 120 | .get = dbx500_cpufreq_getspeed, | 74 | .get = dbx500_cpufreq_getspeed, |
| 121 | .init = dbx500_cpufreq_init, | 75 | .init = dbx500_cpufreq_init, |
| 122 | .name = "DBX500", | 76 | .name = "DBX500", |
| 123 | .attr = dbx500_cpufreq_attr, | 77 | .attr = cpufreq_generic_attr, |
| 124 | }; | 78 | }; |
| 125 | 79 | ||
| 126 | static int dbx500_cpufreq_probe(struct platform_device *pdev) | 80 | static int dbx500_cpufreq_probe(struct platform_device *pdev) |
diff --git a/drivers/cpufreq/e_powersaver.c b/drivers/cpufreq/e_powersaver.c index 09f64cc83019..b39c4ef60a7a 100644 --- a/drivers/cpufreq/e_powersaver.c +++ b/drivers/cpufreq/e_powersaver.c | |||
| @@ -168,12 +168,9 @@ postchange: | |||
| 168 | return err; | 168 | return err; |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | static int eps_target(struct cpufreq_policy *policy, | 171 | static int eps_target(struct cpufreq_policy *policy, unsigned int index) |
| 172 | unsigned int target_freq, | ||
| 173 | unsigned int relation) | ||
| 174 | { | 172 | { |
| 175 | struct eps_cpu_data *centaur; | 173 | struct eps_cpu_data *centaur; |
| 176 | unsigned int newstate = 0; | ||
| 177 | unsigned int cpu = policy->cpu; | 174 | unsigned int cpu = policy->cpu; |
| 178 | unsigned int dest_state; | 175 | unsigned int dest_state; |
| 179 | int ret; | 176 | int ret; |
| @@ -182,28 +179,14 @@ static int eps_target(struct cpufreq_policy *policy, | |||
| 182 | return -ENODEV; | 179 | return -ENODEV; |
| 183 | centaur = eps_cpu[cpu]; | 180 | centaur = eps_cpu[cpu]; |
| 184 | 181 | ||
| 185 | if (unlikely(cpufreq_frequency_table_target(policy, | ||
| 186 | &eps_cpu[cpu]->freq_table[0], | ||
| 187 | target_freq, | ||
| 188 | relation, | ||
| 189 | &newstate))) { | ||
| 190 | return -EINVAL; | ||
| 191 | } | ||
| 192 | |||
| 193 | /* Make frequency transition */ | 182 | /* Make frequency transition */ |
| 194 | dest_state = centaur->freq_table[newstate].driver_data & 0xffff; | 183 | dest_state = centaur->freq_table[index].driver_data & 0xffff; |
| 195 | ret = eps_set_state(centaur, policy, dest_state); | 184 | ret = eps_set_state(centaur, policy, dest_state); |
| 196 | if (ret) | 185 | if (ret) |
| 197 | printk(KERN_ERR "eps: Timeout!\n"); | 186 | printk(KERN_ERR "eps: Timeout!\n"); |
| 198 | return ret; | 187 | return ret; |
| 199 | } | 188 | } |
| 200 | 189 | ||
| 201 | static int eps_verify(struct cpufreq_policy *policy) | ||
| 202 | { | ||
| 203 | return cpufreq_frequency_table_verify(policy, | ||
| 204 | &eps_cpu[policy->cpu]->freq_table[0]); | ||
| 205 | } | ||
| 206 | |||
| 207 | static int eps_cpu_init(struct cpufreq_policy *policy) | 190 | static int eps_cpu_init(struct cpufreq_policy *policy) |
| 208 | { | 191 | { |
| 209 | unsigned int i; | 192 | unsigned int i; |
| @@ -401,15 +384,13 @@ static int eps_cpu_init(struct cpufreq_policy *policy) | |||
| 401 | } | 384 | } |
| 402 | 385 | ||
| 403 | policy->cpuinfo.transition_latency = 140000; /* 844mV -> 700mV in ns */ | 386 | policy->cpuinfo.transition_latency = 140000; /* 844mV -> 700mV in ns */ |
| 404 | policy->cur = fsb * current_multiplier; | ||
| 405 | 387 | ||
| 406 | ret = cpufreq_frequency_table_cpuinfo(policy, ¢aur->freq_table[0]); | 388 | ret = cpufreq_table_validate_and_show(policy, ¢aur->freq_table[0]); |
| 407 | if (ret) { | 389 | if (ret) { |
| 408 | kfree(centaur); | 390 | kfree(centaur); |
| 409 | return ret; | 391 | return ret; |
| 410 | } | 392 | } |
| 411 | 393 | ||
| 412 | cpufreq_frequency_table_get_attr(¢aur->freq_table[0], policy->cpu); | ||
| 413 | return 0; | 394 | return 0; |
| 414 | } | 395 | } |
| 415 | 396 | ||
| @@ -424,19 +405,14 @@ static int eps_cpu_exit(struct cpufreq_policy *policy) | |||
| 424 | return 0; | 405 | return 0; |
| 425 | } | 406 | } |
| 426 | 407 | ||
| 427 | static struct freq_attr *eps_attr[] = { | ||
| 428 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 429 | NULL, | ||
| 430 | }; | ||
| 431 | |||
| 432 | static struct cpufreq_driver eps_driver = { | 408 | static struct cpufreq_driver eps_driver = { |
| 433 | .verify = eps_verify, | 409 | .verify = cpufreq_generic_frequency_table_verify, |
| 434 | .target = eps_target, | 410 | .target_index = eps_target, |
| 435 | .init = eps_cpu_init, | 411 | .init = eps_cpu_init, |
| 436 | .exit = eps_cpu_exit, | 412 | .exit = eps_cpu_exit, |
| 437 | .get = eps_get, | 413 | .get = eps_get, |
| 438 | .name = "e_powersaver", | 414 | .name = "e_powersaver", |
| 439 | .attr = eps_attr, | 415 | .attr = cpufreq_generic_attr, |
| 440 | }; | 416 | }; |
| 441 | 417 | ||
| 442 | 418 | ||
diff --git a/drivers/cpufreq/elanfreq.c b/drivers/cpufreq/elanfreq.c index 823a400d98fd..4ab41539514f 100644 --- a/drivers/cpufreq/elanfreq.c +++ b/drivers/cpufreq/elanfreq.c | |||
| @@ -105,20 +105,8 @@ static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu) | |||
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | 107 | ||
| 108 | /** | 108 | static int elanfreq_target(struct cpufreq_policy *policy, |
| 109 | * elanfreq_set_cpu_frequency: Change the CPU core frequency | 109 | unsigned int state) |
| 110 | * @cpu: cpu number | ||
| 111 | * @freq: frequency in kHz | ||
| 112 | * | ||
| 113 | * This function takes a frequency value and changes the CPU frequency | ||
| 114 | * according to this. Note that the frequency has to be checked by | ||
| 115 | * elanfreq_validatespeed() for correctness! | ||
| 116 | * | ||
| 117 | * There is no return value. | ||
| 118 | */ | ||
| 119 | |||
| 120 | static void elanfreq_set_cpu_state(struct cpufreq_policy *policy, | ||
| 121 | unsigned int state) | ||
| 122 | { | 110 | { |
| 123 | struct cpufreq_freqs freqs; | 111 | struct cpufreq_freqs freqs; |
| 124 | 112 | ||
| @@ -162,38 +150,9 @@ static void elanfreq_set_cpu_state(struct cpufreq_policy *policy, | |||
| 162 | local_irq_enable(); | 150 | local_irq_enable(); |
| 163 | 151 | ||
| 164 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 152 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 165 | }; | ||
| 166 | |||
| 167 | |||
| 168 | /** | ||
| 169 | * elanfreq_validatespeed: test if frequency range is valid | ||
| 170 | * @policy: the policy to validate | ||
| 171 | * | ||
| 172 | * This function checks if a given frequency range in kHz is valid | ||
| 173 | * for the hardware supported by the driver. | ||
| 174 | */ | ||
| 175 | |||
| 176 | static int elanfreq_verify(struct cpufreq_policy *policy) | ||
| 177 | { | ||
| 178 | return cpufreq_frequency_table_verify(policy, &elanfreq_table[0]); | ||
| 179 | } | ||
| 180 | |||
| 181 | static int elanfreq_target(struct cpufreq_policy *policy, | ||
| 182 | unsigned int target_freq, | ||
| 183 | unsigned int relation) | ||
| 184 | { | ||
| 185 | unsigned int newstate = 0; | ||
| 186 | |||
| 187 | if (cpufreq_frequency_table_target(policy, &elanfreq_table[0], | ||
| 188 | target_freq, relation, &newstate)) | ||
| 189 | return -EINVAL; | ||
| 190 | |||
| 191 | elanfreq_set_cpu_state(policy, newstate); | ||
| 192 | 153 | ||
| 193 | return 0; | 154 | return 0; |
| 194 | } | 155 | } |
| 195 | |||
| 196 | |||
| 197 | /* | 156 | /* |
| 198 | * Module init and exit code | 157 | * Module init and exit code |
| 199 | */ | 158 | */ |
| @@ -202,7 +161,6 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy) | |||
| 202 | { | 161 | { |
| 203 | struct cpuinfo_x86 *c = &cpu_data(0); | 162 | struct cpuinfo_x86 *c = &cpu_data(0); |
| 204 | unsigned int i; | 163 | unsigned int i; |
| 205 | int result; | ||
| 206 | 164 | ||
| 207 | /* capability check */ | 165 | /* capability check */ |
| 208 | if ((c->x86_vendor != X86_VENDOR_AMD) || | 166 | if ((c->x86_vendor != X86_VENDOR_AMD) || |
| @@ -221,21 +179,8 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy) | |||
| 221 | 179 | ||
| 222 | /* cpuinfo and default policy values */ | 180 | /* cpuinfo and default policy values */ |
| 223 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | 181 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; |
| 224 | policy->cur = elanfreq_get_cpu_frequency(0); | ||
| 225 | |||
| 226 | result = cpufreq_frequency_table_cpuinfo(policy, elanfreq_table); | ||
| 227 | if (result) | ||
| 228 | return result; | ||
| 229 | |||
| 230 | cpufreq_frequency_table_get_attr(elanfreq_table, policy->cpu); | ||
| 231 | return 0; | ||
| 232 | } | ||
| 233 | 182 | ||
| 234 | 183 | return cpufreq_table_validate_and_show(policy, elanfreq_table); | |
| 235 | static int elanfreq_cpu_exit(struct cpufreq_policy *policy) | ||
| 236 | { | ||
| 237 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 238 | return 0; | ||
| 239 | } | 184 | } |
| 240 | 185 | ||
| 241 | 186 | ||
| @@ -261,20 +206,14 @@ __setup("elanfreq=", elanfreq_setup); | |||
| 261 | #endif | 206 | #endif |
| 262 | 207 | ||
| 263 | 208 | ||
| 264 | static struct freq_attr *elanfreq_attr[] = { | ||
| 265 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 266 | NULL, | ||
| 267 | }; | ||
| 268 | |||
| 269 | |||
| 270 | static struct cpufreq_driver elanfreq_driver = { | 209 | static struct cpufreq_driver elanfreq_driver = { |
| 271 | .get = elanfreq_get_cpu_frequency, | 210 | .get = elanfreq_get_cpu_frequency, |
| 272 | .verify = elanfreq_verify, | 211 | .verify = cpufreq_generic_frequency_table_verify, |
| 273 | .target = elanfreq_target, | 212 | .target_index = elanfreq_target, |
| 274 | .init = elanfreq_cpu_init, | 213 | .init = elanfreq_cpu_init, |
| 275 | .exit = elanfreq_cpu_exit, | 214 | .exit = cpufreq_generic_exit, |
| 276 | .name = "elanfreq", | 215 | .name = "elanfreq", |
| 277 | .attr = elanfreq_attr, | 216 | .attr = cpufreq_generic_attr, |
| 278 | }; | 217 | }; |
| 279 | 218 | ||
| 280 | static const struct x86_cpu_id elan_id[] = { | 219 | static const struct x86_cpu_id elan_id[] = { |
diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c index 0fac34439e31..9982fcb82257 100644 --- a/drivers/cpufreq/exynos-cpufreq.c +++ b/drivers/cpufreq/exynos-cpufreq.c | |||
| @@ -31,12 +31,6 @@ static unsigned int locking_frequency; | |||
| 31 | static bool frequency_locked; | 31 | static bool frequency_locked; |
| 32 | static DEFINE_MUTEX(cpufreq_lock); | 32 | static DEFINE_MUTEX(cpufreq_lock); |
| 33 | 33 | ||
| 34 | static int exynos_verify_speed(struct cpufreq_policy *policy) | ||
| 35 | { | ||
| 36 | return cpufreq_frequency_table_verify(policy, | ||
| 37 | exynos_info->freq_table); | ||
| 38 | } | ||
| 39 | |||
| 40 | static unsigned int exynos_getspeed(unsigned int cpu) | 34 | static unsigned int exynos_getspeed(unsigned int cpu) |
| 41 | { | 35 | { |
| 42 | return clk_get_rate(exynos_info->cpu_clk) / 1000; | 36 | return clk_get_rate(exynos_info->cpu_clk) / 1000; |
| @@ -71,9 +65,6 @@ static int exynos_cpufreq_scale(unsigned int target_freq) | |||
| 71 | freqs.old = policy->cur; | 65 | freqs.old = policy->cur; |
| 72 | freqs.new = target_freq; | 66 | freqs.new = target_freq; |
| 73 | 67 | ||
| 74 | if (freqs.new == freqs.old) | ||
| 75 | goto out; | ||
| 76 | |||
| 77 | /* | 68 | /* |
| 78 | * The policy max have been changed so that we cannot get proper | 69 | * The policy max have been changed so that we cannot get proper |
| 79 | * old_index with cpufreq_frequency_table_target(). Thus, ignore | 70 | * old_index with cpufreq_frequency_table_target(). Thus, ignore |
| @@ -141,7 +132,7 @@ post_notify: | |||
| 141 | if ((freqs.new < freqs.old) || | 132 | if ((freqs.new < freqs.old) || |
| 142 | ((freqs.new > freqs.old) && safe_arm_volt)) { | 133 | ((freqs.new > freqs.old) && safe_arm_volt)) { |
| 143 | /* down the voltage after frequency change */ | 134 | /* down the voltage after frequency change */ |
| 144 | regulator_set_voltage(arm_regulator, arm_volt, | 135 | ret = regulator_set_voltage(arm_regulator, arm_volt, |
| 145 | arm_volt); | 136 | arm_volt); |
| 146 | if (ret) { | 137 | if (ret) { |
| 147 | pr_err("%s: failed to set cpu voltage to %d\n", | 138 | pr_err("%s: failed to set cpu voltage to %d\n", |
| @@ -157,13 +148,9 @@ out: | |||
| 157 | return ret; | 148 | return ret; |
| 158 | } | 149 | } |
| 159 | 150 | ||
| 160 | static int exynos_target(struct cpufreq_policy *policy, | 151 | static int exynos_target(struct cpufreq_policy *policy, unsigned int index) |
| 161 | unsigned int target_freq, | ||
| 162 | unsigned int relation) | ||
| 163 | { | 152 | { |
| 164 | struct cpufreq_frequency_table *freq_table = exynos_info->freq_table; | 153 | struct cpufreq_frequency_table *freq_table = exynos_info->freq_table; |
| 165 | unsigned int index; | ||
| 166 | unsigned int new_freq; | ||
| 167 | int ret = 0; | 154 | int ret = 0; |
| 168 | 155 | ||
| 169 | mutex_lock(&cpufreq_lock); | 156 | mutex_lock(&cpufreq_lock); |
| @@ -171,15 +158,7 @@ static int exynos_target(struct cpufreq_policy *policy, | |||
| 171 | if (frequency_locked) | 158 | if (frequency_locked) |
| 172 | goto out; | 159 | goto out; |
| 173 | 160 | ||
| 174 | if (cpufreq_frequency_table_target(policy, freq_table, | 161 | ret = exynos_cpufreq_scale(freq_table[index].frequency); |
| 175 | target_freq, relation, &index)) { | ||
| 176 | ret = -EINVAL; | ||
| 177 | goto out; | ||
| 178 | } | ||
| 179 | |||
| 180 | new_freq = freq_table[index].frequency; | ||
| 181 | |||
| 182 | ret = exynos_cpufreq_scale(new_freq); | ||
| 183 | 162 | ||
| 184 | out: | 163 | out: |
| 185 | mutex_unlock(&cpufreq_lock); | 164 | mutex_unlock(&cpufreq_lock); |
| @@ -247,38 +226,18 @@ static struct notifier_block exynos_cpufreq_nb = { | |||
| 247 | 226 | ||
| 248 | static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy) | 227 | static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy) |
| 249 | { | 228 | { |
| 250 | policy->cur = policy->min = policy->max = exynos_getspeed(policy->cpu); | 229 | return cpufreq_generic_init(policy, exynos_info->freq_table, 100000); |
| 251 | |||
| 252 | cpufreq_frequency_table_get_attr(exynos_info->freq_table, policy->cpu); | ||
| 253 | |||
| 254 | /* set the transition latency value */ | ||
| 255 | policy->cpuinfo.transition_latency = 100000; | ||
| 256 | |||
| 257 | cpumask_setall(policy->cpus); | ||
| 258 | |||
| 259 | return cpufreq_frequency_table_cpuinfo(policy, exynos_info->freq_table); | ||
| 260 | } | 230 | } |
| 261 | 231 | ||
| 262 | static int exynos_cpufreq_cpu_exit(struct cpufreq_policy *policy) | ||
| 263 | { | ||
| 264 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 265 | return 0; | ||
| 266 | } | ||
| 267 | |||
| 268 | static struct freq_attr *exynos_cpufreq_attr[] = { | ||
| 269 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 270 | NULL, | ||
| 271 | }; | ||
| 272 | |||
| 273 | static struct cpufreq_driver exynos_driver = { | 232 | static struct cpufreq_driver exynos_driver = { |
| 274 | .flags = CPUFREQ_STICKY, | 233 | .flags = CPUFREQ_STICKY, |
| 275 | .verify = exynos_verify_speed, | 234 | .verify = cpufreq_generic_frequency_table_verify, |
| 276 | .target = exynos_target, | 235 | .target_index = exynos_target, |
| 277 | .get = exynos_getspeed, | 236 | .get = exynos_getspeed, |
| 278 | .init = exynos_cpufreq_cpu_init, | 237 | .init = exynos_cpufreq_cpu_init, |
| 279 | .exit = exynos_cpufreq_cpu_exit, | 238 | .exit = cpufreq_generic_exit, |
| 280 | .name = "exynos_cpufreq", | 239 | .name = "exynos_cpufreq", |
| 281 | .attr = exynos_cpufreq_attr, | 240 | .attr = cpufreq_generic_attr, |
| 282 | #ifdef CONFIG_PM | 241 | #ifdef CONFIG_PM |
| 283 | .suspend = exynos_cpufreq_suspend, | 242 | .suspend = exynos_cpufreq_suspend, |
| 284 | .resume = exynos_cpufreq_resume, | 243 | .resume = exynos_cpufreq_resume, |
diff --git a/drivers/cpufreq/exynos4210-cpufreq.c b/drivers/cpufreq/exynos4210-cpufreq.c index add7fbec4fc9..f2c75065ce19 100644 --- a/drivers/cpufreq/exynos4210-cpufreq.c +++ b/drivers/cpufreq/exynos4210-cpufreq.c | |||
| @@ -81,9 +81,9 @@ static void exynos4210_set_clkdiv(unsigned int div_index) | |||
| 81 | 81 | ||
| 82 | static void exynos4210_set_apll(unsigned int index) | 82 | static void exynos4210_set_apll(unsigned int index) |
| 83 | { | 83 | { |
| 84 | unsigned int tmp; | 84 | unsigned int tmp, freq = apll_freq_4210[index].freq; |
| 85 | 85 | ||
| 86 | /* 1. MUX_CORE_SEL = MPLL, ARMCLK uses MPLL for lock time */ | 86 | /* MUX_CORE_SEL = MPLL, ARMCLK uses MPLL for lock time */ |
| 87 | clk_set_parent(moutcore, mout_mpll); | 87 | clk_set_parent(moutcore, mout_mpll); |
| 88 | 88 | ||
| 89 | do { | 89 | do { |
| @@ -92,21 +92,9 @@ static void exynos4210_set_apll(unsigned int index) | |||
| 92 | tmp &= 0x7; | 92 | tmp &= 0x7; |
| 93 | } while (tmp != 0x2); | 93 | } while (tmp != 0x2); |
| 94 | 94 | ||
| 95 | /* 2. Set APLL Lock time */ | 95 | clk_set_rate(mout_apll, freq * 1000); |
| 96 | __raw_writel(EXYNOS4_APLL_LOCKTIME, EXYNOS4_APLL_LOCK); | ||
| 97 | |||
| 98 | /* 3. Change PLL PMS values */ | ||
| 99 | tmp = __raw_readl(EXYNOS4_APLL_CON0); | ||
| 100 | tmp &= ~((0x3ff << 16) | (0x3f << 8) | (0x7 << 0)); | ||
| 101 | tmp |= apll_freq_4210[index].mps; | ||
| 102 | __raw_writel(tmp, EXYNOS4_APLL_CON0); | ||
| 103 | 96 | ||
| 104 | /* 4. wait_lock_time */ | 97 | /* MUX_CORE_SEL = APLL */ |
| 105 | do { | ||
| 106 | tmp = __raw_readl(EXYNOS4_APLL_CON0); | ||
| 107 | } while (!(tmp & (0x1 << EXYNOS4_APLLCON0_LOCKED_SHIFT))); | ||
| 108 | |||
| 109 | /* 5. MUX_CORE_SEL = APLL */ | ||
| 110 | clk_set_parent(moutcore, mout_apll); | 98 | clk_set_parent(moutcore, mout_apll); |
| 111 | 99 | ||
| 112 | do { | 100 | do { |
| @@ -115,53 +103,15 @@ static void exynos4210_set_apll(unsigned int index) | |||
| 115 | } while (tmp != (0x1 << EXYNOS4_CLKSRC_CPU_MUXCORE_SHIFT)); | 103 | } while (tmp != (0x1 << EXYNOS4_CLKSRC_CPU_MUXCORE_SHIFT)); |
| 116 | } | 104 | } |
| 117 | 105 | ||
| 118 | static bool exynos4210_pms_change(unsigned int old_index, unsigned int new_index) | ||
| 119 | { | ||
| 120 | unsigned int old_pm = apll_freq_4210[old_index].mps >> 8; | ||
| 121 | unsigned int new_pm = apll_freq_4210[new_index].mps >> 8; | ||
| 122 | |||
| 123 | return (old_pm == new_pm) ? 0 : 1; | ||
| 124 | } | ||
| 125 | |||
| 126 | static void exynos4210_set_frequency(unsigned int old_index, | 106 | static void exynos4210_set_frequency(unsigned int old_index, |
| 127 | unsigned int new_index) | 107 | unsigned int new_index) |
| 128 | { | 108 | { |
| 129 | unsigned int tmp; | ||
| 130 | |||
| 131 | if (old_index > new_index) { | 109 | if (old_index > new_index) { |
| 132 | if (!exynos4210_pms_change(old_index, new_index)) { | 110 | exynos4210_set_clkdiv(new_index); |
| 133 | /* 1. Change the system clock divider values */ | 111 | exynos4210_set_apll(new_index); |
| 134 | exynos4210_set_clkdiv(new_index); | ||
| 135 | |||
| 136 | /* 2. Change just s value in apll m,p,s value */ | ||
| 137 | tmp = __raw_readl(EXYNOS4_APLL_CON0); | ||
| 138 | tmp &= ~(0x7 << 0); | ||
| 139 | tmp |= apll_freq_4210[new_index].mps & 0x7; | ||
| 140 | __raw_writel(tmp, EXYNOS4_APLL_CON0); | ||
| 141 | } else { | ||
| 142 | /* Clock Configuration Procedure */ | ||
| 143 | /* 1. Change the system clock divider values */ | ||
| 144 | exynos4210_set_clkdiv(new_index); | ||
| 145 | /* 2. Change the apll m,p,s value */ | ||
| 146 | exynos4210_set_apll(new_index); | ||
| 147 | } | ||
| 148 | } else if (old_index < new_index) { | 112 | } else if (old_index < new_index) { |
| 149 | if (!exynos4210_pms_change(old_index, new_index)) { | 113 | exynos4210_set_apll(new_index); |
| 150 | /* 1. Change just s value in apll m,p,s value */ | 114 | exynos4210_set_clkdiv(new_index); |
| 151 | tmp = __raw_readl(EXYNOS4_APLL_CON0); | ||
| 152 | tmp &= ~(0x7 << 0); | ||
| 153 | tmp |= apll_freq_4210[new_index].mps & 0x7; | ||
| 154 | __raw_writel(tmp, EXYNOS4_APLL_CON0); | ||
| 155 | |||
| 156 | /* 2. Change the system clock divider values */ | ||
| 157 | exynos4210_set_clkdiv(new_index); | ||
| 158 | } else { | ||
| 159 | /* Clock Configuration Procedure */ | ||
| 160 | /* 1. Change the apll m,p,s value */ | ||
| 161 | exynos4210_set_apll(new_index); | ||
| 162 | /* 2. Change the system clock divider values */ | ||
| 163 | exynos4210_set_clkdiv(new_index); | ||
| 164 | } | ||
| 165 | } | 115 | } |
| 166 | } | 116 | } |
| 167 | 117 | ||
| @@ -194,7 +144,6 @@ int exynos4210_cpufreq_init(struct exynos_dvfs_info *info) | |||
| 194 | info->volt_table = exynos4210_volt_table; | 144 | info->volt_table = exynos4210_volt_table; |
| 195 | info->freq_table = exynos4210_freq_table; | 145 | info->freq_table = exynos4210_freq_table; |
| 196 | info->set_freq = exynos4210_set_frequency; | 146 | info->set_freq = exynos4210_set_frequency; |
| 197 | info->need_apll_change = exynos4210_pms_change; | ||
| 198 | 147 | ||
| 199 | return 0; | 148 | return 0; |
| 200 | 149 | ||
diff --git a/drivers/cpufreq/exynos4x12-cpufreq.c b/drivers/cpufreq/exynos4x12-cpufreq.c index 08b7477b0aa2..8683304ce62c 100644 --- a/drivers/cpufreq/exynos4x12-cpufreq.c +++ b/drivers/cpufreq/exynos4x12-cpufreq.c | |||
| @@ -128,9 +128,9 @@ static void exynos4x12_set_clkdiv(unsigned int div_index) | |||
| 128 | 128 | ||
| 129 | static void exynos4x12_set_apll(unsigned int index) | 129 | static void exynos4x12_set_apll(unsigned int index) |
| 130 | { | 130 | { |
| 131 | unsigned int tmp, pdiv; | 131 | unsigned int tmp, freq = apll_freq_4x12[index].freq; |
| 132 | 132 | ||
| 133 | /* 1. MUX_CORE_SEL = MPLL, ARMCLK uses MPLL for lock time */ | 133 | /* MUX_CORE_SEL = MPLL, ARMCLK uses MPLL for lock time */ |
| 134 | clk_set_parent(moutcore, mout_mpll); | 134 | clk_set_parent(moutcore, mout_mpll); |
| 135 | 135 | ||
| 136 | do { | 136 | do { |
| @@ -140,24 +140,9 @@ static void exynos4x12_set_apll(unsigned int index) | |||
| 140 | tmp &= 0x7; | 140 | tmp &= 0x7; |
| 141 | } while (tmp != 0x2); | 141 | } while (tmp != 0x2); |
| 142 | 142 | ||
| 143 | /* 2. Set APLL Lock time */ | 143 | clk_set_rate(mout_apll, freq * 1000); |
| 144 | pdiv = ((apll_freq_4x12[index].mps >> 8) & 0x3f); | ||
| 145 | 144 | ||
| 146 | __raw_writel((pdiv * 250), EXYNOS4_APLL_LOCK); | 145 | /* MUX_CORE_SEL = APLL */ |
| 147 | |||
| 148 | /* 3. Change PLL PMS values */ | ||
| 149 | tmp = __raw_readl(EXYNOS4_APLL_CON0); | ||
| 150 | tmp &= ~((0x3ff << 16) | (0x3f << 8) | (0x7 << 0)); | ||
| 151 | tmp |= apll_freq_4x12[index].mps; | ||
| 152 | __raw_writel(tmp, EXYNOS4_APLL_CON0); | ||
| 153 | |||
| 154 | /* 4. wait_lock_time */ | ||
| 155 | do { | ||
| 156 | cpu_relax(); | ||
| 157 | tmp = __raw_readl(EXYNOS4_APLL_CON0); | ||
| 158 | } while (!(tmp & (0x1 << EXYNOS4_APLLCON0_LOCKED_SHIFT))); | ||
| 159 | |||
| 160 | /* 5. MUX_CORE_SEL = APLL */ | ||
| 161 | clk_set_parent(moutcore, mout_apll); | 146 | clk_set_parent(moutcore, mout_apll); |
| 162 | 147 | ||
| 163 | do { | 148 | do { |
| @@ -167,52 +152,15 @@ static void exynos4x12_set_apll(unsigned int index) | |||
| 167 | } while (tmp != (0x1 << EXYNOS4_CLKSRC_CPU_MUXCORE_SHIFT)); | 152 | } while (tmp != (0x1 << EXYNOS4_CLKSRC_CPU_MUXCORE_SHIFT)); |
| 168 | } | 153 | } |
| 169 | 154 | ||
| 170 | static bool exynos4x12_pms_change(unsigned int old_index, unsigned int new_index) | ||
| 171 | { | ||
| 172 | unsigned int old_pm = apll_freq_4x12[old_index].mps >> 8; | ||
| 173 | unsigned int new_pm = apll_freq_4x12[new_index].mps >> 8; | ||
| 174 | |||
| 175 | return (old_pm == new_pm) ? 0 : 1; | ||
| 176 | } | ||
| 177 | |||
| 178 | static void exynos4x12_set_frequency(unsigned int old_index, | 155 | static void exynos4x12_set_frequency(unsigned int old_index, |
| 179 | unsigned int new_index) | 156 | unsigned int new_index) |
| 180 | { | 157 | { |
| 181 | unsigned int tmp; | ||
| 182 | |||
| 183 | if (old_index > new_index) { | 158 | if (old_index > new_index) { |
| 184 | if (!exynos4x12_pms_change(old_index, new_index)) { | 159 | exynos4x12_set_clkdiv(new_index); |
| 185 | /* 1. Change the system clock divider values */ | 160 | exynos4x12_set_apll(new_index); |
| 186 | exynos4x12_set_clkdiv(new_index); | ||
| 187 | /* 2. Change just s value in apll m,p,s value */ | ||
| 188 | tmp = __raw_readl(EXYNOS4_APLL_CON0); | ||
| 189 | tmp &= ~(0x7 << 0); | ||
| 190 | tmp |= apll_freq_4x12[new_index].mps & 0x7; | ||
| 191 | __raw_writel(tmp, EXYNOS4_APLL_CON0); | ||
| 192 | |||
| 193 | } else { | ||
| 194 | /* Clock Configuration Procedure */ | ||
| 195 | /* 1. Change the system clock divider values */ | ||
| 196 | exynos4x12_set_clkdiv(new_index); | ||
| 197 | /* 2. Change the apll m,p,s value */ | ||
| 198 | exynos4x12_set_apll(new_index); | ||
| 199 | } | ||
| 200 | } else if (old_index < new_index) { | 161 | } else if (old_index < new_index) { |
| 201 | if (!exynos4x12_pms_change(old_index, new_index)) { | 162 | exynos4x12_set_apll(new_index); |
| 202 | /* 1. Change just s value in apll m,p,s value */ | 163 | exynos4x12_set_clkdiv(new_index); |
| 203 | tmp = __raw_readl(EXYNOS4_APLL_CON0); | ||
| 204 | tmp &= ~(0x7 << 0); | ||
| 205 | tmp |= apll_freq_4x12[new_index].mps & 0x7; | ||
| 206 | __raw_writel(tmp, EXYNOS4_APLL_CON0); | ||
| 207 | /* 2. Change the system clock divider values */ | ||
| 208 | exynos4x12_set_clkdiv(new_index); | ||
| 209 | } else { | ||
| 210 | /* Clock Configuration Procedure */ | ||
| 211 | /* 1. Change the apll m,p,s value */ | ||
| 212 | exynos4x12_set_apll(new_index); | ||
| 213 | /* 2. Change the system clock divider values */ | ||
| 214 | exynos4x12_set_clkdiv(new_index); | ||
| 215 | } | ||
| 216 | } | 164 | } |
| 217 | } | 165 | } |
| 218 | 166 | ||
| @@ -250,7 +198,6 @@ int exynos4x12_cpufreq_init(struct exynos_dvfs_info *info) | |||
| 250 | info->volt_table = exynos4x12_volt_table; | 198 | info->volt_table = exynos4x12_volt_table; |
| 251 | info->freq_table = exynos4x12_freq_table; | 199 | info->freq_table = exynos4x12_freq_table; |
| 252 | info->set_freq = exynos4x12_set_frequency; | 200 | info->set_freq = exynos4x12_set_frequency; |
| 253 | info->need_apll_change = exynos4x12_pms_change; | ||
| 254 | 201 | ||
| 255 | return 0; | 202 | return 0; |
| 256 | 203 | ||
diff --git a/drivers/cpufreq/exynos5440-cpufreq.c b/drivers/cpufreq/exynos5440-cpufreq.c index be5380ecdcd4..1bf9b060d522 100644 --- a/drivers/cpufreq/exynos5440-cpufreq.c +++ b/drivers/cpufreq/exynos5440-cpufreq.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/of_address.h> | 21 | #include <linux/of_address.h> |
| 22 | #include <linux/of_irq.h> | 22 | #include <linux/of_irq.h> |
| 23 | #include <linux/opp.h> | 23 | #include <linux/pm_opp.h> |
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 26 | 26 | ||
| @@ -118,12 +118,12 @@ static int init_div_table(void) | |||
| 118 | struct cpufreq_frequency_table *freq_tbl = dvfs_info->freq_table; | 118 | struct cpufreq_frequency_table *freq_tbl = dvfs_info->freq_table; |
| 119 | unsigned int tmp, clk_div, ema_div, freq, volt_id; | 119 | unsigned int tmp, clk_div, ema_div, freq, volt_id; |
| 120 | int i = 0; | 120 | int i = 0; |
| 121 | struct opp *opp; | 121 | struct dev_pm_opp *opp; |
| 122 | 122 | ||
| 123 | rcu_read_lock(); | 123 | rcu_read_lock(); |
| 124 | for (i = 0; freq_tbl[i].frequency != CPUFREQ_TABLE_END; i++) { | 124 | for (i = 0; freq_tbl[i].frequency != CPUFREQ_TABLE_END; i++) { |
| 125 | 125 | ||
| 126 | opp = opp_find_freq_exact(dvfs_info->dev, | 126 | opp = dev_pm_opp_find_freq_exact(dvfs_info->dev, |
| 127 | freq_tbl[i].frequency * 1000, true); | 127 | freq_tbl[i].frequency * 1000, true); |
| 128 | if (IS_ERR(opp)) { | 128 | if (IS_ERR(opp)) { |
| 129 | rcu_read_unlock(); | 129 | rcu_read_unlock(); |
| @@ -142,7 +142,7 @@ static int init_div_table(void) | |||
| 142 | << P0_7_CSCLKDEV_SHIFT; | 142 | << P0_7_CSCLKDEV_SHIFT; |
| 143 | 143 | ||
| 144 | /* Calculate EMA */ | 144 | /* Calculate EMA */ |
| 145 | volt_id = opp_get_voltage(opp); | 145 | volt_id = dev_pm_opp_get_voltage(opp); |
| 146 | volt_id = (MAX_VOLTAGE - volt_id) / VOLTAGE_STEP; | 146 | volt_id = (MAX_VOLTAGE - volt_id) / VOLTAGE_STEP; |
| 147 | if (volt_id < PMIC_HIGH_VOLT) { | 147 | if (volt_id < PMIC_HIGH_VOLT) { |
| 148 | ema_div = (CPUEMA_HIGH << P0_7_CPUEMA_SHIFT) | | 148 | ema_div = (CPUEMA_HIGH << P0_7_CPUEMA_SHIFT) | |
| @@ -209,38 +209,22 @@ static void exynos_enable_dvfs(void) | |||
| 209 | dvfs_info->base + XMU_DVFS_CTRL); | 209 | dvfs_info->base + XMU_DVFS_CTRL); |
| 210 | } | 210 | } |
| 211 | 211 | ||
| 212 | static int exynos_verify_speed(struct cpufreq_policy *policy) | ||
| 213 | { | ||
| 214 | return cpufreq_frequency_table_verify(policy, | ||
| 215 | dvfs_info->freq_table); | ||
| 216 | } | ||
| 217 | |||
| 218 | static unsigned int exynos_getspeed(unsigned int cpu) | 212 | static unsigned int exynos_getspeed(unsigned int cpu) |
| 219 | { | 213 | { |
| 220 | return dvfs_info->cur_frequency; | 214 | return dvfs_info->cur_frequency; |
| 221 | } | 215 | } |
| 222 | 216 | ||
| 223 | static int exynos_target(struct cpufreq_policy *policy, | 217 | static int exynos_target(struct cpufreq_policy *policy, unsigned int index) |
| 224 | unsigned int target_freq, | ||
| 225 | unsigned int relation) | ||
| 226 | { | 218 | { |
| 227 | unsigned int index, tmp; | 219 | unsigned int tmp; |
| 228 | int ret = 0, i; | 220 | int i; |
| 229 | struct cpufreq_frequency_table *freq_table = dvfs_info->freq_table; | 221 | struct cpufreq_frequency_table *freq_table = dvfs_info->freq_table; |
| 230 | 222 | ||
| 231 | mutex_lock(&cpufreq_lock); | 223 | mutex_lock(&cpufreq_lock); |
| 232 | 224 | ||
| 233 | ret = cpufreq_frequency_table_target(policy, freq_table, | ||
| 234 | target_freq, relation, &index); | ||
| 235 | if (ret) | ||
| 236 | goto out; | ||
| 237 | |||
| 238 | freqs.old = dvfs_info->cur_frequency; | 225 | freqs.old = dvfs_info->cur_frequency; |
| 239 | freqs.new = freq_table[index].frequency; | 226 | freqs.new = freq_table[index].frequency; |
| 240 | 227 | ||
| 241 | if (freqs.old == freqs.new) | ||
| 242 | goto out; | ||
| 243 | |||
| 244 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 228 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 245 | 229 | ||
| 246 | /* Set the target frequency in all C0_3_PSTATE register */ | 230 | /* Set the target frequency in all C0_3_PSTATE register */ |
| @@ -251,9 +235,8 @@ static int exynos_target(struct cpufreq_policy *policy, | |||
| 251 | 235 | ||
| 252 | __raw_writel(tmp, dvfs_info->base + XMU_C0_3_PSTATE + i * 4); | 236 | __raw_writel(tmp, dvfs_info->base + XMU_C0_3_PSTATE + i * 4); |
| 253 | } | 237 | } |
| 254 | out: | ||
| 255 | mutex_unlock(&cpufreq_lock); | 238 | mutex_unlock(&cpufreq_lock); |
| 256 | return ret; | 239 | return 0; |
| 257 | } | 240 | } |
| 258 | 241 | ||
| 259 | static void exynos_cpufreq_work(struct work_struct *work) | 242 | static void exynos_cpufreq_work(struct work_struct *work) |
| @@ -324,30 +307,19 @@ static void exynos_sort_descend_freq_table(void) | |||
| 324 | 307 | ||
| 325 | static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy) | 308 | static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy) |
| 326 | { | 309 | { |
| 327 | int ret; | 310 | return cpufreq_generic_init(policy, dvfs_info->freq_table, |
| 328 | 311 | dvfs_info->latency); | |
| 329 | ret = cpufreq_frequency_table_cpuinfo(policy, dvfs_info->freq_table); | ||
| 330 | if (ret) { | ||
| 331 | dev_err(dvfs_info->dev, "Invalid frequency table: %d\n", ret); | ||
| 332 | return ret; | ||
| 333 | } | ||
| 334 | |||
| 335 | policy->cur = dvfs_info->cur_frequency; | ||
| 336 | policy->cpuinfo.transition_latency = dvfs_info->latency; | ||
| 337 | cpumask_setall(policy->cpus); | ||
| 338 | |||
| 339 | cpufreq_frequency_table_get_attr(dvfs_info->freq_table, policy->cpu); | ||
| 340 | |||
| 341 | return 0; | ||
| 342 | } | 312 | } |
| 343 | 313 | ||
| 344 | static struct cpufreq_driver exynos_driver = { | 314 | static struct cpufreq_driver exynos_driver = { |
| 345 | .flags = CPUFREQ_STICKY, | 315 | .flags = CPUFREQ_STICKY, |
| 346 | .verify = exynos_verify_speed, | 316 | .verify = cpufreq_generic_frequency_table_verify, |
| 347 | .target = exynos_target, | 317 | .target_index = exynos_target, |
| 348 | .get = exynos_getspeed, | 318 | .get = exynos_getspeed, |
| 349 | .init = exynos_cpufreq_cpu_init, | 319 | .init = exynos_cpufreq_cpu_init, |
| 320 | .exit = cpufreq_generic_exit, | ||
| 350 | .name = CPUFREQ_NAME, | 321 | .name = CPUFREQ_NAME, |
| 322 | .attr = cpufreq_generic_attr, | ||
| 351 | }; | 323 | }; |
| 352 | 324 | ||
| 353 | static const struct of_device_id exynos_cpufreq_match[] = { | 325 | static const struct of_device_id exynos_cpufreq_match[] = { |
| @@ -399,13 +371,14 @@ static int exynos_cpufreq_probe(struct platform_device *pdev) | |||
| 399 | goto err_put_node; | 371 | goto err_put_node; |
| 400 | } | 372 | } |
| 401 | 373 | ||
| 402 | ret = opp_init_cpufreq_table(dvfs_info->dev, &dvfs_info->freq_table); | 374 | ret = dev_pm_opp_init_cpufreq_table(dvfs_info->dev, |
| 375 | &dvfs_info->freq_table); | ||
| 403 | if (ret) { | 376 | if (ret) { |
| 404 | dev_err(dvfs_info->dev, | 377 | dev_err(dvfs_info->dev, |
| 405 | "failed to init cpufreq table: %d\n", ret); | 378 | "failed to init cpufreq table: %d\n", ret); |
| 406 | goto err_put_node; | 379 | goto err_put_node; |
| 407 | } | 380 | } |
| 408 | dvfs_info->freq_count = opp_get_opp_count(dvfs_info->dev); | 381 | dvfs_info->freq_count = dev_pm_opp_get_opp_count(dvfs_info->dev); |
| 409 | exynos_sort_descend_freq_table(); | 382 | exynos_sort_descend_freq_table(); |
| 410 | 383 | ||
| 411 | if (of_property_read_u32(np, "clock-latency", &dvfs_info->latency)) | 384 | if (of_property_read_u32(np, "clock-latency", &dvfs_info->latency)) |
| @@ -454,7 +427,7 @@ static int exynos_cpufreq_probe(struct platform_device *pdev) | |||
| 454 | return 0; | 427 | return 0; |
| 455 | 428 | ||
| 456 | err_free_table: | 429 | err_free_table: |
| 457 | opp_free_cpufreq_table(dvfs_info->dev, &dvfs_info->freq_table); | 430 | dev_pm_opp_free_cpufreq_table(dvfs_info->dev, &dvfs_info->freq_table); |
| 458 | err_put_node: | 431 | err_put_node: |
| 459 | of_node_put(np); | 432 | of_node_put(np); |
| 460 | dev_err(&pdev->dev, "%s: failed initialization\n", __func__); | 433 | dev_err(&pdev->dev, "%s: failed initialization\n", __func__); |
| @@ -464,7 +437,7 @@ err_put_node: | |||
| 464 | static int exynos_cpufreq_remove(struct platform_device *pdev) | 437 | static int exynos_cpufreq_remove(struct platform_device *pdev) |
| 465 | { | 438 | { |
| 466 | cpufreq_unregister_driver(&exynos_driver); | 439 | cpufreq_unregister_driver(&exynos_driver); |
| 467 | opp_free_cpufreq_table(dvfs_info->dev, &dvfs_info->freq_table); | 440 | dev_pm_opp_free_cpufreq_table(dvfs_info->dev, &dvfs_info->freq_table); |
| 468 | return 0; | 441 | return 0; |
| 469 | } | 442 | } |
| 470 | 443 | ||
diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c index f111454a7aea..3458d27f63b4 100644 --- a/drivers/cpufreq/freq_table.c +++ b/drivers/cpufreq/freq_table.c | |||
| @@ -54,31 +54,30 @@ EXPORT_SYMBOL_GPL(cpufreq_frequency_table_cpuinfo); | |||
| 54 | int cpufreq_frequency_table_verify(struct cpufreq_policy *policy, | 54 | int cpufreq_frequency_table_verify(struct cpufreq_policy *policy, |
| 55 | struct cpufreq_frequency_table *table) | 55 | struct cpufreq_frequency_table *table) |
| 56 | { | 56 | { |
| 57 | unsigned int next_larger = ~0; | 57 | unsigned int next_larger = ~0, freq, i = 0; |
| 58 | unsigned int i; | 58 | bool found = false; |
| 59 | unsigned int count = 0; | ||
| 60 | 59 | ||
| 61 | pr_debug("request for verification of policy (%u - %u kHz) for cpu %u\n", | 60 | pr_debug("request for verification of policy (%u - %u kHz) for cpu %u\n", |
| 62 | policy->min, policy->max, policy->cpu); | 61 | policy->min, policy->max, policy->cpu); |
| 63 | 62 | ||
| 64 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, | 63 | cpufreq_verify_within_cpu_limits(policy); |
| 65 | policy->cpuinfo.max_freq); | ||
| 66 | 64 | ||
| 67 | for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) { | 65 | for (; freq = table[i].frequency, freq != CPUFREQ_TABLE_END; i++) { |
| 68 | unsigned int freq = table[i].frequency; | ||
| 69 | if (freq == CPUFREQ_ENTRY_INVALID) | 66 | if (freq == CPUFREQ_ENTRY_INVALID) |
| 70 | continue; | 67 | continue; |
| 71 | if ((freq >= policy->min) && (freq <= policy->max)) | 68 | if ((freq >= policy->min) && (freq <= policy->max)) { |
| 72 | count++; | 69 | found = true; |
| 73 | else if ((next_larger > freq) && (freq > policy->max)) | 70 | break; |
| 71 | } | ||
| 72 | |||
| 73 | if ((next_larger > freq) && (freq > policy->max)) | ||
| 74 | next_larger = freq; | 74 | next_larger = freq; |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | if (!count) | 77 | if (!found) { |
| 78 | policy->max = next_larger; | 78 | policy->max = next_larger; |
| 79 | 79 | cpufreq_verify_within_cpu_limits(policy); | |
| 80 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, | 80 | } |
| 81 | policy->cpuinfo.max_freq); | ||
| 82 | 81 | ||
| 83 | pr_debug("verification lead to (%u - %u kHz) for cpu %u\n", | 82 | pr_debug("verification lead to (%u - %u kHz) for cpu %u\n", |
| 84 | policy->min, policy->max, policy->cpu); | 83 | policy->min, policy->max, policy->cpu); |
| @@ -87,6 +86,20 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy, | |||
| 87 | } | 86 | } |
| 88 | EXPORT_SYMBOL_GPL(cpufreq_frequency_table_verify); | 87 | EXPORT_SYMBOL_GPL(cpufreq_frequency_table_verify); |
| 89 | 88 | ||
| 89 | /* | ||
| 90 | * Generic routine to verify policy & frequency table, requires driver to call | ||
| 91 | * cpufreq_frequency_table_get_attr() prior to it. | ||
| 92 | */ | ||
| 93 | int cpufreq_generic_frequency_table_verify(struct cpufreq_policy *policy) | ||
| 94 | { | ||
| 95 | struct cpufreq_frequency_table *table = | ||
| 96 | cpufreq_frequency_get_table(policy->cpu); | ||
| 97 | if (!table) | ||
| 98 | return -ENODEV; | ||
| 99 | |||
| 100 | return cpufreq_frequency_table_verify(policy, table); | ||
| 101 | } | ||
| 102 | EXPORT_SYMBOL_GPL(cpufreq_generic_frequency_table_verify); | ||
| 90 | 103 | ||
| 91 | int cpufreq_frequency_table_target(struct cpufreq_policy *policy, | 104 | int cpufreq_frequency_table_target(struct cpufreq_policy *policy, |
| 92 | struct cpufreq_frequency_table *table, | 105 | struct cpufreq_frequency_table *table, |
| @@ -200,6 +213,12 @@ struct freq_attr cpufreq_freq_attr_scaling_available_freqs = { | |||
| 200 | }; | 213 | }; |
| 201 | EXPORT_SYMBOL_GPL(cpufreq_freq_attr_scaling_available_freqs); | 214 | EXPORT_SYMBOL_GPL(cpufreq_freq_attr_scaling_available_freqs); |
| 202 | 215 | ||
| 216 | struct freq_attr *cpufreq_generic_attr[] = { | ||
| 217 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 218 | NULL, | ||
| 219 | }; | ||
| 220 | EXPORT_SYMBOL_GPL(cpufreq_generic_attr); | ||
| 221 | |||
| 203 | /* | 222 | /* |
| 204 | * if you use these, you must assure that the frequency table is valid | 223 | * if you use these, you must assure that the frequency table is valid |
| 205 | * all the time between get_attr and put_attr! | 224 | * all the time between get_attr and put_attr! |
| @@ -219,6 +238,18 @@ void cpufreq_frequency_table_put_attr(unsigned int cpu) | |||
| 219 | } | 238 | } |
| 220 | EXPORT_SYMBOL_GPL(cpufreq_frequency_table_put_attr); | 239 | EXPORT_SYMBOL_GPL(cpufreq_frequency_table_put_attr); |
| 221 | 240 | ||
| 241 | int cpufreq_table_validate_and_show(struct cpufreq_policy *policy, | ||
| 242 | struct cpufreq_frequency_table *table) | ||
| 243 | { | ||
| 244 | int ret = cpufreq_frequency_table_cpuinfo(policy, table); | ||
| 245 | |||
| 246 | if (!ret) | ||
| 247 | cpufreq_frequency_table_get_attr(table, policy->cpu); | ||
| 248 | |||
| 249 | return ret; | ||
| 250 | } | ||
| 251 | EXPORT_SYMBOL_GPL(cpufreq_table_validate_and_show); | ||
| 252 | |||
| 222 | void cpufreq_frequency_table_update_policy_cpu(struct cpufreq_policy *policy) | 253 | void cpufreq_frequency_table_update_policy_cpu(struct cpufreq_policy *policy) |
| 223 | { | 254 | { |
| 224 | pr_debug("Updating show_table for new_cpu %u from last_cpu %u\n", | 255 | pr_debug("Updating show_table for new_cpu %u from last_cpu %u\n", |
diff --git a/drivers/cpufreq/gx-suspmod.c b/drivers/cpufreq/gx-suspmod.c index 70442c7b5e71..d83e8266a58e 100644 --- a/drivers/cpufreq/gx-suspmod.c +++ b/drivers/cpufreq/gx-suspmod.c | |||
| @@ -401,7 +401,7 @@ static int cpufreq_gx_target(struct cpufreq_policy *policy, | |||
| 401 | 401 | ||
| 402 | static int cpufreq_gx_cpu_init(struct cpufreq_policy *policy) | 402 | static int cpufreq_gx_cpu_init(struct cpufreq_policy *policy) |
| 403 | { | 403 | { |
| 404 | unsigned int maxfreq, curfreq; | 404 | unsigned int maxfreq; |
| 405 | 405 | ||
| 406 | if (!policy || policy->cpu != 0) | 406 | if (!policy || policy->cpu != 0) |
| 407 | return -ENODEV; | 407 | return -ENODEV; |
| @@ -415,10 +415,8 @@ static int cpufreq_gx_cpu_init(struct cpufreq_policy *policy) | |||
| 415 | maxfreq = 30000 * gx_freq_mult[getCx86(CX86_DIR1) & 0x0f]; | 415 | maxfreq = 30000 * gx_freq_mult[getCx86(CX86_DIR1) & 0x0f]; |
| 416 | 416 | ||
| 417 | stock_freq = maxfreq; | 417 | stock_freq = maxfreq; |
| 418 | curfreq = gx_get_cpuspeed(0); | ||
| 419 | 418 | ||
| 420 | pr_debug("cpu max frequency is %d.\n", maxfreq); | 419 | pr_debug("cpu max frequency is %d.\n", maxfreq); |
| 421 | pr_debug("cpu current frequency is %dkHz.\n", curfreq); | ||
| 422 | 420 | ||
| 423 | /* setup basic struct for cpufreq API */ | 421 | /* setup basic struct for cpufreq API */ |
| 424 | policy->cpu = 0; | 422 | policy->cpu = 0; |
| @@ -428,7 +426,6 @@ static int cpufreq_gx_cpu_init(struct cpufreq_policy *policy) | |||
| 428 | else | 426 | else |
| 429 | policy->min = maxfreq / POLICY_MIN_DIV; | 427 | policy->min = maxfreq / POLICY_MIN_DIV; |
| 430 | policy->max = maxfreq; | 428 | policy->max = maxfreq; |
| 431 | policy->cur = curfreq; | ||
| 432 | policy->cpuinfo.min_freq = maxfreq / max_duration; | 429 | policy->cpuinfo.min_freq = maxfreq / max_duration; |
| 433 | policy->cpuinfo.max_freq = maxfreq; | 430 | policy->cpuinfo.max_freq = maxfreq; |
| 434 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | 431 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; |
diff --git a/drivers/cpufreq/highbank-cpufreq.c b/drivers/cpufreq/highbank-cpufreq.c index 794123fcf3e3..bf8902a0866d 100644 --- a/drivers/cpufreq/highbank-cpufreq.c +++ b/drivers/cpufreq/highbank-cpufreq.c | |||
| @@ -66,7 +66,8 @@ static int hb_cpufreq_driver_init(void) | |||
| 66 | struct device_node *np; | 66 | struct device_node *np; |
| 67 | int ret; | 67 | int ret; |
| 68 | 68 | ||
| 69 | if (!of_machine_is_compatible("calxeda,highbank")) | 69 | if ((!of_machine_is_compatible("calxeda,highbank")) && |
| 70 | (!of_machine_is_compatible("calxeda,ecx-2000"))) | ||
| 70 | return -ENODEV; | 71 | return -ENODEV; |
| 71 | 72 | ||
| 72 | cpu_dev = get_cpu_device(0); | 73 | cpu_dev = get_cpu_device(0); |
diff --git a/drivers/cpufreq/ia64-acpi-cpufreq.c b/drivers/cpufreq/ia64-acpi-cpufreq.c index 3e14f0317175..4695fa22406a 100644 --- a/drivers/cpufreq/ia64-acpi-cpufreq.c +++ b/drivers/cpufreq/ia64-acpi-cpufreq.c | |||
| @@ -227,42 +227,11 @@ acpi_cpufreq_get ( | |||
| 227 | static int | 227 | static int |
| 228 | acpi_cpufreq_target ( | 228 | acpi_cpufreq_target ( |
| 229 | struct cpufreq_policy *policy, | 229 | struct cpufreq_policy *policy, |
| 230 | unsigned int target_freq, | 230 | unsigned int index) |
| 231 | unsigned int relation) | ||
| 232 | { | 231 | { |
| 233 | struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu]; | 232 | return processor_set_freq(acpi_io_data[policy->cpu], policy, index); |
| 234 | unsigned int next_state = 0; | ||
| 235 | unsigned int result = 0; | ||
| 236 | |||
| 237 | pr_debug("acpi_cpufreq_setpolicy\n"); | ||
| 238 | |||
| 239 | result = cpufreq_frequency_table_target(policy, | ||
| 240 | data->freq_table, target_freq, relation, &next_state); | ||
| 241 | if (result) | ||
| 242 | return (result); | ||
| 243 | |||
| 244 | result = processor_set_freq(data, policy, next_state); | ||
| 245 | |||
| 246 | return (result); | ||
| 247 | } | 233 | } |
| 248 | 234 | ||
| 249 | |||
| 250 | static int | ||
| 251 | acpi_cpufreq_verify ( | ||
| 252 | struct cpufreq_policy *policy) | ||
| 253 | { | ||
| 254 | unsigned int result = 0; | ||
| 255 | struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu]; | ||
| 256 | |||
| 257 | pr_debug("acpi_cpufreq_verify\n"); | ||
| 258 | |||
| 259 | result = cpufreq_frequency_table_verify(policy, | ||
| 260 | data->freq_table); | ||
| 261 | |||
| 262 | return (result); | ||
| 263 | } | ||
| 264 | |||
| 265 | |||
| 266 | static int | 235 | static int |
| 267 | acpi_cpufreq_cpu_init ( | 236 | acpi_cpufreq_cpu_init ( |
| 268 | struct cpufreq_policy *policy) | 237 | struct cpufreq_policy *policy) |
| @@ -321,7 +290,6 @@ acpi_cpufreq_cpu_init ( | |||
| 321 | data->acpi_data.states[i].transition_latency * 1000; | 290 | data->acpi_data.states[i].transition_latency * 1000; |
| 322 | } | 291 | } |
| 323 | } | 292 | } |
| 324 | policy->cur = processor_get_freq(data, policy->cpu); | ||
| 325 | 293 | ||
| 326 | /* table init */ | 294 | /* table init */ |
| 327 | for (i = 0; i <= data->acpi_data.state_count; i++) | 295 | for (i = 0; i <= data->acpi_data.state_count; i++) |
| @@ -335,7 +303,7 @@ acpi_cpufreq_cpu_init ( | |||
| 335 | } | 303 | } |
| 336 | } | 304 | } |
| 337 | 305 | ||
| 338 | result = cpufreq_frequency_table_cpuinfo(policy, data->freq_table); | 306 | result = cpufreq_table_validate_and_show(policy, data->freq_table); |
| 339 | if (result) { | 307 | if (result) { |
| 340 | goto err_freqfree; | 308 | goto err_freqfree; |
| 341 | } | 309 | } |
| @@ -356,8 +324,6 @@ acpi_cpufreq_cpu_init ( | |||
| 356 | (u32) data->acpi_data.states[i].status, | 324 | (u32) data->acpi_data.states[i].status, |
| 357 | (u32) data->acpi_data.states[i].control); | 325 | (u32) data->acpi_data.states[i].control); |
| 358 | 326 | ||
| 359 | cpufreq_frequency_table_get_attr(data->freq_table, policy->cpu); | ||
| 360 | |||
| 361 | /* the first call to ->target() should result in us actually | 327 | /* the first call to ->target() should result in us actually |
| 362 | * writing something to the appropriate registers. */ | 328 | * writing something to the appropriate registers. */ |
| 363 | data->resume = 1; | 329 | data->resume = 1; |
| @@ -396,20 +362,14 @@ acpi_cpufreq_cpu_exit ( | |||
| 396 | } | 362 | } |
| 397 | 363 | ||
| 398 | 364 | ||
| 399 | static struct freq_attr* acpi_cpufreq_attr[] = { | ||
| 400 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 401 | NULL, | ||
| 402 | }; | ||
| 403 | |||
| 404 | |||
| 405 | static struct cpufreq_driver acpi_cpufreq_driver = { | 365 | static struct cpufreq_driver acpi_cpufreq_driver = { |
| 406 | .verify = acpi_cpufreq_verify, | 366 | .verify = cpufreq_generic_frequency_table_verify, |
| 407 | .target = acpi_cpufreq_target, | 367 | .target_index = acpi_cpufreq_target, |
| 408 | .get = acpi_cpufreq_get, | 368 | .get = acpi_cpufreq_get, |
| 409 | .init = acpi_cpufreq_cpu_init, | 369 | .init = acpi_cpufreq_cpu_init, |
| 410 | .exit = acpi_cpufreq_cpu_exit, | 370 | .exit = acpi_cpufreq_cpu_exit, |
| 411 | .name = "acpi-cpufreq", | 371 | .name = "acpi-cpufreq", |
| 412 | .attr = acpi_cpufreq_attr, | 372 | .attr = cpufreq_generic_attr, |
| 413 | }; | 373 | }; |
| 414 | 374 | ||
| 415 | 375 | ||
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c index c3fd2a101ca0..07af3b0de069 100644 --- a/drivers/cpufreq/imx6q-cpufreq.c +++ b/drivers/cpufreq/imx6q-cpufreq.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/err.h> | 13 | #include <linux/err.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/of.h> | 15 | #include <linux/of.h> |
| 16 | #include <linux/opp.h> | 16 | #include <linux/pm_opp.h> |
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/regulator/consumer.h> | 18 | #include <linux/regulator/consumer.h> |
| 19 | 19 | ||
| @@ -35,49 +35,31 @@ static struct device *cpu_dev; | |||
| 35 | static struct cpufreq_frequency_table *freq_table; | 35 | static struct cpufreq_frequency_table *freq_table; |
| 36 | static unsigned int transition_latency; | 36 | static unsigned int transition_latency; |
| 37 | 37 | ||
| 38 | static int imx6q_verify_speed(struct cpufreq_policy *policy) | ||
| 39 | { | ||
| 40 | return cpufreq_frequency_table_verify(policy, freq_table); | ||
| 41 | } | ||
| 42 | |||
| 43 | static unsigned int imx6q_get_speed(unsigned int cpu) | 38 | static unsigned int imx6q_get_speed(unsigned int cpu) |
| 44 | { | 39 | { |
| 45 | return clk_get_rate(arm_clk) / 1000; | 40 | return clk_get_rate(arm_clk) / 1000; |
| 46 | } | 41 | } |
| 47 | 42 | ||
| 48 | static int imx6q_set_target(struct cpufreq_policy *policy, | 43 | static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index) |
| 49 | unsigned int target_freq, unsigned int relation) | ||
| 50 | { | 44 | { |
| 51 | struct cpufreq_freqs freqs; | 45 | struct cpufreq_freqs freqs; |
| 52 | struct opp *opp; | 46 | struct dev_pm_opp *opp; |
| 53 | unsigned long freq_hz, volt, volt_old; | 47 | unsigned long freq_hz, volt, volt_old; |
| 54 | unsigned int index; | ||
| 55 | int ret; | 48 | int ret; |
| 56 | 49 | ||
| 57 | ret = cpufreq_frequency_table_target(policy, freq_table, target_freq, | ||
| 58 | relation, &index); | ||
| 59 | if (ret) { | ||
| 60 | dev_err(cpu_dev, "failed to match target frequency %d: %d\n", | ||
| 61 | target_freq, ret); | ||
| 62 | return ret; | ||
| 63 | } | ||
| 64 | |||
| 65 | freqs.new = freq_table[index].frequency; | 50 | freqs.new = freq_table[index].frequency; |
| 66 | freq_hz = freqs.new * 1000; | 51 | freq_hz = freqs.new * 1000; |
| 67 | freqs.old = clk_get_rate(arm_clk) / 1000; | 52 | freqs.old = clk_get_rate(arm_clk) / 1000; |
| 68 | 53 | ||
| 69 | if (freqs.old == freqs.new) | ||
| 70 | return 0; | ||
| 71 | |||
| 72 | rcu_read_lock(); | 54 | rcu_read_lock(); |
| 73 | opp = opp_find_freq_ceil(cpu_dev, &freq_hz); | 55 | opp = dev_pm_opp_find_freq_ceil(cpu_dev, &freq_hz); |
| 74 | if (IS_ERR(opp)) { | 56 | if (IS_ERR(opp)) { |
| 75 | rcu_read_unlock(); | 57 | rcu_read_unlock(); |
| 76 | dev_err(cpu_dev, "failed to find OPP for %ld\n", freq_hz); | 58 | dev_err(cpu_dev, "failed to find OPP for %ld\n", freq_hz); |
| 77 | return PTR_ERR(opp); | 59 | return PTR_ERR(opp); |
| 78 | } | 60 | } |
| 79 | 61 | ||
| 80 | volt = opp_get_voltage(opp); | 62 | volt = dev_pm_opp_get_voltage(opp); |
| 81 | rcu_read_unlock(); | 63 | rcu_read_unlock(); |
| 82 | volt_old = regulator_get_voltage(arm_reg); | 64 | volt_old = regulator_get_voltage(arm_reg); |
| 83 | 65 | ||
| @@ -159,47 +141,23 @@ post_notify: | |||
| 159 | 141 | ||
| 160 | static int imx6q_cpufreq_init(struct cpufreq_policy *policy) | 142 | static int imx6q_cpufreq_init(struct cpufreq_policy *policy) |
| 161 | { | 143 | { |
| 162 | int ret; | 144 | return cpufreq_generic_init(policy, freq_table, transition_latency); |
| 163 | |||
| 164 | ret = cpufreq_frequency_table_cpuinfo(policy, freq_table); | ||
| 165 | if (ret) { | ||
| 166 | dev_err(cpu_dev, "invalid frequency table: %d\n", ret); | ||
| 167 | return ret; | ||
| 168 | } | ||
| 169 | |||
| 170 | policy->cpuinfo.transition_latency = transition_latency; | ||
| 171 | policy->cur = clk_get_rate(arm_clk) / 1000; | ||
| 172 | cpumask_setall(policy->cpus); | ||
| 173 | cpufreq_frequency_table_get_attr(freq_table, policy->cpu); | ||
| 174 | |||
| 175 | return 0; | ||
| 176 | } | ||
| 177 | |||
| 178 | static int imx6q_cpufreq_exit(struct cpufreq_policy *policy) | ||
| 179 | { | ||
| 180 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 181 | return 0; | ||
| 182 | } | 145 | } |
| 183 | 146 | ||
| 184 | static struct freq_attr *imx6q_cpufreq_attr[] = { | ||
| 185 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 186 | NULL, | ||
| 187 | }; | ||
| 188 | |||
| 189 | static struct cpufreq_driver imx6q_cpufreq_driver = { | 147 | static struct cpufreq_driver imx6q_cpufreq_driver = { |
| 190 | .verify = imx6q_verify_speed, | 148 | .verify = cpufreq_generic_frequency_table_verify, |
| 191 | .target = imx6q_set_target, | 149 | .target_index = imx6q_set_target, |
| 192 | .get = imx6q_get_speed, | 150 | .get = imx6q_get_speed, |
| 193 | .init = imx6q_cpufreq_init, | 151 | .init = imx6q_cpufreq_init, |
| 194 | .exit = imx6q_cpufreq_exit, | 152 | .exit = cpufreq_generic_exit, |
| 195 | .name = "imx6q-cpufreq", | 153 | .name = "imx6q-cpufreq", |
| 196 | .attr = imx6q_cpufreq_attr, | 154 | .attr = cpufreq_generic_attr, |
| 197 | }; | 155 | }; |
| 198 | 156 | ||
| 199 | static int imx6q_cpufreq_probe(struct platform_device *pdev) | 157 | static int imx6q_cpufreq_probe(struct platform_device *pdev) |
| 200 | { | 158 | { |
| 201 | struct device_node *np; | 159 | struct device_node *np; |
| 202 | struct opp *opp; | 160 | struct dev_pm_opp *opp; |
| 203 | unsigned long min_volt, max_volt; | 161 | unsigned long min_volt, max_volt; |
| 204 | int num, ret; | 162 | int num, ret; |
| 205 | 163 | ||
| @@ -237,14 +195,14 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) | |||
| 237 | } | 195 | } |
| 238 | 196 | ||
| 239 | /* We expect an OPP table supplied by platform */ | 197 | /* We expect an OPP table supplied by platform */ |
| 240 | num = opp_get_opp_count(cpu_dev); | 198 | num = dev_pm_opp_get_opp_count(cpu_dev); |
| 241 | if (num < 0) { | 199 | if (num < 0) { |
| 242 | ret = num; | 200 | ret = num; |
| 243 | dev_err(cpu_dev, "no OPP table is found: %d\n", ret); | 201 | dev_err(cpu_dev, "no OPP table is found: %d\n", ret); |
| 244 | goto put_node; | 202 | goto put_node; |
| 245 | } | 203 | } |
| 246 | 204 | ||
| 247 | ret = opp_init_cpufreq_table(cpu_dev, &freq_table); | 205 | ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table); |
| 248 | if (ret) { | 206 | if (ret) { |
| 249 | dev_err(cpu_dev, "failed to init cpufreq table: %d\n", ret); | 207 | dev_err(cpu_dev, "failed to init cpufreq table: %d\n", ret); |
| 250 | goto put_node; | 208 | goto put_node; |
| @@ -259,12 +217,12 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) | |||
| 259 | * same order. | 217 | * same order. |
| 260 | */ | 218 | */ |
| 261 | rcu_read_lock(); | 219 | rcu_read_lock(); |
| 262 | opp = opp_find_freq_exact(cpu_dev, | 220 | opp = dev_pm_opp_find_freq_exact(cpu_dev, |
| 263 | freq_table[0].frequency * 1000, true); | 221 | freq_table[0].frequency * 1000, true); |
| 264 | min_volt = opp_get_voltage(opp); | 222 | min_volt = dev_pm_opp_get_voltage(opp); |
| 265 | opp = opp_find_freq_exact(cpu_dev, | 223 | opp = dev_pm_opp_find_freq_exact(cpu_dev, |
| 266 | freq_table[--num].frequency * 1000, true); | 224 | freq_table[--num].frequency * 1000, true); |
| 267 | max_volt = opp_get_voltage(opp); | 225 | max_volt = dev_pm_opp_get_voltage(opp); |
| 268 | rcu_read_unlock(); | 226 | rcu_read_unlock(); |
| 269 | ret = regulator_set_voltage_time(arm_reg, min_volt, max_volt); | 227 | ret = regulator_set_voltage_time(arm_reg, min_volt, max_volt); |
| 270 | if (ret > 0) | 228 | if (ret > 0) |
| @@ -292,7 +250,7 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) | |||
| 292 | return 0; | 250 | return 0; |
| 293 | 251 | ||
| 294 | free_freq_table: | 252 | free_freq_table: |
| 295 | opp_free_cpufreq_table(cpu_dev, &freq_table); | 253 | dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table); |
| 296 | put_node: | 254 | put_node: |
| 297 | of_node_put(np); | 255 | of_node_put(np); |
| 298 | return ret; | 256 | return ret; |
| @@ -301,7 +259,7 @@ put_node: | |||
| 301 | static int imx6q_cpufreq_remove(struct platform_device *pdev) | 259 | static int imx6q_cpufreq_remove(struct platform_device *pdev) |
| 302 | { | 260 | { |
| 303 | cpufreq_unregister_driver(&imx6q_cpufreq_driver); | 261 | cpufreq_unregister_driver(&imx6q_cpufreq_driver); |
| 304 | opp_free_cpufreq_table(cpu_dev, &freq_table); | 262 | dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table); |
| 305 | 263 | ||
| 306 | return 0; | 264 | return 0; |
| 307 | } | 265 | } |
diff --git a/drivers/cpufreq/integrator-cpufreq.c b/drivers/cpufreq/integrator-cpufreq.c index f7c99df0880b..babf3e40e9fa 100644 --- a/drivers/cpufreq/integrator-cpufreq.c +++ b/drivers/cpufreq/integrator-cpufreq.c | |||
| @@ -59,9 +59,7 @@ static int integrator_verify_policy(struct cpufreq_policy *policy) | |||
| 59 | { | 59 | { |
| 60 | struct icst_vco vco; | 60 | struct icst_vco vco; |
| 61 | 61 | ||
| 62 | cpufreq_verify_within_limits(policy, | 62 | cpufreq_verify_within_cpu_limits(policy); |
| 63 | policy->cpuinfo.min_freq, | ||
| 64 | policy->cpuinfo.max_freq); | ||
| 65 | 63 | ||
| 66 | vco = icst_hz_to_vco(&cclk_params, policy->max * 1000); | 64 | vco = icst_hz_to_vco(&cclk_params, policy->max * 1000); |
| 67 | policy->max = icst_hz(&cclk_params, vco) / 1000; | 65 | policy->max = icst_hz(&cclk_params, vco) / 1000; |
| @@ -69,10 +67,7 @@ static int integrator_verify_policy(struct cpufreq_policy *policy) | |||
| 69 | vco = icst_hz_to_vco(&cclk_params, policy->min * 1000); | 67 | vco = icst_hz_to_vco(&cclk_params, policy->min * 1000); |
| 70 | policy->min = icst_hz(&cclk_params, vco) / 1000; | 68 | policy->min = icst_hz(&cclk_params, vco) / 1000; |
| 71 | 69 | ||
| 72 | cpufreq_verify_within_limits(policy, | 70 | cpufreq_verify_within_cpu_limits(policy); |
| 73 | policy->cpuinfo.min_freq, | ||
| 74 | policy->cpuinfo.max_freq); | ||
| 75 | |||
| 76 | return 0; | 71 | return 0; |
| 77 | } | 72 | } |
| 78 | 73 | ||
| @@ -186,10 +181,9 @@ static int integrator_cpufreq_init(struct cpufreq_policy *policy) | |||
| 186 | { | 181 | { |
| 187 | 182 | ||
| 188 | /* set default policy and cpuinfo */ | 183 | /* set default policy and cpuinfo */ |
| 189 | policy->cpuinfo.max_freq = 160000; | 184 | policy->max = policy->cpuinfo.max_freq = 160000; |
| 190 | policy->cpuinfo.min_freq = 12000; | 185 | policy->min = policy->cpuinfo.min_freq = 12000; |
| 191 | policy->cpuinfo.transition_latency = 1000000; /* 1 ms, assumed */ | 186 | policy->cpuinfo.transition_latency = 1000000; /* 1 ms, assumed */ |
| 192 | policy->cur = policy->min = policy->max = integrator_get(policy->cpu); | ||
| 193 | 187 | ||
| 194 | return 0; | 188 | return 0; |
| 195 | } | 189 | } |
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 32b3479a2405..89925513fea5 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c | |||
| @@ -33,6 +33,8 @@ | |||
| 33 | 33 | ||
| 34 | #define SAMPLE_COUNT 3 | 34 | #define SAMPLE_COUNT 3 |
| 35 | 35 | ||
| 36 | #define BYT_RATIOS 0x66a | ||
| 37 | |||
| 36 | #define FRAC_BITS 8 | 38 | #define FRAC_BITS 8 |
| 37 | #define int_tofp(X) ((int64_t)(X) << FRAC_BITS) | 39 | #define int_tofp(X) ((int64_t)(X) << FRAC_BITS) |
| 38 | #define fp_toint(X) ((X) >> FRAC_BITS) | 40 | #define fp_toint(X) ((X) >> FRAC_BITS) |
| @@ -48,7 +50,7 @@ static inline int32_t div_fp(int32_t x, int32_t y) | |||
| 48 | } | 50 | } |
| 49 | 51 | ||
| 50 | struct sample { | 52 | struct sample { |
| 51 | int core_pct_busy; | 53 | int32_t core_pct_busy; |
| 52 | u64 aperf; | 54 | u64 aperf; |
| 53 | u64 mperf; | 55 | u64 mperf; |
| 54 | int freq; | 56 | int freq; |
| @@ -68,7 +70,7 @@ struct _pid { | |||
| 68 | int32_t i_gain; | 70 | int32_t i_gain; |
| 69 | int32_t d_gain; | 71 | int32_t d_gain; |
| 70 | int deadband; | 72 | int deadband; |
| 71 | int last_err; | 73 | int32_t last_err; |
| 72 | }; | 74 | }; |
| 73 | 75 | ||
| 74 | struct cpudata { | 76 | struct cpudata { |
| @@ -78,7 +80,6 @@ struct cpudata { | |||
| 78 | 80 | ||
| 79 | struct timer_list timer; | 81 | struct timer_list timer; |
| 80 | 82 | ||
| 81 | struct pstate_adjust_policy *pstate_policy; | ||
| 82 | struct pstate_data pstate; | 83 | struct pstate_data pstate; |
| 83 | struct _pid pid; | 84 | struct _pid pid; |
| 84 | 85 | ||
| @@ -100,15 +101,21 @@ struct pstate_adjust_policy { | |||
| 100 | int i_gain_pct; | 101 | int i_gain_pct; |
| 101 | }; | 102 | }; |
| 102 | 103 | ||
| 103 | static struct pstate_adjust_policy default_policy = { | 104 | struct pstate_funcs { |
| 104 | .sample_rate_ms = 10, | 105 | int (*get_max)(void); |
| 105 | .deadband = 0, | 106 | int (*get_min)(void); |
| 106 | .setpoint = 97, | 107 | int (*get_turbo)(void); |
| 107 | .p_gain_pct = 20, | 108 | void (*set)(int pstate); |
| 108 | .d_gain_pct = 0, | 109 | }; |
| 109 | .i_gain_pct = 0, | 110 | |
| 111 | struct cpu_defaults { | ||
| 112 | struct pstate_adjust_policy pid_policy; | ||
| 113 | struct pstate_funcs funcs; | ||
| 110 | }; | 114 | }; |
| 111 | 115 | ||
| 116 | static struct pstate_adjust_policy pid_params; | ||
| 117 | static struct pstate_funcs pstate_funcs; | ||
| 118 | |||
| 112 | struct perf_limits { | 119 | struct perf_limits { |
| 113 | int no_turbo; | 120 | int no_turbo; |
| 114 | int max_perf_pct; | 121 | int max_perf_pct; |
| @@ -153,16 +160,15 @@ static inline void pid_d_gain_set(struct _pid *pid, int percent) | |||
| 153 | pid->d_gain = div_fp(int_tofp(percent), int_tofp(100)); | 160 | pid->d_gain = div_fp(int_tofp(percent), int_tofp(100)); |
| 154 | } | 161 | } |
| 155 | 162 | ||
| 156 | static signed int pid_calc(struct _pid *pid, int busy) | 163 | static signed int pid_calc(struct _pid *pid, int32_t busy) |
| 157 | { | 164 | { |
| 158 | signed int err, result; | 165 | signed int result; |
| 159 | int32_t pterm, dterm, fp_error; | 166 | int32_t pterm, dterm, fp_error; |
| 160 | int32_t integral_limit; | 167 | int32_t integral_limit; |
| 161 | 168 | ||
| 162 | err = pid->setpoint - busy; | 169 | fp_error = int_tofp(pid->setpoint) - busy; |
| 163 | fp_error = int_tofp(err); | ||
| 164 | 170 | ||
| 165 | if (abs(err) <= pid->deadband) | 171 | if (abs(fp_error) <= int_tofp(pid->deadband)) |
| 166 | return 0; | 172 | return 0; |
| 167 | 173 | ||
| 168 | pterm = mul_fp(pid->p_gain, fp_error); | 174 | pterm = mul_fp(pid->p_gain, fp_error); |
| @@ -176,8 +182,8 @@ static signed int pid_calc(struct _pid *pid, int busy) | |||
| 176 | if (pid->integral < -integral_limit) | 182 | if (pid->integral < -integral_limit) |
| 177 | pid->integral = -integral_limit; | 183 | pid->integral = -integral_limit; |
| 178 | 184 | ||
| 179 | dterm = mul_fp(pid->d_gain, (err - pid->last_err)); | 185 | dterm = mul_fp(pid->d_gain, fp_error - pid->last_err); |
| 180 | pid->last_err = err; | 186 | pid->last_err = fp_error; |
| 181 | 187 | ||
| 182 | result = pterm + mul_fp(pid->integral, pid->i_gain) + dterm; | 188 | result = pterm + mul_fp(pid->integral, pid->i_gain) + dterm; |
| 183 | 189 | ||
| @@ -186,14 +192,14 @@ static signed int pid_calc(struct _pid *pid, int busy) | |||
| 186 | 192 | ||
| 187 | static inline void intel_pstate_busy_pid_reset(struct cpudata *cpu) | 193 | static inline void intel_pstate_busy_pid_reset(struct cpudata *cpu) |
| 188 | { | 194 | { |
| 189 | pid_p_gain_set(&cpu->pid, cpu->pstate_policy->p_gain_pct); | 195 | pid_p_gain_set(&cpu->pid, pid_params.p_gain_pct); |
| 190 | pid_d_gain_set(&cpu->pid, cpu->pstate_policy->d_gain_pct); | 196 | pid_d_gain_set(&cpu->pid, pid_params.d_gain_pct); |
| 191 | pid_i_gain_set(&cpu->pid, cpu->pstate_policy->i_gain_pct); | 197 | pid_i_gain_set(&cpu->pid, pid_params.i_gain_pct); |
| 192 | 198 | ||
| 193 | pid_reset(&cpu->pid, | 199 | pid_reset(&cpu->pid, |
| 194 | cpu->pstate_policy->setpoint, | 200 | pid_params.setpoint, |
| 195 | 100, | 201 | 100, |
| 196 | cpu->pstate_policy->deadband, | 202 | pid_params.deadband, |
| 197 | 0); | 203 | 0); |
| 198 | } | 204 | } |
| 199 | 205 | ||
| @@ -227,12 +233,12 @@ struct pid_param { | |||
| 227 | }; | 233 | }; |
| 228 | 234 | ||
| 229 | static struct pid_param pid_files[] = { | 235 | static struct pid_param pid_files[] = { |
| 230 | {"sample_rate_ms", &default_policy.sample_rate_ms}, | 236 | {"sample_rate_ms", &pid_params.sample_rate_ms}, |
| 231 | {"d_gain_pct", &default_policy.d_gain_pct}, | 237 | {"d_gain_pct", &pid_params.d_gain_pct}, |
| 232 | {"i_gain_pct", &default_policy.i_gain_pct}, | 238 | {"i_gain_pct", &pid_params.i_gain_pct}, |
| 233 | {"deadband", &default_policy.deadband}, | 239 | {"deadband", &pid_params.deadband}, |
| 234 | {"setpoint", &default_policy.setpoint}, | 240 | {"setpoint", &pid_params.setpoint}, |
| 235 | {"p_gain_pct", &default_policy.p_gain_pct}, | 241 | {"p_gain_pct", &pid_params.p_gain_pct}, |
| 236 | {NULL, NULL} | 242 | {NULL, NULL} |
| 237 | }; | 243 | }; |
| 238 | 244 | ||
| @@ -337,42 +343,102 @@ static void intel_pstate_sysfs_expose_params(void) | |||
| 337 | } | 343 | } |
| 338 | 344 | ||
| 339 | /************************** sysfs end ************************/ | 345 | /************************** sysfs end ************************/ |
| 346 | static int byt_get_min_pstate(void) | ||
| 347 | { | ||
| 348 | u64 value; | ||
| 349 | rdmsrl(BYT_RATIOS, value); | ||
| 350 | return value & 0xFF; | ||
| 351 | } | ||
| 352 | |||
| 353 | static int byt_get_max_pstate(void) | ||
| 354 | { | ||
| 355 | u64 value; | ||
| 356 | rdmsrl(BYT_RATIOS, value); | ||
| 357 | return (value >> 16) & 0xFF; | ||
| 358 | } | ||
| 340 | 359 | ||
| 341 | static int intel_pstate_min_pstate(void) | 360 | static int core_get_min_pstate(void) |
| 342 | { | 361 | { |
| 343 | u64 value; | 362 | u64 value; |
| 344 | rdmsrl(MSR_PLATFORM_INFO, value); | 363 | rdmsrl(MSR_PLATFORM_INFO, value); |
| 345 | return (value >> 40) & 0xFF; | 364 | return (value >> 40) & 0xFF; |
| 346 | } | 365 | } |
| 347 | 366 | ||
| 348 | static int intel_pstate_max_pstate(void) | 367 | static int core_get_max_pstate(void) |
| 349 | { | 368 | { |
| 350 | u64 value; | 369 | u64 value; |
| 351 | rdmsrl(MSR_PLATFORM_INFO, value); | 370 | rdmsrl(MSR_PLATFORM_INFO, value); |
| 352 | return (value >> 8) & 0xFF; | 371 | return (value >> 8) & 0xFF; |
| 353 | } | 372 | } |
| 354 | 373 | ||
| 355 | static int intel_pstate_turbo_pstate(void) | 374 | static int core_get_turbo_pstate(void) |
| 356 | { | 375 | { |
| 357 | u64 value; | 376 | u64 value; |
| 358 | int nont, ret; | 377 | int nont, ret; |
| 359 | rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value); | 378 | rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value); |
| 360 | nont = intel_pstate_max_pstate(); | 379 | nont = core_get_max_pstate(); |
| 361 | ret = ((value) & 255); | 380 | ret = ((value) & 255); |
| 362 | if (ret <= nont) | 381 | if (ret <= nont) |
| 363 | ret = nont; | 382 | ret = nont; |
| 364 | return ret; | 383 | return ret; |
| 365 | } | 384 | } |
| 366 | 385 | ||
| 386 | static void core_set_pstate(int pstate) | ||
| 387 | { | ||
| 388 | u64 val; | ||
| 389 | |||
| 390 | val = pstate << 8; | ||
| 391 | if (limits.no_turbo) | ||
| 392 | val |= (u64)1 << 32; | ||
| 393 | |||
| 394 | wrmsrl(MSR_IA32_PERF_CTL, val); | ||
| 395 | } | ||
| 396 | |||
| 397 | static struct cpu_defaults core_params = { | ||
| 398 | .pid_policy = { | ||
| 399 | .sample_rate_ms = 10, | ||
| 400 | .deadband = 0, | ||
| 401 | .setpoint = 97, | ||
| 402 | .p_gain_pct = 20, | ||
| 403 | .d_gain_pct = 0, | ||
| 404 | .i_gain_pct = 0, | ||
| 405 | }, | ||
| 406 | .funcs = { | ||
| 407 | .get_max = core_get_max_pstate, | ||
| 408 | .get_min = core_get_min_pstate, | ||
| 409 | .get_turbo = core_get_turbo_pstate, | ||
| 410 | .set = core_set_pstate, | ||
| 411 | }, | ||
| 412 | }; | ||
| 413 | |||
| 414 | static struct cpu_defaults byt_params = { | ||
| 415 | .pid_policy = { | ||
| 416 | .sample_rate_ms = 10, | ||
| 417 | .deadband = 0, | ||
| 418 | .setpoint = 97, | ||
| 419 | .p_gain_pct = 14, | ||
| 420 | .d_gain_pct = 0, | ||
| 421 | .i_gain_pct = 4, | ||
| 422 | }, | ||
| 423 | .funcs = { | ||
| 424 | .get_max = byt_get_max_pstate, | ||
| 425 | .get_min = byt_get_min_pstate, | ||
| 426 | .get_turbo = byt_get_max_pstate, | ||
| 427 | .set = core_set_pstate, | ||
| 428 | }, | ||
| 429 | }; | ||
| 430 | |||
| 431 | |||
| 367 | static void intel_pstate_get_min_max(struct cpudata *cpu, int *min, int *max) | 432 | static void intel_pstate_get_min_max(struct cpudata *cpu, int *min, int *max) |
| 368 | { | 433 | { |
| 369 | int max_perf = cpu->pstate.turbo_pstate; | 434 | int max_perf = cpu->pstate.turbo_pstate; |
| 435 | int max_perf_adj; | ||
| 370 | int min_perf; | 436 | int min_perf; |
| 371 | if (limits.no_turbo) | 437 | if (limits.no_turbo) |
| 372 | max_perf = cpu->pstate.max_pstate; | 438 | max_perf = cpu->pstate.max_pstate; |
| 373 | 439 | ||
| 374 | max_perf = fp_toint(mul_fp(int_tofp(max_perf), limits.max_perf)); | 440 | max_perf_adj = fp_toint(mul_fp(int_tofp(max_perf), limits.max_perf)); |
| 375 | *max = clamp_t(int, max_perf, | 441 | *max = clamp_t(int, max_perf_adj, |
| 376 | cpu->pstate.min_pstate, cpu->pstate.turbo_pstate); | 442 | cpu->pstate.min_pstate, cpu->pstate.turbo_pstate); |
| 377 | 443 | ||
| 378 | min_perf = fp_toint(mul_fp(int_tofp(max_perf), limits.min_perf)); | 444 | min_perf = fp_toint(mul_fp(int_tofp(max_perf), limits.min_perf)); |
| @@ -394,11 +460,8 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate) | |||
| 394 | trace_cpu_frequency(pstate * 100000, cpu->cpu); | 460 | trace_cpu_frequency(pstate * 100000, cpu->cpu); |
| 395 | 461 | ||
| 396 | cpu->pstate.current_pstate = pstate; | 462 | cpu->pstate.current_pstate = pstate; |
| 397 | if (limits.no_turbo) | ||
| 398 | wrmsrl(MSR_IA32_PERF_CTL, BIT(32) | (pstate << 8)); | ||
| 399 | else | ||
| 400 | wrmsrl(MSR_IA32_PERF_CTL, pstate << 8); | ||
| 401 | 463 | ||
| 464 | pstate_funcs.set(pstate); | ||
| 402 | } | 465 | } |
| 403 | 466 | ||
| 404 | static inline void intel_pstate_pstate_increase(struct cpudata *cpu, int steps) | 467 | static inline void intel_pstate_pstate_increase(struct cpudata *cpu, int steps) |
| @@ -420,9 +483,9 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu) | |||
| 420 | { | 483 | { |
| 421 | sprintf(cpu->name, "Intel 2nd generation core"); | 484 | sprintf(cpu->name, "Intel 2nd generation core"); |
| 422 | 485 | ||
| 423 | cpu->pstate.min_pstate = intel_pstate_min_pstate(); | 486 | cpu->pstate.min_pstate = pstate_funcs.get_min(); |
| 424 | cpu->pstate.max_pstate = intel_pstate_max_pstate(); | 487 | cpu->pstate.max_pstate = pstate_funcs.get_max(); |
| 425 | cpu->pstate.turbo_pstate = intel_pstate_turbo_pstate(); | 488 | cpu->pstate.turbo_pstate = pstate_funcs.get_turbo(); |
| 426 | 489 | ||
| 427 | /* | 490 | /* |
| 428 | * goto max pstate so we don't slow up boot if we are built-in if we are | 491 | * goto max pstate so we don't slow up boot if we are built-in if we are |
| @@ -435,8 +498,9 @@ static inline void intel_pstate_calc_busy(struct cpudata *cpu, | |||
| 435 | struct sample *sample) | 498 | struct sample *sample) |
| 436 | { | 499 | { |
| 437 | u64 core_pct; | 500 | u64 core_pct; |
| 438 | core_pct = div64_u64(sample->aperf * 100, sample->mperf); | 501 | core_pct = div64_u64(int_tofp(sample->aperf * 100), |
| 439 | sample->freq = cpu->pstate.max_pstate * core_pct * 1000; | 502 | sample->mperf); |
| 503 | sample->freq = fp_toint(cpu->pstate.max_pstate * core_pct * 1000); | ||
| 440 | 504 | ||
| 441 | sample->core_pct_busy = core_pct; | 505 | sample->core_pct_busy = core_pct; |
| 442 | } | 506 | } |
| @@ -463,27 +527,24 @@ static inline void intel_pstate_set_sample_time(struct cpudata *cpu) | |||
| 463 | { | 527 | { |
| 464 | int sample_time, delay; | 528 | int sample_time, delay; |
| 465 | 529 | ||
| 466 | sample_time = cpu->pstate_policy->sample_rate_ms; | 530 | sample_time = pid_params.sample_rate_ms; |
| 467 | delay = msecs_to_jiffies(sample_time); | 531 | delay = msecs_to_jiffies(sample_time); |
| 468 | mod_timer_pinned(&cpu->timer, jiffies + delay); | 532 | mod_timer_pinned(&cpu->timer, jiffies + delay); |
| 469 | } | 533 | } |
| 470 | 534 | ||
| 471 | static inline int intel_pstate_get_scaled_busy(struct cpudata *cpu) | 535 | static inline int32_t intel_pstate_get_scaled_busy(struct cpudata *cpu) |
| 472 | { | 536 | { |
| 473 | int32_t busy_scaled; | ||
| 474 | int32_t core_busy, max_pstate, current_pstate; | 537 | int32_t core_busy, max_pstate, current_pstate; |
| 475 | 538 | ||
| 476 | core_busy = int_tofp(cpu->samples[cpu->sample_ptr].core_pct_busy); | 539 | core_busy = cpu->samples[cpu->sample_ptr].core_pct_busy; |
| 477 | max_pstate = int_tofp(cpu->pstate.max_pstate); | 540 | max_pstate = int_tofp(cpu->pstate.max_pstate); |
| 478 | current_pstate = int_tofp(cpu->pstate.current_pstate); | 541 | current_pstate = int_tofp(cpu->pstate.current_pstate); |
| 479 | busy_scaled = mul_fp(core_busy, div_fp(max_pstate, current_pstate)); | 542 | return mul_fp(core_busy, div_fp(max_pstate, current_pstate)); |
| 480 | |||
| 481 | return fp_toint(busy_scaled); | ||
| 482 | } | 543 | } |
| 483 | 544 | ||
| 484 | static inline void intel_pstate_adjust_busy_pstate(struct cpudata *cpu) | 545 | static inline void intel_pstate_adjust_busy_pstate(struct cpudata *cpu) |
| 485 | { | 546 | { |
| 486 | int busy_scaled; | 547 | int32_t busy_scaled; |
| 487 | struct _pid *pid; | 548 | struct _pid *pid; |
| 488 | signed int ctl = 0; | 549 | signed int ctl = 0; |
| 489 | int steps; | 550 | int steps; |
| @@ -522,14 +583,15 @@ static void intel_pstate_timer_func(unsigned long __data) | |||
| 522 | { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&policy } | 583 | { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&policy } |
| 523 | 584 | ||
| 524 | static const struct x86_cpu_id intel_pstate_cpu_ids[] = { | 585 | static const struct x86_cpu_id intel_pstate_cpu_ids[] = { |
| 525 | ICPU(0x2a, default_policy), | 586 | ICPU(0x2a, core_params), |
| 526 | ICPU(0x2d, default_policy), | 587 | ICPU(0x2d, core_params), |
| 527 | ICPU(0x3a, default_policy), | 588 | ICPU(0x37, byt_params), |
| 528 | ICPU(0x3c, default_policy), | 589 | ICPU(0x3a, core_params), |
| 529 | ICPU(0x3e, default_policy), | 590 | ICPU(0x3c, core_params), |
| 530 | ICPU(0x3f, default_policy), | 591 | ICPU(0x3e, core_params), |
| 531 | ICPU(0x45, default_policy), | 592 | ICPU(0x3f, core_params), |
| 532 | ICPU(0x46, default_policy), | 593 | ICPU(0x45, core_params), |
| 594 | ICPU(0x46, core_params), | ||
| 533 | {} | 595 | {} |
| 534 | }; | 596 | }; |
| 535 | MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids); | 597 | MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids); |
| @@ -553,8 +615,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum) | |||
| 553 | intel_pstate_get_cpu_pstates(cpu); | 615 | intel_pstate_get_cpu_pstates(cpu); |
| 554 | 616 | ||
| 555 | cpu->cpu = cpunum; | 617 | cpu->cpu = cpunum; |
| 556 | cpu->pstate_policy = | 618 | |
| 557 | (struct pstate_adjust_policy *)id->driver_data; | ||
| 558 | init_timer_deferrable(&cpu->timer); | 619 | init_timer_deferrable(&cpu->timer); |
| 559 | cpu->timer.function = intel_pstate_timer_func; | 620 | cpu->timer.function = intel_pstate_timer_func; |
| 560 | cpu->timer.data = | 621 | cpu->timer.data = |
| @@ -614,9 +675,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) | |||
| 614 | 675 | ||
| 615 | static int intel_pstate_verify_policy(struct cpufreq_policy *policy) | 676 | static int intel_pstate_verify_policy(struct cpufreq_policy *policy) |
| 616 | { | 677 | { |
| 617 | cpufreq_verify_within_limits(policy, | 678 | cpufreq_verify_within_cpu_limits(policy); |
| 618 | policy->cpuinfo.min_freq, | ||
| 619 | policy->cpuinfo.max_freq); | ||
| 620 | 679 | ||
| 621 | if ((policy->policy != CPUFREQ_POLICY_POWERSAVE) && | 680 | if ((policy->policy != CPUFREQ_POLICY_POWERSAVE) && |
| 622 | (policy->policy != CPUFREQ_POLICY_PERFORMANCE)) | 681 | (policy->policy != CPUFREQ_POLICY_PERFORMANCE)) |
| @@ -637,8 +696,8 @@ static int intel_pstate_cpu_exit(struct cpufreq_policy *policy) | |||
| 637 | 696 | ||
| 638 | static int intel_pstate_cpu_init(struct cpufreq_policy *policy) | 697 | static int intel_pstate_cpu_init(struct cpufreq_policy *policy) |
| 639 | { | 698 | { |
| 640 | int rc, min_pstate, max_pstate; | ||
| 641 | struct cpudata *cpu; | 699 | struct cpudata *cpu; |
| 700 | int rc; | ||
| 642 | 701 | ||
| 643 | rc = intel_pstate_init_cpu(policy->cpu); | 702 | rc = intel_pstate_init_cpu(policy->cpu); |
| 644 | if (rc) | 703 | if (rc) |
| @@ -652,9 +711,8 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy) | |||
| 652 | else | 711 | else |
| 653 | policy->policy = CPUFREQ_POLICY_POWERSAVE; | 712 | policy->policy = CPUFREQ_POLICY_POWERSAVE; |
| 654 | 713 | ||
| 655 | intel_pstate_get_min_max(cpu, &min_pstate, &max_pstate); | 714 | policy->min = cpu->pstate.min_pstate * 100000; |
| 656 | policy->min = min_pstate * 100000; | 715 | policy->max = cpu->pstate.turbo_pstate * 100000; |
| 657 | policy->max = max_pstate * 100000; | ||
| 658 | 716 | ||
| 659 | /* cpuinfo and default policy values */ | 717 | /* cpuinfo and default policy values */ |
| 660 | policy->cpuinfo.min_freq = cpu->pstate.min_pstate * 100000; | 718 | policy->cpuinfo.min_freq = cpu->pstate.min_pstate * 100000; |
| @@ -685,9 +743,9 @@ static int intel_pstate_msrs_not_valid(void) | |||
| 685 | rdmsrl(MSR_IA32_APERF, aperf); | 743 | rdmsrl(MSR_IA32_APERF, aperf); |
| 686 | rdmsrl(MSR_IA32_MPERF, mperf); | 744 | rdmsrl(MSR_IA32_MPERF, mperf); |
| 687 | 745 | ||
| 688 | if (!intel_pstate_min_pstate() || | 746 | if (!pstate_funcs.get_max() || |
| 689 | !intel_pstate_max_pstate() || | 747 | !pstate_funcs.get_min() || |
| 690 | !intel_pstate_turbo_pstate()) | 748 | !pstate_funcs.get_turbo()) |
| 691 | return -ENODEV; | 749 | return -ENODEV; |
| 692 | 750 | ||
| 693 | rdmsrl(MSR_IA32_APERF, tmp); | 751 | rdmsrl(MSR_IA32_APERF, tmp); |
| @@ -700,10 +758,30 @@ static int intel_pstate_msrs_not_valid(void) | |||
| 700 | 758 | ||
| 701 | return 0; | 759 | return 0; |
| 702 | } | 760 | } |
| 761 | |||
| 762 | void copy_pid_params(struct pstate_adjust_policy *policy) | ||
| 763 | { | ||
| 764 | pid_params.sample_rate_ms = policy->sample_rate_ms; | ||
| 765 | pid_params.p_gain_pct = policy->p_gain_pct; | ||
| 766 | pid_params.i_gain_pct = policy->i_gain_pct; | ||
| 767 | pid_params.d_gain_pct = policy->d_gain_pct; | ||
| 768 | pid_params.deadband = policy->deadband; | ||
| 769 | pid_params.setpoint = policy->setpoint; | ||
| 770 | } | ||
| 771 | |||
| 772 | void copy_cpu_funcs(struct pstate_funcs *funcs) | ||
| 773 | { | ||
| 774 | pstate_funcs.get_max = funcs->get_max; | ||
| 775 | pstate_funcs.get_min = funcs->get_min; | ||
| 776 | pstate_funcs.get_turbo = funcs->get_turbo; | ||
| 777 | pstate_funcs.set = funcs->set; | ||
| 778 | } | ||
| 779 | |||
| 703 | static int __init intel_pstate_init(void) | 780 | static int __init intel_pstate_init(void) |
| 704 | { | 781 | { |
| 705 | int cpu, rc = 0; | 782 | int cpu, rc = 0; |
| 706 | const struct x86_cpu_id *id; | 783 | const struct x86_cpu_id *id; |
| 784 | struct cpu_defaults *cpu_info; | ||
| 707 | 785 | ||
| 708 | if (no_load) | 786 | if (no_load) |
| 709 | return -ENODEV; | 787 | return -ENODEV; |
| @@ -712,6 +790,11 @@ static int __init intel_pstate_init(void) | |||
| 712 | if (!id) | 790 | if (!id) |
| 713 | return -ENODEV; | 791 | return -ENODEV; |
| 714 | 792 | ||
| 793 | cpu_info = (struct cpu_defaults *)id->driver_data; | ||
| 794 | |||
| 795 | copy_pid_params(&cpu_info->pid_policy); | ||
| 796 | copy_cpu_funcs(&cpu_info->funcs); | ||
| 797 | |||
| 715 | if (intel_pstate_msrs_not_valid()) | 798 | if (intel_pstate_msrs_not_valid()) |
| 716 | return -ENODEV; | 799 | return -ENODEV; |
| 717 | 800 | ||
diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c index ba10658a9394..0ae4dd7e1f2d 100644 --- a/drivers/cpufreq/kirkwood-cpufreq.c +++ b/drivers/cpufreq/kirkwood-cpufreq.c | |||
| @@ -55,8 +55,8 @@ static unsigned int kirkwood_cpufreq_get_cpu_frequency(unsigned int cpu) | |||
| 55 | return kirkwood_freq_table[0].frequency; | 55 | return kirkwood_freq_table[0].frequency; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | static void kirkwood_cpufreq_set_cpu_state(struct cpufreq_policy *policy, | 58 | static int kirkwood_cpufreq_target(struct cpufreq_policy *policy, |
| 59 | unsigned int index) | 59 | unsigned int index) |
| 60 | { | 60 | { |
| 61 | struct cpufreq_freqs freqs; | 61 | struct cpufreq_freqs freqs; |
| 62 | unsigned int state = kirkwood_freq_table[index].driver_data; | 62 | unsigned int state = kirkwood_freq_table[index].driver_data; |
| @@ -100,24 +100,6 @@ static void kirkwood_cpufreq_set_cpu_state(struct cpufreq_policy *policy, | |||
| 100 | local_irq_enable(); | 100 | local_irq_enable(); |
| 101 | } | 101 | } |
| 102 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 102 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 103 | }; | ||
| 104 | |||
| 105 | static int kirkwood_cpufreq_verify(struct cpufreq_policy *policy) | ||
| 106 | { | ||
| 107 | return cpufreq_frequency_table_verify(policy, kirkwood_freq_table); | ||
| 108 | } | ||
| 109 | |||
| 110 | static int kirkwood_cpufreq_target(struct cpufreq_policy *policy, | ||
| 111 | unsigned int target_freq, | ||
| 112 | unsigned int relation) | ||
| 113 | { | ||
| 114 | unsigned int index = 0; | ||
| 115 | |||
| 116 | if (cpufreq_frequency_table_target(policy, kirkwood_freq_table, | ||
| 117 | target_freq, relation, &index)) | ||
| 118 | return -EINVAL; | ||
| 119 | |||
| 120 | kirkwood_cpufreq_set_cpu_state(policy, index); | ||
| 121 | 103 | ||
| 122 | return 0; | 104 | return 0; |
| 123 | } | 105 | } |
| @@ -125,40 +107,17 @@ static int kirkwood_cpufreq_target(struct cpufreq_policy *policy, | |||
| 125 | /* Module init and exit code */ | 107 | /* Module init and exit code */ |
| 126 | static int kirkwood_cpufreq_cpu_init(struct cpufreq_policy *policy) | 108 | static int kirkwood_cpufreq_cpu_init(struct cpufreq_policy *policy) |
| 127 | { | 109 | { |
| 128 | int result; | 110 | return cpufreq_generic_init(policy, kirkwood_freq_table, 5000); |
| 129 | |||
| 130 | /* cpuinfo and default policy values */ | ||
| 131 | policy->cpuinfo.transition_latency = 5000; /* 5uS */ | ||
| 132 | policy->cur = kirkwood_cpufreq_get_cpu_frequency(0); | ||
| 133 | |||
| 134 | result = cpufreq_frequency_table_cpuinfo(policy, kirkwood_freq_table); | ||
| 135 | if (result) | ||
| 136 | return result; | ||
| 137 | |||
| 138 | cpufreq_frequency_table_get_attr(kirkwood_freq_table, policy->cpu); | ||
| 139 | |||
| 140 | return 0; | ||
| 141 | } | ||
| 142 | |||
| 143 | static int kirkwood_cpufreq_cpu_exit(struct cpufreq_policy *policy) | ||
| 144 | { | ||
| 145 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 146 | return 0; | ||
| 147 | } | 111 | } |
| 148 | 112 | ||
| 149 | static struct freq_attr *kirkwood_cpufreq_attr[] = { | ||
| 150 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 151 | NULL, | ||
| 152 | }; | ||
| 153 | |||
| 154 | static struct cpufreq_driver kirkwood_cpufreq_driver = { | 113 | static struct cpufreq_driver kirkwood_cpufreq_driver = { |
| 155 | .get = kirkwood_cpufreq_get_cpu_frequency, | 114 | .get = kirkwood_cpufreq_get_cpu_frequency, |
| 156 | .verify = kirkwood_cpufreq_verify, | 115 | .verify = cpufreq_generic_frequency_table_verify, |
| 157 | .target = kirkwood_cpufreq_target, | 116 | .target_index = kirkwood_cpufreq_target, |
| 158 | .init = kirkwood_cpufreq_cpu_init, | 117 | .init = kirkwood_cpufreq_cpu_init, |
| 159 | .exit = kirkwood_cpufreq_cpu_exit, | 118 | .exit = cpufreq_generic_exit, |
| 160 | .name = "kirkwood-cpufreq", | 119 | .name = "kirkwood-cpufreq", |
| 161 | .attr = kirkwood_cpufreq_attr, | 120 | .attr = cpufreq_generic_attr, |
| 162 | }; | 121 | }; |
| 163 | 122 | ||
| 164 | static int kirkwood_cpufreq_probe(struct platform_device *pdev) | 123 | static int kirkwood_cpufreq_probe(struct platform_device *pdev) |
diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c index 4ada1cccb052..45bafddfd8ea 100644 --- a/drivers/cpufreq/longhaul.c +++ b/drivers/cpufreq/longhaul.c | |||
| @@ -625,28 +625,13 @@ static void longhaul_setup_voltagescaling(void) | |||
| 625 | } | 625 | } |
| 626 | 626 | ||
| 627 | 627 | ||
| 628 | static int longhaul_verify(struct cpufreq_policy *policy) | ||
| 629 | { | ||
| 630 | return cpufreq_frequency_table_verify(policy, longhaul_table); | ||
| 631 | } | ||
| 632 | |||
| 633 | |||
| 634 | static int longhaul_target(struct cpufreq_policy *policy, | 628 | static int longhaul_target(struct cpufreq_policy *policy, |
| 635 | unsigned int target_freq, unsigned int relation) | 629 | unsigned int table_index) |
| 636 | { | 630 | { |
| 637 | unsigned int table_index = 0; | ||
| 638 | unsigned int i; | 631 | unsigned int i; |
| 639 | unsigned int dir = 0; | 632 | unsigned int dir = 0; |
| 640 | u8 vid, current_vid; | 633 | u8 vid, current_vid; |
| 641 | 634 | ||
| 642 | if (cpufreq_frequency_table_target(policy, longhaul_table, target_freq, | ||
| 643 | relation, &table_index)) | ||
| 644 | return -EINVAL; | ||
| 645 | |||
| 646 | /* Don't set same frequency again */ | ||
| 647 | if (longhaul_index == table_index) | ||
| 648 | return 0; | ||
| 649 | |||
| 650 | if (!can_scale_voltage) | 635 | if (!can_scale_voltage) |
| 651 | longhaul_setstate(policy, table_index); | 636 | longhaul_setstate(policy, table_index); |
| 652 | else { | 637 | else { |
| @@ -919,36 +904,18 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy) | |||
| 919 | longhaul_setup_voltagescaling(); | 904 | longhaul_setup_voltagescaling(); |
| 920 | 905 | ||
| 921 | policy->cpuinfo.transition_latency = 200000; /* nsec */ | 906 | policy->cpuinfo.transition_latency = 200000; /* nsec */ |
| 922 | policy->cur = calc_speed(longhaul_get_cpu_mult()); | ||
| 923 | |||
| 924 | ret = cpufreq_frequency_table_cpuinfo(policy, longhaul_table); | ||
| 925 | if (ret) | ||
| 926 | return ret; | ||
| 927 | |||
| 928 | cpufreq_frequency_table_get_attr(longhaul_table, policy->cpu); | ||
| 929 | 907 | ||
| 930 | return 0; | 908 | return cpufreq_table_validate_and_show(policy, longhaul_table); |
| 931 | } | 909 | } |
| 932 | 910 | ||
| 933 | static int longhaul_cpu_exit(struct cpufreq_policy *policy) | ||
| 934 | { | ||
| 935 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 936 | return 0; | ||
| 937 | } | ||
| 938 | |||
| 939 | static struct freq_attr *longhaul_attr[] = { | ||
| 940 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 941 | NULL, | ||
| 942 | }; | ||
| 943 | |||
| 944 | static struct cpufreq_driver longhaul_driver = { | 911 | static struct cpufreq_driver longhaul_driver = { |
| 945 | .verify = longhaul_verify, | 912 | .verify = cpufreq_generic_frequency_table_verify, |
| 946 | .target = longhaul_target, | 913 | .target_index = longhaul_target, |
| 947 | .get = longhaul_get, | 914 | .get = longhaul_get, |
| 948 | .init = longhaul_cpu_init, | 915 | .init = longhaul_cpu_init, |
| 949 | .exit = longhaul_cpu_exit, | 916 | .exit = cpufreq_generic_exit, |
| 950 | .name = "longhaul", | 917 | .name = "longhaul", |
| 951 | .attr = longhaul_attr, | 918 | .attr = cpufreq_generic_attr, |
| 952 | }; | 919 | }; |
| 953 | 920 | ||
| 954 | static const struct x86_cpu_id longhaul_id[] = { | 921 | static const struct x86_cpu_id longhaul_id[] = { |
diff --git a/drivers/cpufreq/longrun.c b/drivers/cpufreq/longrun.c index 5aa031612d53..074971b12635 100644 --- a/drivers/cpufreq/longrun.c +++ b/drivers/cpufreq/longrun.c | |||
| @@ -129,9 +129,7 @@ static int longrun_verify_policy(struct cpufreq_policy *policy) | |||
| 129 | return -EINVAL; | 129 | return -EINVAL; |
| 130 | 130 | ||
| 131 | policy->cpu = 0; | 131 | policy->cpu = 0; |
| 132 | cpufreq_verify_within_limits(policy, | 132 | cpufreq_verify_within_cpu_limits(policy); |
| 133 | policy->cpuinfo.min_freq, | ||
| 134 | policy->cpuinfo.max_freq); | ||
| 135 | 133 | ||
| 136 | if ((policy->policy != CPUFREQ_POLICY_POWERSAVE) && | 134 | if ((policy->policy != CPUFREQ_POLICY_POWERSAVE) && |
| 137 | (policy->policy != CPUFREQ_POLICY_PERFORMANCE)) | 135 | (policy->policy != CPUFREQ_POLICY_PERFORMANCE)) |
diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c index 7bc3c44d34e2..41a8e2cdf940 100644 --- a/drivers/cpufreq/loongson2_cpufreq.c +++ b/drivers/cpufreq/loongson2_cpufreq.c | |||
| @@ -53,11 +53,9 @@ static unsigned int loongson2_cpufreq_get(unsigned int cpu) | |||
| 53 | * Here we notify other drivers of the proposed change and the final change. | 53 | * Here we notify other drivers of the proposed change and the final change. |
| 54 | */ | 54 | */ |
| 55 | static int loongson2_cpufreq_target(struct cpufreq_policy *policy, | 55 | static int loongson2_cpufreq_target(struct cpufreq_policy *policy, |
| 56 | unsigned int target_freq, | 56 | unsigned int index) |
| 57 | unsigned int relation) | ||
| 58 | { | 57 | { |
| 59 | unsigned int cpu = policy->cpu; | 58 | unsigned int cpu = policy->cpu; |
| 60 | unsigned int newstate = 0; | ||
| 61 | cpumask_t cpus_allowed; | 59 | cpumask_t cpus_allowed; |
| 62 | struct cpufreq_freqs freqs; | 60 | struct cpufreq_freqs freqs; |
| 63 | unsigned int freq; | 61 | unsigned int freq; |
| @@ -65,26 +63,17 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy, | |||
| 65 | cpus_allowed = current->cpus_allowed; | 63 | cpus_allowed = current->cpus_allowed; |
| 66 | set_cpus_allowed_ptr(current, cpumask_of(cpu)); | 64 | set_cpus_allowed_ptr(current, cpumask_of(cpu)); |
| 67 | 65 | ||
| 68 | if (cpufreq_frequency_table_target | ||
| 69 | (policy, &loongson2_clockmod_table[0], target_freq, relation, | ||
| 70 | &newstate)) | ||
| 71 | return -EINVAL; | ||
| 72 | |||
| 73 | freq = | 66 | freq = |
| 74 | ((cpu_clock_freq / 1000) * | 67 | ((cpu_clock_freq / 1000) * |
| 75 | loongson2_clockmod_table[newstate].driver_data) / 8; | 68 | loongson2_clockmod_table[index].driver_data) / 8; |
| 76 | if (freq < policy->min || freq > policy->max) | ||
| 77 | return -EINVAL; | ||
| 78 | 69 | ||
| 79 | pr_debug("cpufreq: requested frequency %u Hz\n", target_freq * 1000); | 70 | pr_debug("cpufreq: requested frequency %u Hz\n", |
| 71 | loongson2_clockmod_table[index].frequency * 1000); | ||
| 80 | 72 | ||
| 81 | freqs.old = loongson2_cpufreq_get(cpu); | 73 | freqs.old = loongson2_cpufreq_get(cpu); |
| 82 | freqs.new = freq; | 74 | freqs.new = freq; |
| 83 | freqs.flags = 0; | 75 | freqs.flags = 0; |
| 84 | 76 | ||
| 85 | if (freqs.new == freqs.old) | ||
| 86 | return 0; | ||
| 87 | |||
| 88 | /* notifiers */ | 77 | /* notifiers */ |
| 89 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 78 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 90 | 79 | ||
| @@ -131,40 +120,24 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
| 131 | return ret; | 120 | return ret; |
| 132 | } | 121 | } |
| 133 | 122 | ||
| 134 | policy->cur = loongson2_cpufreq_get(policy->cpu); | 123 | return cpufreq_generic_init(policy, &loongson2_clockmod_table[0], 0); |
| 135 | |||
| 136 | cpufreq_frequency_table_get_attr(&loongson2_clockmod_table[0], | ||
| 137 | policy->cpu); | ||
| 138 | |||
| 139 | return cpufreq_frequency_table_cpuinfo(policy, | ||
| 140 | &loongson2_clockmod_table[0]); | ||
| 141 | } | ||
| 142 | |||
| 143 | static int loongson2_cpufreq_verify(struct cpufreq_policy *policy) | ||
| 144 | { | ||
| 145 | return cpufreq_frequency_table_verify(policy, | ||
| 146 | &loongson2_clockmod_table[0]); | ||
| 147 | } | 124 | } |
| 148 | 125 | ||
| 149 | static int loongson2_cpufreq_exit(struct cpufreq_policy *policy) | 126 | static int loongson2_cpufreq_exit(struct cpufreq_policy *policy) |
| 150 | { | 127 | { |
| 128 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 151 | clk_put(cpuclk); | 129 | clk_put(cpuclk); |
| 152 | return 0; | 130 | return 0; |
| 153 | } | 131 | } |
| 154 | 132 | ||
| 155 | static struct freq_attr *loongson2_table_attr[] = { | ||
| 156 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 157 | NULL, | ||
| 158 | }; | ||
| 159 | |||
| 160 | static struct cpufreq_driver loongson2_cpufreq_driver = { | 133 | static struct cpufreq_driver loongson2_cpufreq_driver = { |
| 161 | .name = "loongson2", | 134 | .name = "loongson2", |
| 162 | .init = loongson2_cpufreq_cpu_init, | 135 | .init = loongson2_cpufreq_cpu_init, |
| 163 | .verify = loongson2_cpufreq_verify, | 136 | .verify = cpufreq_generic_frequency_table_verify, |
| 164 | .target = loongson2_cpufreq_target, | 137 | .target_index = loongson2_cpufreq_target, |
| 165 | .get = loongson2_cpufreq_get, | 138 | .get = loongson2_cpufreq_get, |
| 166 | .exit = loongson2_cpufreq_exit, | 139 | .exit = loongson2_cpufreq_exit, |
| 167 | .attr = loongson2_table_attr, | 140 | .attr = cpufreq_generic_attr, |
| 168 | }; | 141 | }; |
| 169 | 142 | ||
| 170 | static struct platform_device_id platform_device_ids[] = { | 143 | static struct platform_device_id platform_device_ids[] = { |
diff --git a/drivers/cpufreq/maple-cpufreq.c b/drivers/cpufreq/maple-cpufreq.c index 6168d77b296d..4e2da0874bfb 100644 --- a/drivers/cpufreq/maple-cpufreq.c +++ b/drivers/cpufreq/maple-cpufreq.c | |||
| @@ -64,11 +64,6 @@ static struct cpufreq_frequency_table maple_cpu_freqs[] = { | |||
| 64 | {0, CPUFREQ_TABLE_END}, | 64 | {0, CPUFREQ_TABLE_END}, |
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| 67 | static struct freq_attr *maple_cpu_freqs_attr[] = { | ||
| 68 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 69 | NULL, | ||
| 70 | }; | ||
| 71 | |||
| 72 | /* Power mode data is an array of the 32 bits PCR values to use for | 67 | /* Power mode data is an array of the 32 bits PCR values to use for |
| 73 | * the various frequencies, retrieved from the device-tree | 68 | * the various frequencies, retrieved from the device-tree |
| 74 | */ | 69 | */ |
| @@ -135,32 +130,19 @@ static int maple_scom_query_freq(void) | |||
| 135 | * Common interface to the cpufreq core | 130 | * Common interface to the cpufreq core |
| 136 | */ | 131 | */ |
| 137 | 132 | ||
| 138 | static int maple_cpufreq_verify(struct cpufreq_policy *policy) | ||
| 139 | { | ||
| 140 | return cpufreq_frequency_table_verify(policy, maple_cpu_freqs); | ||
| 141 | } | ||
| 142 | |||
| 143 | static int maple_cpufreq_target(struct cpufreq_policy *policy, | 133 | static int maple_cpufreq_target(struct cpufreq_policy *policy, |
| 144 | unsigned int target_freq, unsigned int relation) | 134 | unsigned int index) |
| 145 | { | 135 | { |
| 146 | unsigned int newstate = 0; | ||
| 147 | struct cpufreq_freqs freqs; | 136 | struct cpufreq_freqs freqs; |
| 148 | int rc; | 137 | int rc; |
| 149 | 138 | ||
| 150 | if (cpufreq_frequency_table_target(policy, maple_cpu_freqs, | ||
| 151 | target_freq, relation, &newstate)) | ||
| 152 | return -EINVAL; | ||
| 153 | |||
| 154 | if (maple_pmode_cur == newstate) | ||
| 155 | return 0; | ||
| 156 | |||
| 157 | mutex_lock(&maple_switch_mutex); | 139 | mutex_lock(&maple_switch_mutex); |
| 158 | 140 | ||
| 159 | freqs.old = maple_cpu_freqs[maple_pmode_cur].frequency; | 141 | freqs.old = maple_cpu_freqs[maple_pmode_cur].frequency; |
| 160 | freqs.new = maple_cpu_freqs[newstate].frequency; | 142 | freqs.new = maple_cpu_freqs[index].frequency; |
| 161 | 143 | ||
| 162 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 144 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 163 | rc = maple_scom_switch_freq(newstate); | 145 | rc = maple_scom_switch_freq(index); |
| 164 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 146 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 165 | 147 | ||
| 166 | mutex_unlock(&maple_switch_mutex); | 148 | mutex_unlock(&maple_switch_mutex); |
| @@ -175,27 +157,17 @@ static unsigned int maple_cpufreq_get_speed(unsigned int cpu) | |||
| 175 | 157 | ||
| 176 | static int maple_cpufreq_cpu_init(struct cpufreq_policy *policy) | 158 | static int maple_cpufreq_cpu_init(struct cpufreq_policy *policy) |
| 177 | { | 159 | { |
| 178 | policy->cpuinfo.transition_latency = 12000; | 160 | return cpufreq_generic_init(policy, maple_cpu_freqs, 12000); |
| 179 | policy->cur = maple_cpu_freqs[maple_scom_query_freq()].frequency; | ||
| 180 | /* secondary CPUs are tied to the primary one by the | ||
| 181 | * cpufreq core if in the secondary policy we tell it that | ||
| 182 | * it actually must be one policy together with all others. */ | ||
| 183 | cpumask_setall(policy->cpus); | ||
| 184 | cpufreq_frequency_table_get_attr(maple_cpu_freqs, policy->cpu); | ||
| 185 | |||
| 186 | return cpufreq_frequency_table_cpuinfo(policy, | ||
| 187 | maple_cpu_freqs); | ||
| 188 | } | 161 | } |
| 189 | 162 | ||
| 190 | |||
| 191 | static struct cpufreq_driver maple_cpufreq_driver = { | 163 | static struct cpufreq_driver maple_cpufreq_driver = { |
| 192 | .name = "maple", | 164 | .name = "maple", |
| 193 | .flags = CPUFREQ_CONST_LOOPS, | 165 | .flags = CPUFREQ_CONST_LOOPS, |
| 194 | .init = maple_cpufreq_cpu_init, | 166 | .init = maple_cpufreq_cpu_init, |
| 195 | .verify = maple_cpufreq_verify, | 167 | .verify = cpufreq_generic_frequency_table_verify, |
| 196 | .target = maple_cpufreq_target, | 168 | .target_index = maple_cpufreq_target, |
| 197 | .get = maple_cpufreq_get_speed, | 169 | .get = maple_cpufreq_get_speed, |
| 198 | .attr = maple_cpu_freqs_attr, | 170 | .attr = cpufreq_generic_attr, |
| 199 | }; | 171 | }; |
| 200 | 172 | ||
| 201 | static int __init maple_cpufreq_init(void) | 173 | static int __init maple_cpufreq_init(void) |
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c index f31fcfcad514..b5512712298f 100644 --- a/drivers/cpufreq/omap-cpufreq.c +++ b/drivers/cpufreq/omap-cpufreq.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <linux/err.h> | 22 | #include <linux/err.h> |
| 23 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
| 24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
| 25 | #include <linux/opp.h> | 25 | #include <linux/pm_opp.h> |
| 26 | #include <linux/cpu.h> | 26 | #include <linux/cpu.h> |
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| @@ -40,13 +40,6 @@ static struct clk *mpu_clk; | |||
| 40 | static struct device *mpu_dev; | 40 | static struct device *mpu_dev; |
| 41 | static struct regulator *mpu_reg; | 41 | static struct regulator *mpu_reg; |
| 42 | 42 | ||
| 43 | static int omap_verify_speed(struct cpufreq_policy *policy) | ||
| 44 | { | ||
| 45 | if (!freq_table) | ||
| 46 | return -EINVAL; | ||
| 47 | return cpufreq_frequency_table_verify(policy, freq_table); | ||
| 48 | } | ||
| 49 | |||
| 50 | static unsigned int omap_getspeed(unsigned int cpu) | 43 | static unsigned int omap_getspeed(unsigned int cpu) |
| 51 | { | 44 | { |
| 52 | unsigned long rate; | 45 | unsigned long rate; |
| @@ -58,40 +51,15 @@ static unsigned int omap_getspeed(unsigned int cpu) | |||
| 58 | return rate; | 51 | return rate; |
| 59 | } | 52 | } |
| 60 | 53 | ||
| 61 | static int omap_target(struct cpufreq_policy *policy, | 54 | static int omap_target(struct cpufreq_policy *policy, unsigned int index) |
| 62 | unsigned int target_freq, | ||
| 63 | unsigned int relation) | ||
| 64 | { | 55 | { |
| 65 | unsigned int i; | ||
| 66 | int r, ret = 0; | 56 | int r, ret = 0; |
| 67 | struct cpufreq_freqs freqs; | 57 | struct cpufreq_freqs freqs; |
| 68 | struct opp *opp; | 58 | struct dev_pm_opp *opp; |
| 69 | unsigned long freq, volt = 0, volt_old = 0, tol = 0; | 59 | unsigned long freq, volt = 0, volt_old = 0, tol = 0; |
| 70 | 60 | ||
| 71 | if (!freq_table) { | ||
| 72 | dev_err(mpu_dev, "%s: cpu%d: no freq table!\n", __func__, | ||
| 73 | policy->cpu); | ||
| 74 | return -EINVAL; | ||
| 75 | } | ||
| 76 | |||
| 77 | ret = cpufreq_frequency_table_target(policy, freq_table, target_freq, | ||
| 78 | relation, &i); | ||
| 79 | if (ret) { | ||
| 80 | dev_dbg(mpu_dev, "%s: cpu%d: no freq match for %d(ret=%d)\n", | ||
| 81 | __func__, policy->cpu, target_freq, ret); | ||
| 82 | return ret; | ||
| 83 | } | ||
| 84 | freqs.new = freq_table[i].frequency; | ||
| 85 | if (!freqs.new) { | ||
| 86 | dev_err(mpu_dev, "%s: cpu%d: no match for freq %d\n", __func__, | ||
| 87 | policy->cpu, target_freq); | ||
| 88 | return -EINVAL; | ||
| 89 | } | ||
| 90 | |||
| 91 | freqs.old = omap_getspeed(policy->cpu); | 61 | freqs.old = omap_getspeed(policy->cpu); |
| 92 | 62 | freqs.new = freq_table[index].frequency; | |
| 93 | if (freqs.old == freqs.new && policy->cur == freqs.new) | ||
| 94 | return ret; | ||
| 95 | 63 | ||
| 96 | freq = freqs.new * 1000; | 64 | freq = freqs.new * 1000; |
| 97 | ret = clk_round_rate(mpu_clk, freq); | 65 | ret = clk_round_rate(mpu_clk, freq); |
| @@ -105,14 +73,14 @@ static int omap_target(struct cpufreq_policy *policy, | |||
| 105 | 73 | ||
| 106 | if (mpu_reg) { | 74 | if (mpu_reg) { |
| 107 | rcu_read_lock(); | 75 | rcu_read_lock(); |
| 108 | opp = opp_find_freq_ceil(mpu_dev, &freq); | 76 | opp = dev_pm_opp_find_freq_ceil(mpu_dev, &freq); |
| 109 | if (IS_ERR(opp)) { | 77 | if (IS_ERR(opp)) { |
| 110 | rcu_read_unlock(); | 78 | rcu_read_unlock(); |
| 111 | dev_err(mpu_dev, "%s: unable to find MPU OPP for %d\n", | 79 | dev_err(mpu_dev, "%s: unable to find MPU OPP for %d\n", |
| 112 | __func__, freqs.new); | 80 | __func__, freqs.new); |
| 113 | return -EINVAL; | 81 | return -EINVAL; |
| 114 | } | 82 | } |
| 115 | volt = opp_get_voltage(opp); | 83 | volt = dev_pm_opp_get_voltage(opp); |
| 116 | rcu_read_unlock(); | 84 | rcu_read_unlock(); |
| 117 | tol = volt * OPP_TOLERANCE / 100; | 85 | tol = volt * OPP_TOLERANCE / 100; |
| 118 | volt_old = regulator_get_voltage(mpu_reg); | 86 | volt_old = regulator_get_voltage(mpu_reg); |
| @@ -162,86 +130,57 @@ done: | |||
| 162 | static inline void freq_table_free(void) | 130 | static inline void freq_table_free(void) |
| 163 | { | 131 | { |
| 164 | if (atomic_dec_and_test(&freq_table_users)) | 132 | if (atomic_dec_and_test(&freq_table_users)) |
| 165 | opp_free_cpufreq_table(mpu_dev, &freq_table); | 133 | dev_pm_opp_free_cpufreq_table(mpu_dev, &freq_table); |
| 166 | } | 134 | } |
| 167 | 135 | ||
| 168 | static int omap_cpu_init(struct cpufreq_policy *policy) | 136 | static int omap_cpu_init(struct cpufreq_policy *policy) |
| 169 | { | 137 | { |
| 170 | int result = 0; | 138 | int result; |
| 171 | 139 | ||
| 172 | mpu_clk = clk_get(NULL, "cpufreq_ck"); | 140 | mpu_clk = clk_get(NULL, "cpufreq_ck"); |
| 173 | if (IS_ERR(mpu_clk)) | 141 | if (IS_ERR(mpu_clk)) |
| 174 | return PTR_ERR(mpu_clk); | 142 | return PTR_ERR(mpu_clk); |
| 175 | 143 | ||
| 176 | if (policy->cpu >= NR_CPUS) { | 144 | if (!freq_table) { |
| 177 | result = -EINVAL; | 145 | result = dev_pm_opp_init_cpufreq_table(mpu_dev, &freq_table); |
| 178 | goto fail_ck; | 146 | if (result) { |
| 179 | } | 147 | dev_err(mpu_dev, |
| 180 | 148 | "%s: cpu%d: failed creating freq table[%d]\n", | |
| 181 | policy->cur = omap_getspeed(policy->cpu); | ||
| 182 | |||
| 183 | if (!freq_table) | ||
| 184 | result = opp_init_cpufreq_table(mpu_dev, &freq_table); | ||
| 185 | |||
| 186 | if (result) { | ||
| 187 | dev_err(mpu_dev, "%s: cpu%d: failed creating freq table[%d]\n", | ||
| 188 | __func__, policy->cpu, result); | 149 | __func__, policy->cpu, result); |
| 189 | goto fail_ck; | 150 | goto fail; |
| 151 | } | ||
| 190 | } | 152 | } |
| 191 | 153 | ||
| 192 | atomic_inc_return(&freq_table_users); | 154 | atomic_inc_return(&freq_table_users); |
| 193 | 155 | ||
| 194 | result = cpufreq_frequency_table_cpuinfo(policy, freq_table); | ||
| 195 | if (result) | ||
| 196 | goto fail_table; | ||
| 197 | |||
| 198 | cpufreq_frequency_table_get_attr(freq_table, policy->cpu); | ||
| 199 | |||
| 200 | policy->cur = omap_getspeed(policy->cpu); | ||
| 201 | |||
| 202 | /* | ||
| 203 | * On OMAP SMP configuartion, both processors share the voltage | ||
| 204 | * and clock. So both CPUs needs to be scaled together and hence | ||
| 205 | * needs software co-ordination. Use cpufreq affected_cpus | ||
| 206 | * interface to handle this scenario. Additional is_smp() check | ||
| 207 | * is to keep SMP_ON_UP build working. | ||
| 208 | */ | ||
| 209 | if (is_smp()) | ||
| 210 | cpumask_setall(policy->cpus); | ||
| 211 | |||
| 212 | /* FIXME: what's the actual transition time? */ | 156 | /* FIXME: what's the actual transition time? */ |
| 213 | policy->cpuinfo.transition_latency = 300 * 1000; | 157 | result = cpufreq_generic_init(policy, freq_table, 300 * 1000); |
| 214 | 158 | if (!result) | |
| 215 | return 0; | 159 | return 0; |
| 216 | 160 | ||
| 217 | fail_table: | ||
| 218 | freq_table_free(); | 161 | freq_table_free(); |
| 219 | fail_ck: | 162 | fail: |
| 220 | clk_put(mpu_clk); | 163 | clk_put(mpu_clk); |
| 221 | return result; | 164 | return result; |
| 222 | } | 165 | } |
| 223 | 166 | ||
| 224 | static int omap_cpu_exit(struct cpufreq_policy *policy) | 167 | static int omap_cpu_exit(struct cpufreq_policy *policy) |
| 225 | { | 168 | { |
| 169 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 226 | freq_table_free(); | 170 | freq_table_free(); |
| 227 | clk_put(mpu_clk); | 171 | clk_put(mpu_clk); |
| 228 | return 0; | 172 | return 0; |
| 229 | } | 173 | } |
| 230 | 174 | ||
| 231 | static struct freq_attr *omap_cpufreq_attr[] = { | ||
| 232 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 233 | NULL, | ||
| 234 | }; | ||
| 235 | |||
| 236 | static struct cpufreq_driver omap_driver = { | 175 | static struct cpufreq_driver omap_driver = { |
| 237 | .flags = CPUFREQ_STICKY, | 176 | .flags = CPUFREQ_STICKY, |
| 238 | .verify = omap_verify_speed, | 177 | .verify = cpufreq_generic_frequency_table_verify, |
| 239 | .target = omap_target, | 178 | .target_index = omap_target, |
| 240 | .get = omap_getspeed, | 179 | .get = omap_getspeed, |
| 241 | .init = omap_cpu_init, | 180 | .init = omap_cpu_init, |
| 242 | .exit = omap_cpu_exit, | 181 | .exit = omap_cpu_exit, |
| 243 | .name = "omap", | 182 | .name = "omap", |
| 244 | .attr = omap_cpufreq_attr, | 183 | .attr = cpufreq_generic_attr, |
| 245 | }; | 184 | }; |
| 246 | 185 | ||
| 247 | static int omap_cpufreq_probe(struct platform_device *pdev) | 186 | static int omap_cpufreq_probe(struct platform_device *pdev) |
diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c index 2f0a2a65c37f..3c23053afdfd 100644 --- a/drivers/cpufreq/p4-clockmod.c +++ b/drivers/cpufreq/p4-clockmod.c | |||
| @@ -105,23 +105,13 @@ static struct cpufreq_frequency_table p4clockmod_table[] = { | |||
| 105 | }; | 105 | }; |
| 106 | 106 | ||
| 107 | 107 | ||
| 108 | static int cpufreq_p4_target(struct cpufreq_policy *policy, | 108 | static int cpufreq_p4_target(struct cpufreq_policy *policy, unsigned int index) |
| 109 | unsigned int target_freq, | ||
| 110 | unsigned int relation) | ||
| 111 | { | 109 | { |
| 112 | unsigned int newstate = DC_RESV; | ||
| 113 | struct cpufreq_freqs freqs; | 110 | struct cpufreq_freqs freqs; |
| 114 | int i; | 111 | int i; |
| 115 | 112 | ||
| 116 | if (cpufreq_frequency_table_target(policy, &p4clockmod_table[0], | ||
| 117 | target_freq, relation, &newstate)) | ||
| 118 | return -EINVAL; | ||
| 119 | |||
| 120 | freqs.old = cpufreq_p4_get(policy->cpu); | 113 | freqs.old = cpufreq_p4_get(policy->cpu); |
| 121 | freqs.new = stock_freq * p4clockmod_table[newstate].driver_data / 8; | 114 | freqs.new = stock_freq * p4clockmod_table[index].driver_data / 8; |
| 122 | |||
| 123 | if (freqs.new == freqs.old) | ||
| 124 | return 0; | ||
| 125 | 115 | ||
| 126 | /* notifiers */ | 116 | /* notifiers */ |
| 127 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 117 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| @@ -131,7 +121,7 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy, | |||
| 131 | * Developer's Manual, Volume 3 | 121 | * Developer's Manual, Volume 3 |
| 132 | */ | 122 | */ |
| 133 | for_each_cpu(i, policy->cpus) | 123 | for_each_cpu(i, policy->cpus) |
| 134 | cpufreq_p4_setdc(i, p4clockmod_table[newstate].driver_data); | 124 | cpufreq_p4_setdc(i, p4clockmod_table[index].driver_data); |
| 135 | 125 | ||
| 136 | /* notifiers */ | 126 | /* notifiers */ |
| 137 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 127 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| @@ -140,12 +130,6 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy, | |||
| 140 | } | 130 | } |
| 141 | 131 | ||
| 142 | 132 | ||
| 143 | static int cpufreq_p4_verify(struct cpufreq_policy *policy) | ||
| 144 | { | ||
| 145 | return cpufreq_frequency_table_verify(policy, &p4clockmod_table[0]); | ||
| 146 | } | ||
| 147 | |||
| 148 | |||
| 149 | static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c) | 133 | static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c) |
| 150 | { | 134 | { |
| 151 | if (c->x86 == 0x06) { | 135 | if (c->x86 == 0x06) { |
| @@ -230,25 +214,17 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy) | |||
| 230 | else | 214 | else |
| 231 | p4clockmod_table[i].frequency = (stock_freq * i)/8; | 215 | p4clockmod_table[i].frequency = (stock_freq * i)/8; |
| 232 | } | 216 | } |
| 233 | cpufreq_frequency_table_get_attr(p4clockmod_table, policy->cpu); | ||
| 234 | 217 | ||
| 235 | /* cpuinfo and default policy values */ | 218 | /* cpuinfo and default policy values */ |
| 236 | 219 | ||
| 237 | /* the transition latency is set to be 1 higher than the maximum | 220 | /* the transition latency is set to be 1 higher than the maximum |
| 238 | * transition latency of the ondemand governor */ | 221 | * transition latency of the ondemand governor */ |
| 239 | policy->cpuinfo.transition_latency = 10000001; | 222 | policy->cpuinfo.transition_latency = 10000001; |
| 240 | policy->cur = stock_freq; | ||
| 241 | 223 | ||
| 242 | return cpufreq_frequency_table_cpuinfo(policy, &p4clockmod_table[0]); | 224 | return cpufreq_table_validate_and_show(policy, &p4clockmod_table[0]); |
| 243 | } | 225 | } |
| 244 | 226 | ||
| 245 | 227 | ||
| 246 | static int cpufreq_p4_cpu_exit(struct cpufreq_policy *policy) | ||
| 247 | { | ||
| 248 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 249 | return 0; | ||
| 250 | } | ||
| 251 | |||
| 252 | static unsigned int cpufreq_p4_get(unsigned int cpu) | 228 | static unsigned int cpufreq_p4_get(unsigned int cpu) |
| 253 | { | 229 | { |
| 254 | u32 l, h; | 230 | u32 l, h; |
| @@ -267,19 +243,14 @@ static unsigned int cpufreq_p4_get(unsigned int cpu) | |||
| 267 | return stock_freq; | 243 | return stock_freq; |
| 268 | } | 244 | } |
| 269 | 245 | ||
| 270 | static struct freq_attr *p4clockmod_attr[] = { | ||
| 271 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 272 | NULL, | ||
| 273 | }; | ||
| 274 | |||
| 275 | static struct cpufreq_driver p4clockmod_driver = { | 246 | static struct cpufreq_driver p4clockmod_driver = { |
| 276 | .verify = cpufreq_p4_verify, | 247 | .verify = cpufreq_generic_frequency_table_verify, |
| 277 | .target = cpufreq_p4_target, | 248 | .target_index = cpufreq_p4_target, |
| 278 | .init = cpufreq_p4_cpu_init, | 249 | .init = cpufreq_p4_cpu_init, |
| 279 | .exit = cpufreq_p4_cpu_exit, | 250 | .exit = cpufreq_generic_exit, |
| 280 | .get = cpufreq_p4_get, | 251 | .get = cpufreq_p4_get, |
| 281 | .name = "p4-clockmod", | 252 | .name = "p4-clockmod", |
| 282 | .attr = p4clockmod_attr, | 253 | .attr = cpufreq_generic_attr, |
| 283 | }; | 254 | }; |
| 284 | 255 | ||
| 285 | static const struct x86_cpu_id cpufreq_p4_id[] = { | 256 | static const struct x86_cpu_id cpufreq_p4_id[] = { |
diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c index 534e43a60d1f..17424ddc7f67 100644 --- a/drivers/cpufreq/pasemi-cpufreq.c +++ b/drivers/cpufreq/pasemi-cpufreq.c | |||
| @@ -69,11 +69,6 @@ static struct cpufreq_frequency_table pas_freqs[] = { | |||
| 69 | {0, CPUFREQ_TABLE_END}, | 69 | {0, CPUFREQ_TABLE_END}, |
| 70 | }; | 70 | }; |
| 71 | 71 | ||
| 72 | static struct freq_attr *pas_cpu_freqs_attr[] = { | ||
| 73 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 74 | NULL, | ||
| 75 | }; | ||
| 76 | |||
| 77 | /* | 72 | /* |
| 78 | * hardware specific functions | 73 | * hardware specific functions |
| 79 | */ | 74 | */ |
| @@ -209,22 +204,13 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
| 209 | pr_debug("%d: %d\n", i, pas_freqs[i].frequency); | 204 | pr_debug("%d: %d\n", i, pas_freqs[i].frequency); |
| 210 | } | 205 | } |
| 211 | 206 | ||
| 212 | policy->cpuinfo.transition_latency = get_gizmo_latency(); | ||
| 213 | |||
| 214 | cur_astate = get_cur_astate(policy->cpu); | 207 | cur_astate = get_cur_astate(policy->cpu); |
| 215 | pr_debug("current astate is at %d\n",cur_astate); | 208 | pr_debug("current astate is at %d\n",cur_astate); |
| 216 | 209 | ||
| 217 | policy->cur = pas_freqs[cur_astate].frequency; | 210 | policy->cur = pas_freqs[cur_astate].frequency; |
| 218 | cpumask_copy(policy->cpus, cpu_online_mask); | ||
| 219 | |||
| 220 | ppc_proc_freq = policy->cur * 1000ul; | 211 | ppc_proc_freq = policy->cur * 1000ul; |
| 221 | 212 | ||
| 222 | cpufreq_frequency_table_get_attr(pas_freqs, policy->cpu); | 213 | return cpufreq_generic_init(policy, pas_freqs, get_gizmo_latency()); |
| 223 | |||
| 224 | /* this ensures that policy->cpuinfo_min and policy->cpuinfo_max | ||
| 225 | * are set correctly | ||
| 226 | */ | ||
| 227 | return cpufreq_frequency_table_cpuinfo(policy, pas_freqs); | ||
| 228 | 214 | ||
| 229 | out_unmap_sdcpwr: | 215 | out_unmap_sdcpwr: |
| 230 | iounmap(sdcpwr_mapbase); | 216 | iounmap(sdcpwr_mapbase); |
| @@ -253,25 +239,12 @@ static int pas_cpufreq_cpu_exit(struct cpufreq_policy *policy) | |||
| 253 | return 0; | 239 | return 0; |
| 254 | } | 240 | } |
| 255 | 241 | ||
| 256 | static int pas_cpufreq_verify(struct cpufreq_policy *policy) | ||
| 257 | { | ||
| 258 | return cpufreq_frequency_table_verify(policy, pas_freqs); | ||
| 259 | } | ||
| 260 | |||
| 261 | static int pas_cpufreq_target(struct cpufreq_policy *policy, | 242 | static int pas_cpufreq_target(struct cpufreq_policy *policy, |
| 262 | unsigned int target_freq, | 243 | unsigned int pas_astate_new) |
| 263 | unsigned int relation) | ||
| 264 | { | 244 | { |
| 265 | struct cpufreq_freqs freqs; | 245 | struct cpufreq_freqs freqs; |
| 266 | int pas_astate_new; | ||
| 267 | int i; | 246 | int i; |
| 268 | 247 | ||
| 269 | cpufreq_frequency_table_target(policy, | ||
| 270 | pas_freqs, | ||
| 271 | target_freq, | ||
| 272 | relation, | ||
| 273 | &pas_astate_new); | ||
| 274 | |||
| 275 | freqs.old = policy->cur; | 248 | freqs.old = policy->cur; |
| 276 | freqs.new = pas_freqs[pas_astate_new].frequency; | 249 | freqs.new = pas_freqs[pas_astate_new].frequency; |
| 277 | 250 | ||
| @@ -300,9 +273,9 @@ static struct cpufreq_driver pas_cpufreq_driver = { | |||
| 300 | .flags = CPUFREQ_CONST_LOOPS, | 273 | .flags = CPUFREQ_CONST_LOOPS, |
| 301 | .init = pas_cpufreq_cpu_init, | 274 | .init = pas_cpufreq_cpu_init, |
| 302 | .exit = pas_cpufreq_cpu_exit, | 275 | .exit = pas_cpufreq_cpu_exit, |
| 303 | .verify = pas_cpufreq_verify, | 276 | .verify = cpufreq_generic_frequency_table_verify, |
| 304 | .target = pas_cpufreq_target, | 277 | .target_index = pas_cpufreq_target, |
| 305 | .attr = pas_cpu_freqs_attr, | 278 | .attr = cpufreq_generic_attr, |
| 306 | }; | 279 | }; |
| 307 | 280 | ||
| 308 | /* | 281 | /* |
diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c index d81c4e5ea0ad..e2b4f40ff69a 100644 --- a/drivers/cpufreq/pcc-cpufreq.c +++ b/drivers/cpufreq/pcc-cpufreq.c | |||
| @@ -111,8 +111,7 @@ static struct pcc_cpu __percpu *pcc_cpu_info; | |||
| 111 | 111 | ||
| 112 | static int pcc_cpufreq_verify(struct cpufreq_policy *policy) | 112 | static int pcc_cpufreq_verify(struct cpufreq_policy *policy) |
| 113 | { | 113 | { |
| 114 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, | 114 | cpufreq_verify_within_cpu_limits(policy); |
| 115 | policy->cpuinfo.max_freq); | ||
| 116 | return 0; | 115 | return 0; |
| 117 | } | 116 | } |
| 118 | 117 | ||
| @@ -396,15 +395,14 @@ static int __init pcc_cpufreq_probe(void) | |||
| 396 | struct pcc_memory_resource *mem_resource; | 395 | struct pcc_memory_resource *mem_resource; |
| 397 | struct pcc_register_resource *reg_resource; | 396 | struct pcc_register_resource *reg_resource; |
| 398 | union acpi_object *out_obj, *member; | 397 | union acpi_object *out_obj, *member; |
| 399 | acpi_handle handle, osc_handle, pcch_handle; | 398 | acpi_handle handle, osc_handle; |
| 400 | int ret = 0; | 399 | int ret = 0; |
| 401 | 400 | ||
| 402 | status = acpi_get_handle(NULL, "\\_SB", &handle); | 401 | status = acpi_get_handle(NULL, "\\_SB", &handle); |
| 403 | if (ACPI_FAILURE(status)) | 402 | if (ACPI_FAILURE(status)) |
| 404 | return -ENODEV; | 403 | return -ENODEV; |
| 405 | 404 | ||
| 406 | status = acpi_get_handle(handle, "PCCH", &pcch_handle); | 405 | if (!acpi_has_method(handle, "PCCH")) |
| 407 | if (ACPI_FAILURE(status)) | ||
| 408 | return -ENODEV; | 406 | return -ENODEV; |
| 409 | 407 | ||
| 410 | status = acpi_get_handle(handle, "_OSC", &osc_handle); | 408 | status = acpi_get_handle(handle, "_OSC", &osc_handle); |
| @@ -560,13 +558,6 @@ static int pcc_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
| 560 | ioread32(&pcch_hdr->nominal) * 1000; | 558 | ioread32(&pcch_hdr->nominal) * 1000; |
| 561 | policy->min = policy->cpuinfo.min_freq = | 559 | policy->min = policy->cpuinfo.min_freq = |
| 562 | ioread32(&pcch_hdr->minimum_frequency) * 1000; | 560 | ioread32(&pcch_hdr->minimum_frequency) * 1000; |
| 563 | policy->cur = pcc_get_freq(cpu); | ||
| 564 | |||
| 565 | if (!policy->cur) { | ||
| 566 | pr_debug("init: Unable to get current CPU frequency\n"); | ||
| 567 | result = -EINVAL; | ||
| 568 | goto out; | ||
| 569 | } | ||
| 570 | 561 | ||
| 571 | pr_debug("init: policy->max is %d, policy->min is %d\n", | 562 | pr_debug("init: policy->max is %d, policy->min is %d\n", |
| 572 | policy->max, policy->min); | 563 | policy->max, policy->min); |
diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c index a096cd3fa23d..05f705e1b7a2 100644 --- a/drivers/cpufreq/pmac32-cpufreq.c +++ b/drivers/cpufreq/pmac32-cpufreq.c | |||
| @@ -86,11 +86,6 @@ static struct cpufreq_frequency_table pmac_cpu_freqs[] = { | |||
| 86 | {0, CPUFREQ_TABLE_END}, | 86 | {0, CPUFREQ_TABLE_END}, |
| 87 | }; | 87 | }; |
| 88 | 88 | ||
| 89 | static struct freq_attr* pmac_cpu_freqs_attr[] = { | ||
| 90 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 91 | NULL, | ||
| 92 | }; | ||
| 93 | |||
| 94 | static inline void local_delay(unsigned long ms) | 89 | static inline void local_delay(unsigned long ms) |
| 95 | { | 90 | { |
| 96 | if (no_schedule) | 91 | if (no_schedule) |
| @@ -378,23 +373,12 @@ static unsigned int pmac_cpufreq_get_speed(unsigned int cpu) | |||
| 378 | return cur_freq; | 373 | return cur_freq; |
| 379 | } | 374 | } |
| 380 | 375 | ||
| 381 | static int pmac_cpufreq_verify(struct cpufreq_policy *policy) | ||
| 382 | { | ||
| 383 | return cpufreq_frequency_table_verify(policy, pmac_cpu_freqs); | ||
| 384 | } | ||
| 385 | |||
| 386 | static int pmac_cpufreq_target( struct cpufreq_policy *policy, | 376 | static int pmac_cpufreq_target( struct cpufreq_policy *policy, |
| 387 | unsigned int target_freq, | 377 | unsigned int index) |
| 388 | unsigned int relation) | ||
| 389 | { | 378 | { |
| 390 | unsigned int newstate = 0; | ||
| 391 | int rc; | 379 | int rc; |
| 392 | 380 | ||
| 393 | if (cpufreq_frequency_table_target(policy, pmac_cpu_freqs, | 381 | rc = do_set_cpu_speed(policy, index, 1); |
| 394 | target_freq, relation, &newstate)) | ||
| 395 | return -EINVAL; | ||
| 396 | |||
| 397 | rc = do_set_cpu_speed(policy, newstate, 1); | ||
| 398 | 382 | ||
| 399 | ppc_proc_freq = cur_freq * 1000ul; | 383 | ppc_proc_freq = cur_freq * 1000ul; |
| 400 | return rc; | 384 | return rc; |
| @@ -402,14 +386,7 @@ static int pmac_cpufreq_target( struct cpufreq_policy *policy, | |||
| 402 | 386 | ||
| 403 | static int pmac_cpufreq_cpu_init(struct cpufreq_policy *policy) | 387 | static int pmac_cpufreq_cpu_init(struct cpufreq_policy *policy) |
| 404 | { | 388 | { |
| 405 | if (policy->cpu != 0) | 389 | return cpufreq_generic_init(policy, pmac_cpu_freqs, transition_latency); |
| 406 | return -ENODEV; | ||
| 407 | |||
| 408 | policy->cpuinfo.transition_latency = transition_latency; | ||
| 409 | policy->cur = cur_freq; | ||
| 410 | |||
| 411 | cpufreq_frequency_table_get_attr(pmac_cpu_freqs, policy->cpu); | ||
| 412 | return cpufreq_frequency_table_cpuinfo(policy, pmac_cpu_freqs); | ||
| 413 | } | 390 | } |
| 414 | 391 | ||
| 415 | static u32 read_gpio(struct device_node *np) | 392 | static u32 read_gpio(struct device_node *np) |
| @@ -469,14 +446,14 @@ static int pmac_cpufreq_resume(struct cpufreq_policy *policy) | |||
| 469 | } | 446 | } |
| 470 | 447 | ||
| 471 | static struct cpufreq_driver pmac_cpufreq_driver = { | 448 | static struct cpufreq_driver pmac_cpufreq_driver = { |
| 472 | .verify = pmac_cpufreq_verify, | 449 | .verify = cpufreq_generic_frequency_table_verify, |
| 473 | .target = pmac_cpufreq_target, | 450 | .target_index = pmac_cpufreq_target, |
| 474 | .get = pmac_cpufreq_get_speed, | 451 | .get = pmac_cpufreq_get_speed, |
| 475 | .init = pmac_cpufreq_cpu_init, | 452 | .init = pmac_cpufreq_cpu_init, |
| 476 | .suspend = pmac_cpufreq_suspend, | 453 | .suspend = pmac_cpufreq_suspend, |
| 477 | .resume = pmac_cpufreq_resume, | 454 | .resume = pmac_cpufreq_resume, |
| 478 | .flags = CPUFREQ_PM_NO_WARN, | 455 | .flags = CPUFREQ_PM_NO_WARN, |
| 479 | .attr = pmac_cpu_freqs_attr, | 456 | .attr = cpufreq_generic_attr, |
| 480 | .name = "powermac", | 457 | .name = "powermac", |
| 481 | }; | 458 | }; |
| 482 | 459 | ||
diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c index 3a51ad7e47c8..234b598ce416 100644 --- a/drivers/cpufreq/pmac64-cpufreq.c +++ b/drivers/cpufreq/pmac64-cpufreq.c | |||
| @@ -70,11 +70,6 @@ static struct cpufreq_frequency_table g5_cpu_freqs[] = { | |||
| 70 | {0, CPUFREQ_TABLE_END}, | 70 | {0, CPUFREQ_TABLE_END}, |
| 71 | }; | 71 | }; |
| 72 | 72 | ||
| 73 | static struct freq_attr* g5_cpu_freqs_attr[] = { | ||
| 74 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 75 | NULL, | ||
| 76 | }; | ||
| 77 | |||
| 78 | /* Power mode data is an array of the 32 bits PCR values to use for | 73 | /* Power mode data is an array of the 32 bits PCR values to use for |
| 79 | * the various frequencies, retrieved from the device-tree | 74 | * the various frequencies, retrieved from the device-tree |
| 80 | */ | 75 | */ |
| @@ -142,7 +137,7 @@ static void g5_vdnap_switch_volt(int speed_mode) | |||
| 142 | pmf_call_one(pfunc_vdnap0_complete, &args); | 137 | pmf_call_one(pfunc_vdnap0_complete, &args); |
| 143 | if (done) | 138 | if (done) |
| 144 | break; | 139 | break; |
| 145 | msleep(1); | 140 | usleep_range(1000, 1000); |
| 146 | } | 141 | } |
| 147 | if (done == 0) | 142 | if (done == 0) |
| 148 | printk(KERN_WARNING "cpufreq: Timeout in clock slewing !\n"); | 143 | printk(KERN_WARNING "cpufreq: Timeout in clock slewing !\n"); |
| @@ -241,7 +236,7 @@ static void g5_pfunc_switch_volt(int speed_mode) | |||
| 241 | if (pfunc_cpu1_volt_low) | 236 | if (pfunc_cpu1_volt_low) |
| 242 | pmf_call_one(pfunc_cpu1_volt_low, NULL); | 237 | pmf_call_one(pfunc_cpu1_volt_low, NULL); |
| 243 | } | 238 | } |
| 244 | msleep(10); /* should be faster , to fix */ | 239 | usleep_range(10000, 10000); /* should be faster , to fix */ |
| 245 | } | 240 | } |
| 246 | 241 | ||
| 247 | /* | 242 | /* |
| @@ -286,7 +281,7 @@ static int g5_pfunc_switch_freq(int speed_mode) | |||
| 286 | pmf_call_one(pfunc_slewing_done, &args); | 281 | pmf_call_one(pfunc_slewing_done, &args); |
| 287 | if (done) | 282 | if (done) |
| 288 | break; | 283 | break; |
| 289 | msleep(1); | 284 | usleep_range(500, 500); |
| 290 | } | 285 | } |
| 291 | if (done == 0) | 286 | if (done == 0) |
| 292 | printk(KERN_WARNING "cpufreq: Timeout in clock slewing !\n"); | 287 | printk(KERN_WARNING "cpufreq: Timeout in clock slewing !\n"); |
| @@ -317,32 +312,18 @@ static int g5_pfunc_query_freq(void) | |||
| 317 | * Common interface to the cpufreq core | 312 | * Common interface to the cpufreq core |
| 318 | */ | 313 | */ |
| 319 | 314 | ||
| 320 | static int g5_cpufreq_verify(struct cpufreq_policy *policy) | 315 | static int g5_cpufreq_target(struct cpufreq_policy *policy, unsigned int index) |
| 321 | { | ||
| 322 | return cpufreq_frequency_table_verify(policy, g5_cpu_freqs); | ||
| 323 | } | ||
| 324 | |||
| 325 | static int g5_cpufreq_target(struct cpufreq_policy *policy, | ||
| 326 | unsigned int target_freq, unsigned int relation) | ||
| 327 | { | 316 | { |
| 328 | unsigned int newstate = 0; | ||
| 329 | struct cpufreq_freqs freqs; | 317 | struct cpufreq_freqs freqs; |
| 330 | int rc; | 318 | int rc; |
| 331 | 319 | ||
| 332 | if (cpufreq_frequency_table_target(policy, g5_cpu_freqs, | ||
| 333 | target_freq, relation, &newstate)) | ||
| 334 | return -EINVAL; | ||
| 335 | |||
| 336 | if (g5_pmode_cur == newstate) | ||
| 337 | return 0; | ||
| 338 | |||
| 339 | mutex_lock(&g5_switch_mutex); | 320 | mutex_lock(&g5_switch_mutex); |
| 340 | 321 | ||
| 341 | freqs.old = g5_cpu_freqs[g5_pmode_cur].frequency; | 322 | freqs.old = g5_cpu_freqs[g5_pmode_cur].frequency; |
| 342 | freqs.new = g5_cpu_freqs[newstate].frequency; | 323 | freqs.new = g5_cpu_freqs[index].frequency; |
| 343 | 324 | ||
| 344 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 325 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 345 | rc = g5_switch_freq(newstate); | 326 | rc = g5_switch_freq(index); |
| 346 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 327 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 347 | 328 | ||
| 348 | mutex_unlock(&g5_switch_mutex); | 329 | mutex_unlock(&g5_switch_mutex); |
| @@ -357,27 +338,17 @@ static unsigned int g5_cpufreq_get_speed(unsigned int cpu) | |||
| 357 | 338 | ||
| 358 | static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy) | 339 | static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy) |
| 359 | { | 340 | { |
| 360 | policy->cpuinfo.transition_latency = transition_latency; | 341 | return cpufreq_generic_init(policy, g5_cpu_freqs, transition_latency); |
| 361 | policy->cur = g5_cpu_freqs[g5_query_freq()].frequency; | ||
| 362 | /* secondary CPUs are tied to the primary one by the | ||
| 363 | * cpufreq core if in the secondary policy we tell it that | ||
| 364 | * it actually must be one policy together with all others. */ | ||
| 365 | cpumask_copy(policy->cpus, cpu_online_mask); | ||
| 366 | cpufreq_frequency_table_get_attr(g5_cpu_freqs, policy->cpu); | ||
| 367 | |||
| 368 | return cpufreq_frequency_table_cpuinfo(policy, | ||
| 369 | g5_cpu_freqs); | ||
| 370 | } | 342 | } |
| 371 | 343 | ||
| 372 | |||
| 373 | static struct cpufreq_driver g5_cpufreq_driver = { | 344 | static struct cpufreq_driver g5_cpufreq_driver = { |
| 374 | .name = "powermac", | 345 | .name = "powermac", |
| 375 | .flags = CPUFREQ_CONST_LOOPS, | 346 | .flags = CPUFREQ_CONST_LOOPS, |
| 376 | .init = g5_cpufreq_cpu_init, | 347 | .init = g5_cpufreq_cpu_init, |
| 377 | .verify = g5_cpufreq_verify, | 348 | .verify = cpufreq_generic_frequency_table_verify, |
| 378 | .target = g5_cpufreq_target, | 349 | .target_index = g5_cpufreq_target, |
| 379 | .get = g5_cpufreq_get_speed, | 350 | .get = g5_cpufreq_get_speed, |
| 380 | .attr = g5_cpu_freqs_attr, | 351 | .attr = cpufreq_generic_attr, |
| 381 | }; | 352 | }; |
| 382 | 353 | ||
| 383 | 354 | ||
| @@ -397,7 +368,8 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpunode) | |||
| 397 | /* Check supported platforms */ | 368 | /* Check supported platforms */ |
| 398 | if (of_machine_is_compatible("PowerMac8,1") || | 369 | if (of_machine_is_compatible("PowerMac8,1") || |
| 399 | of_machine_is_compatible("PowerMac8,2") || | 370 | of_machine_is_compatible("PowerMac8,2") || |
| 400 | of_machine_is_compatible("PowerMac9,1")) | 371 | of_machine_is_compatible("PowerMac9,1") || |
| 372 | of_machine_is_compatible("PowerMac12,1")) | ||
| 401 | use_volts_smu = 1; | 373 | use_volts_smu = 1; |
| 402 | else if (of_machine_is_compatible("PowerMac11,2")) | 374 | else if (of_machine_is_compatible("PowerMac11,2")) |
| 403 | use_volts_vdnap = 1; | 375 | use_volts_vdnap = 1; |
| @@ -647,8 +619,10 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode) | |||
| 647 | g5_cpu_freqs[0].frequency = max_freq; | 619 | g5_cpu_freqs[0].frequency = max_freq; |
| 648 | g5_cpu_freqs[1].frequency = min_freq; | 620 | g5_cpu_freqs[1].frequency = min_freq; |
| 649 | 621 | ||
| 622 | /* Based on a measurement on Xserve G5, rounded up. */ | ||
| 623 | transition_latency = 10 * NSEC_PER_MSEC; | ||
| 624 | |||
| 650 | /* Set callbacks */ | 625 | /* Set callbacks */ |
| 651 | transition_latency = CPUFREQ_ETERNAL; | ||
| 652 | g5_switch_volt = g5_pfunc_switch_volt; | 626 | g5_switch_volt = g5_pfunc_switch_volt; |
| 653 | g5_switch_freq = g5_pfunc_switch_freq; | 627 | g5_switch_freq = g5_pfunc_switch_freq; |
| 654 | g5_query_freq = g5_pfunc_query_freq; | 628 | g5_query_freq = g5_pfunc_query_freq; |
diff --git a/drivers/cpufreq/powernow-k6.c b/drivers/cpufreq/powernow-k6.c index 85f1c8c25ddc..643e7952cad3 100644 --- a/drivers/cpufreq/powernow-k6.c +++ b/drivers/cpufreq/powernow-k6.c | |||
| @@ -63,12 +63,12 @@ static int powernow_k6_get_cpu_multiplier(void) | |||
| 63 | 63 | ||
| 64 | 64 | ||
| 65 | /** | 65 | /** |
| 66 | * powernow_k6_set_state - set the PowerNow! multiplier | 66 | * powernow_k6_target - set the PowerNow! multiplier |
| 67 | * @best_i: clock_ratio[best_i] is the target multiplier | 67 | * @best_i: clock_ratio[best_i] is the target multiplier |
| 68 | * | 68 | * |
| 69 | * Tries to change the PowerNow! multiplier | 69 | * Tries to change the PowerNow! multiplier |
| 70 | */ | 70 | */ |
| 71 | static void powernow_k6_set_state(struct cpufreq_policy *policy, | 71 | static int powernow_k6_target(struct cpufreq_policy *policy, |
| 72 | unsigned int best_i) | 72 | unsigned int best_i) |
| 73 | { | 73 | { |
| 74 | unsigned long outvalue = 0, invalue = 0; | 74 | unsigned long outvalue = 0, invalue = 0; |
| @@ -77,7 +77,7 @@ static void powernow_k6_set_state(struct cpufreq_policy *policy, | |||
| 77 | 77 | ||
| 78 | if (clock_ratio[best_i].driver_data > max_multiplier) { | 78 | if (clock_ratio[best_i].driver_data > max_multiplier) { |
| 79 | printk(KERN_ERR PFX "invalid target frequency\n"); | 79 | printk(KERN_ERR PFX "invalid target frequency\n"); |
| 80 | return; | 80 | return -EINVAL; |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | freqs.old = busfreq * powernow_k6_get_cpu_multiplier(); | 83 | freqs.old = busfreq * powernow_k6_get_cpu_multiplier(); |
| @@ -100,44 +100,6 @@ static void powernow_k6_set_state(struct cpufreq_policy *policy, | |||
| 100 | 100 | ||
| 101 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 101 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 102 | 102 | ||
| 103 | return; | ||
| 104 | } | ||
| 105 | |||
| 106 | |||
| 107 | /** | ||
| 108 | * powernow_k6_verify - verifies a new CPUfreq policy | ||
| 109 | * @policy: new policy | ||
| 110 | * | ||
| 111 | * Policy must be within lowest and highest possible CPU Frequency, | ||
| 112 | * and at least one possible state must be within min and max. | ||
| 113 | */ | ||
| 114 | static int powernow_k6_verify(struct cpufreq_policy *policy) | ||
| 115 | { | ||
| 116 | return cpufreq_frequency_table_verify(policy, &clock_ratio[0]); | ||
| 117 | } | ||
| 118 | |||
| 119 | |||
| 120 | /** | ||
| 121 | * powernow_k6_setpolicy - sets a new CPUFreq policy | ||
| 122 | * @policy: new policy | ||
| 123 | * @target_freq: the target frequency | ||
| 124 | * @relation: how that frequency relates to achieved frequency | ||
| 125 | * (CPUFREQ_RELATION_L or CPUFREQ_RELATION_H) | ||
| 126 | * | ||
| 127 | * sets a new CPUFreq policy | ||
| 128 | */ | ||
| 129 | static int powernow_k6_target(struct cpufreq_policy *policy, | ||
| 130 | unsigned int target_freq, | ||
| 131 | unsigned int relation) | ||
| 132 | { | ||
| 133 | unsigned int newstate = 0; | ||
| 134 | |||
| 135 | if (cpufreq_frequency_table_target(policy, &clock_ratio[0], | ||
| 136 | target_freq, relation, &newstate)) | ||
| 137 | return -EINVAL; | ||
| 138 | |||
| 139 | powernow_k6_set_state(policy, newstate); | ||
| 140 | |||
| 141 | return 0; | 103 | return 0; |
| 142 | } | 104 | } |
| 143 | 105 | ||
| @@ -145,7 +107,6 @@ static int powernow_k6_target(struct cpufreq_policy *policy, | |||
| 145 | static int powernow_k6_cpu_init(struct cpufreq_policy *policy) | 107 | static int powernow_k6_cpu_init(struct cpufreq_policy *policy) |
| 146 | { | 108 | { |
| 147 | unsigned int i, f; | 109 | unsigned int i, f; |
| 148 | int result; | ||
| 149 | 110 | ||
| 150 | if (policy->cpu != 0) | 111 | if (policy->cpu != 0) |
| 151 | return -ENODEV; | 112 | return -ENODEV; |
| @@ -165,15 +126,8 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy) | |||
| 165 | 126 | ||
| 166 | /* cpuinfo and default policy values */ | 127 | /* cpuinfo and default policy values */ |
| 167 | policy->cpuinfo.transition_latency = 200000; | 128 | policy->cpuinfo.transition_latency = 200000; |
| 168 | policy->cur = busfreq * max_multiplier; | ||
| 169 | |||
| 170 | result = cpufreq_frequency_table_cpuinfo(policy, clock_ratio); | ||
| 171 | if (result) | ||
| 172 | return result; | ||
| 173 | |||
| 174 | cpufreq_frequency_table_get_attr(clock_ratio, policy->cpu); | ||
| 175 | 129 | ||
| 176 | return 0; | 130 | return cpufreq_table_validate_and_show(policy, clock_ratio); |
| 177 | } | 131 | } |
| 178 | 132 | ||
| 179 | 133 | ||
| @@ -182,7 +136,7 @@ static int powernow_k6_cpu_exit(struct cpufreq_policy *policy) | |||
| 182 | unsigned int i; | 136 | unsigned int i; |
| 183 | for (i = 0; i < 8; i++) { | 137 | for (i = 0; i < 8; i++) { |
| 184 | if (i == max_multiplier) | 138 | if (i == max_multiplier) |
| 185 | powernow_k6_set_state(policy, i); | 139 | powernow_k6_target(policy, i); |
| 186 | } | 140 | } |
| 187 | cpufreq_frequency_table_put_attr(policy->cpu); | 141 | cpufreq_frequency_table_put_attr(policy->cpu); |
| 188 | return 0; | 142 | return 0; |
| @@ -195,19 +149,14 @@ static unsigned int powernow_k6_get(unsigned int cpu) | |||
| 195 | return ret; | 149 | return ret; |
| 196 | } | 150 | } |
| 197 | 151 | ||
| 198 | static struct freq_attr *powernow_k6_attr[] = { | ||
| 199 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 200 | NULL, | ||
| 201 | }; | ||
| 202 | |||
| 203 | static struct cpufreq_driver powernow_k6_driver = { | 152 | static struct cpufreq_driver powernow_k6_driver = { |
| 204 | .verify = powernow_k6_verify, | 153 | .verify = cpufreq_generic_frequency_table_verify, |
| 205 | .target = powernow_k6_target, | 154 | .target_index = powernow_k6_target, |
| 206 | .init = powernow_k6_cpu_init, | 155 | .init = powernow_k6_cpu_init, |
| 207 | .exit = powernow_k6_cpu_exit, | 156 | .exit = powernow_k6_cpu_exit, |
| 208 | .get = powernow_k6_get, | 157 | .get = powernow_k6_get, |
| 209 | .name = "powernow-k6", | 158 | .name = "powernow-k6", |
| 210 | .attr = powernow_k6_attr, | 159 | .attr = cpufreq_generic_attr, |
| 211 | }; | 160 | }; |
| 212 | 161 | ||
| 213 | static const struct x86_cpu_id powernow_k6_ids[] = { | 162 | static const struct x86_cpu_id powernow_k6_ids[] = { |
diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c index 14ce480be8ab..946708a1d745 100644 --- a/drivers/cpufreq/powernow-k7.c +++ b/drivers/cpufreq/powernow-k7.c | |||
| @@ -248,7 +248,7 @@ static void change_VID(int vid) | |||
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | 250 | ||
| 251 | static void change_speed(struct cpufreq_policy *policy, unsigned int index) | 251 | static int powernow_target(struct cpufreq_policy *policy, unsigned int index) |
| 252 | { | 252 | { |
| 253 | u8 fid, vid; | 253 | u8 fid, vid; |
| 254 | struct cpufreq_freqs freqs; | 254 | struct cpufreq_freqs freqs; |
| @@ -291,6 +291,8 @@ static void change_speed(struct cpufreq_policy *policy, unsigned int index) | |||
| 291 | local_irq_enable(); | 291 | local_irq_enable(); |
| 292 | 292 | ||
| 293 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 293 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 294 | |||
| 295 | return 0; | ||
| 294 | } | 296 | } |
| 295 | 297 | ||
| 296 | 298 | ||
| @@ -533,27 +535,6 @@ static int powernow_decode_bios(int maxfid, int startvid) | |||
| 533 | } | 535 | } |
| 534 | 536 | ||
| 535 | 537 | ||
| 536 | static int powernow_target(struct cpufreq_policy *policy, | ||
| 537 | unsigned int target_freq, | ||
| 538 | unsigned int relation) | ||
| 539 | { | ||
| 540 | unsigned int newstate; | ||
| 541 | |||
| 542 | if (cpufreq_frequency_table_target(policy, powernow_table, target_freq, | ||
| 543 | relation, &newstate)) | ||
| 544 | return -EINVAL; | ||
| 545 | |||
| 546 | change_speed(policy, newstate); | ||
| 547 | |||
| 548 | return 0; | ||
| 549 | } | ||
| 550 | |||
| 551 | |||
| 552 | static int powernow_verify(struct cpufreq_policy *policy) | ||
| 553 | { | ||
| 554 | return cpufreq_frequency_table_verify(policy, powernow_table); | ||
| 555 | } | ||
| 556 | |||
| 557 | /* | 538 | /* |
| 558 | * We use the fact that the bus frequency is somehow | 539 | * We use the fact that the bus frequency is somehow |
| 559 | * a multiple of 100000/3 khz, then we compute sgtc according | 540 | * a multiple of 100000/3 khz, then we compute sgtc according |
| @@ -678,11 +659,7 @@ static int powernow_cpu_init(struct cpufreq_policy *policy) | |||
| 678 | policy->cpuinfo.transition_latency = | 659 | policy->cpuinfo.transition_latency = |
| 679 | cpufreq_scale(2000000UL, fsb, latency); | 660 | cpufreq_scale(2000000UL, fsb, latency); |
| 680 | 661 | ||
| 681 | policy->cur = powernow_get(0); | 662 | return cpufreq_table_validate_and_show(policy, powernow_table); |
| 682 | |||
| 683 | cpufreq_frequency_table_get_attr(powernow_table, policy->cpu); | ||
| 684 | |||
| 685 | return cpufreq_frequency_table_cpuinfo(policy, powernow_table); | ||
| 686 | } | 663 | } |
| 687 | 664 | ||
| 688 | static int powernow_cpu_exit(struct cpufreq_policy *policy) | 665 | static int powernow_cpu_exit(struct cpufreq_policy *policy) |
| @@ -701,14 +678,9 @@ static int powernow_cpu_exit(struct cpufreq_policy *policy) | |||
| 701 | return 0; | 678 | return 0; |
| 702 | } | 679 | } |
| 703 | 680 | ||
| 704 | static struct freq_attr *powernow_table_attr[] = { | ||
| 705 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 706 | NULL, | ||
| 707 | }; | ||
| 708 | |||
| 709 | static struct cpufreq_driver powernow_driver = { | 681 | static struct cpufreq_driver powernow_driver = { |
| 710 | .verify = powernow_verify, | 682 | .verify = cpufreq_generic_frequency_table_verify, |
| 711 | .target = powernow_target, | 683 | .target_index = powernow_target, |
| 712 | .get = powernow_get, | 684 | .get = powernow_get, |
| 713 | #ifdef CONFIG_X86_POWERNOW_K7_ACPI | 685 | #ifdef CONFIG_X86_POWERNOW_K7_ACPI |
| 714 | .bios_limit = acpi_processor_get_bios_limit, | 686 | .bios_limit = acpi_processor_get_bios_limit, |
| @@ -716,7 +688,7 @@ static struct cpufreq_driver powernow_driver = { | |||
| 716 | .init = powernow_cpu_init, | 688 | .init = powernow_cpu_init, |
| 717 | .exit = powernow_cpu_exit, | 689 | .exit = powernow_cpu_exit, |
| 718 | .name = "powernow-k7", | 690 | .name = "powernow-k7", |
| 719 | .attr = powernow_table_attr, | 691 | .attr = cpufreq_generic_attr, |
| 720 | }; | 692 | }; |
| 721 | 693 | ||
| 722 | static int __init powernow_init(void) | 694 | static int __init powernow_init(void) |
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c index 2344a9ed17f3..62a1ce47d3df 100644 --- a/drivers/cpufreq/powernow-k8.c +++ b/drivers/cpufreq/powernow-k8.c | |||
| @@ -977,20 +977,17 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data, | |||
| 977 | 977 | ||
| 978 | struct powernowk8_target_arg { | 978 | struct powernowk8_target_arg { |
| 979 | struct cpufreq_policy *pol; | 979 | struct cpufreq_policy *pol; |
| 980 | unsigned targfreq; | 980 | unsigned newstate; |
| 981 | unsigned relation; | ||
| 982 | }; | 981 | }; |
| 983 | 982 | ||
| 984 | static long powernowk8_target_fn(void *arg) | 983 | static long powernowk8_target_fn(void *arg) |
| 985 | { | 984 | { |
| 986 | struct powernowk8_target_arg *pta = arg; | 985 | struct powernowk8_target_arg *pta = arg; |
| 987 | struct cpufreq_policy *pol = pta->pol; | 986 | struct cpufreq_policy *pol = pta->pol; |
| 988 | unsigned targfreq = pta->targfreq; | 987 | unsigned newstate = pta->newstate; |
| 989 | unsigned relation = pta->relation; | ||
| 990 | struct powernow_k8_data *data = per_cpu(powernow_data, pol->cpu); | 988 | struct powernow_k8_data *data = per_cpu(powernow_data, pol->cpu); |
| 991 | u32 checkfid; | 989 | u32 checkfid; |
| 992 | u32 checkvid; | 990 | u32 checkvid; |
| 993 | unsigned int newstate; | ||
| 994 | int ret; | 991 | int ret; |
| 995 | 992 | ||
| 996 | if (!data) | 993 | if (!data) |
| @@ -1004,8 +1001,9 @@ static long powernowk8_target_fn(void *arg) | |||
| 1004 | return -EIO; | 1001 | return -EIO; |
| 1005 | } | 1002 | } |
| 1006 | 1003 | ||
| 1007 | pr_debug("targ: cpu %d, %d kHz, min %d, max %d, relation %d\n", | 1004 | pr_debug("targ: cpu %d, %d kHz, min %d, max %d\n", |
| 1008 | pol->cpu, targfreq, pol->min, pol->max, relation); | 1005 | pol->cpu, data->powernow_table[newstate].frequency, pol->min, |
| 1006 | pol->max); | ||
| 1009 | 1007 | ||
| 1010 | if (query_current_values_with_pending_wait(data)) | 1008 | if (query_current_values_with_pending_wait(data)) |
| 1011 | return -EIO; | 1009 | return -EIO; |
| @@ -1021,10 +1019,6 @@ static long powernowk8_target_fn(void *arg) | |||
| 1021 | checkvid, data->currvid); | 1019 | checkvid, data->currvid); |
| 1022 | } | 1020 | } |
| 1023 | 1021 | ||
| 1024 | if (cpufreq_frequency_table_target(pol, data->powernow_table, | ||
| 1025 | targfreq, relation, &newstate)) | ||
| 1026 | return -EIO; | ||
| 1027 | |||
| 1028 | mutex_lock(&fidvid_mutex); | 1022 | mutex_lock(&fidvid_mutex); |
| 1029 | 1023 | ||
| 1030 | powernow_k8_acpi_pst_values(data, newstate); | 1024 | powernow_k8_acpi_pst_values(data, newstate); |
| @@ -1044,26 +1038,13 @@ static long powernowk8_target_fn(void *arg) | |||
| 1044 | } | 1038 | } |
| 1045 | 1039 | ||
| 1046 | /* Driver entry point to switch to the target frequency */ | 1040 | /* Driver entry point to switch to the target frequency */ |
| 1047 | static int powernowk8_target(struct cpufreq_policy *pol, | 1041 | static int powernowk8_target(struct cpufreq_policy *pol, unsigned index) |
| 1048 | unsigned targfreq, unsigned relation) | ||
| 1049 | { | 1042 | { |
| 1050 | struct powernowk8_target_arg pta = { .pol = pol, .targfreq = targfreq, | 1043 | struct powernowk8_target_arg pta = { .pol = pol, .newstate = index }; |
| 1051 | .relation = relation }; | ||
| 1052 | 1044 | ||
| 1053 | return work_on_cpu(pol->cpu, powernowk8_target_fn, &pta); | 1045 | return work_on_cpu(pol->cpu, powernowk8_target_fn, &pta); |
| 1054 | } | 1046 | } |
| 1055 | 1047 | ||
| 1056 | /* Driver entry point to verify the policy and range of frequencies */ | ||
| 1057 | static int powernowk8_verify(struct cpufreq_policy *pol) | ||
| 1058 | { | ||
| 1059 | struct powernow_k8_data *data = per_cpu(powernow_data, pol->cpu); | ||
| 1060 | |||
| 1061 | if (!data) | ||
| 1062 | return -EINVAL; | ||
| 1063 | |||
| 1064 | return cpufreq_frequency_table_verify(pol, data->powernow_table); | ||
| 1065 | } | ||
| 1066 | |||
| 1067 | struct init_on_cpu { | 1048 | struct init_on_cpu { |
| 1068 | struct powernow_k8_data *data; | 1049 | struct powernow_k8_data *data; |
| 1069 | int rc; | 1050 | int rc; |
| @@ -1152,11 +1133,8 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol) | |||
| 1152 | cpumask_copy(pol->cpus, cpu_core_mask(pol->cpu)); | 1133 | cpumask_copy(pol->cpus, cpu_core_mask(pol->cpu)); |
| 1153 | data->available_cores = pol->cpus; | 1134 | data->available_cores = pol->cpus; |
| 1154 | 1135 | ||
| 1155 | pol->cur = find_khz_freq_from_fid(data->currfid); | ||
| 1156 | pr_debug("policy current frequency %d kHz\n", pol->cur); | ||
| 1157 | |||
| 1158 | /* min/max the cpu is capable of */ | 1136 | /* min/max the cpu is capable of */ |
| 1159 | if (cpufreq_frequency_table_cpuinfo(pol, data->powernow_table)) { | 1137 | if (cpufreq_table_validate_and_show(pol, data->powernow_table)) { |
| 1160 | printk(KERN_ERR FW_BUG PFX "invalid powernow_table\n"); | 1138 | printk(KERN_ERR FW_BUG PFX "invalid powernow_table\n"); |
| 1161 | powernow_k8_cpu_exit_acpi(data); | 1139 | powernow_k8_cpu_exit_acpi(data); |
| 1162 | kfree(data->powernow_table); | 1140 | kfree(data->powernow_table); |
| @@ -1164,8 +1142,6 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol) | |||
| 1164 | return -EINVAL; | 1142 | return -EINVAL; |
| 1165 | } | 1143 | } |
| 1166 | 1144 | ||
| 1167 | cpufreq_frequency_table_get_attr(data->powernow_table, pol->cpu); | ||
| 1168 | |||
| 1169 | pr_debug("cpu_init done, current fid 0x%x, vid 0x%x\n", | 1145 | pr_debug("cpu_init done, current fid 0x%x, vid 0x%x\n", |
| 1170 | data->currfid, data->currvid); | 1146 | data->currfid, data->currvid); |
| 1171 | 1147 | ||
| @@ -1227,20 +1203,15 @@ out: | |||
| 1227 | return khz; | 1203 | return khz; |
| 1228 | } | 1204 | } |
| 1229 | 1205 | ||
| 1230 | static struct freq_attr *powernow_k8_attr[] = { | ||
| 1231 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 1232 | NULL, | ||
| 1233 | }; | ||
| 1234 | |||
| 1235 | static struct cpufreq_driver cpufreq_amd64_driver = { | 1206 | static struct cpufreq_driver cpufreq_amd64_driver = { |
| 1236 | .verify = powernowk8_verify, | 1207 | .verify = cpufreq_generic_frequency_table_verify, |
| 1237 | .target = powernowk8_target, | 1208 | .target_index = powernowk8_target, |
| 1238 | .bios_limit = acpi_processor_get_bios_limit, | 1209 | .bios_limit = acpi_processor_get_bios_limit, |
| 1239 | .init = powernowk8_cpu_init, | 1210 | .init = powernowk8_cpu_init, |
| 1240 | .exit = powernowk8_cpu_exit, | 1211 | .exit = powernowk8_cpu_exit, |
| 1241 | .get = powernowk8_get, | 1212 | .get = powernowk8_get, |
| 1242 | .name = "powernow-k8", | 1213 | .name = "powernow-k8", |
| 1243 | .attr = powernow_k8_attr, | 1214 | .attr = cpufreq_generic_attr, |
| 1244 | }; | 1215 | }; |
| 1245 | 1216 | ||
| 1246 | static void __request_acpi_cpufreq(void) | 1217 | static void __request_acpi_cpufreq(void) |
diff --git a/drivers/cpufreq/ppc-corenet-cpufreq.c b/drivers/cpufreq/ppc-corenet-cpufreq.c index 60e81d524ea8..79d8e9c46b6d 100644 --- a/drivers/cpufreq/ppc-corenet-cpufreq.c +++ b/drivers/cpufreq/ppc-corenet-cpufreq.c | |||
| @@ -202,7 +202,7 @@ static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
| 202 | table[i].frequency = CPUFREQ_TABLE_END; | 202 | table[i].frequency = CPUFREQ_TABLE_END; |
| 203 | 203 | ||
| 204 | /* set the min and max frequency properly */ | 204 | /* set the min and max frequency properly */ |
| 205 | ret = cpufreq_frequency_table_cpuinfo(policy, table); | 205 | ret = cpufreq_table_validate_and_show(policy, table); |
| 206 | if (ret) { | 206 | if (ret) { |
| 207 | pr_err("invalid frequency table: %d\n", ret); | 207 | pr_err("invalid frequency table: %d\n", ret); |
| 208 | goto err_nomem1; | 208 | goto err_nomem1; |
| @@ -217,9 +217,6 @@ static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
| 217 | per_cpu(cpu_data, i) = data; | 217 | per_cpu(cpu_data, i) = data; |
| 218 | 218 | ||
| 219 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | 219 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; |
| 220 | policy->cur = corenet_cpufreq_get_speed(policy->cpu); | ||
| 221 | |||
| 222 | cpufreq_frequency_table_get_attr(table, cpu); | ||
| 223 | of_node_put(np); | 220 | of_node_put(np); |
| 224 | 221 | ||
| 225 | return 0; | 222 | return 0; |
| @@ -253,36 +250,21 @@ static int __exit corenet_cpufreq_cpu_exit(struct cpufreq_policy *policy) | |||
| 253 | return 0; | 250 | return 0; |
| 254 | } | 251 | } |
| 255 | 252 | ||
| 256 | static int corenet_cpufreq_verify(struct cpufreq_policy *policy) | ||
| 257 | { | ||
| 258 | struct cpufreq_frequency_table *table = | ||
| 259 | per_cpu(cpu_data, policy->cpu)->table; | ||
| 260 | |||
| 261 | return cpufreq_frequency_table_verify(policy, table); | ||
| 262 | } | ||
| 263 | |||
| 264 | static int corenet_cpufreq_target(struct cpufreq_policy *policy, | 253 | static int corenet_cpufreq_target(struct cpufreq_policy *policy, |
| 265 | unsigned int target_freq, unsigned int relation) | 254 | unsigned int index) |
| 266 | { | 255 | { |
| 267 | struct cpufreq_freqs freqs; | 256 | struct cpufreq_freqs freqs; |
| 268 | unsigned int new; | ||
| 269 | struct clk *parent; | 257 | struct clk *parent; |
| 270 | int ret; | 258 | int ret; |
| 271 | struct cpu_data *data = per_cpu(cpu_data, policy->cpu); | 259 | struct cpu_data *data = per_cpu(cpu_data, policy->cpu); |
| 272 | 260 | ||
| 273 | cpufreq_frequency_table_target(policy, data->table, | ||
| 274 | target_freq, relation, &new); | ||
| 275 | |||
| 276 | if (policy->cur == data->table[new].frequency) | ||
| 277 | return 0; | ||
| 278 | |||
| 279 | freqs.old = policy->cur; | 261 | freqs.old = policy->cur; |
| 280 | freqs.new = data->table[new].frequency; | 262 | freqs.new = data->table[index].frequency; |
| 281 | 263 | ||
| 282 | mutex_lock(&cpufreq_lock); | 264 | mutex_lock(&cpufreq_lock); |
| 283 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 265 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 284 | 266 | ||
| 285 | parent = of_clk_get(data->parent, data->table[new].driver_data); | 267 | parent = of_clk_get(data->parent, data->table[index].driver_data); |
| 286 | ret = clk_set_parent(data->clk, parent); | 268 | ret = clk_set_parent(data->clk, parent); |
| 287 | if (ret) | 269 | if (ret) |
| 288 | freqs.new = freqs.old; | 270 | freqs.new = freqs.old; |
| @@ -293,20 +275,15 @@ static int corenet_cpufreq_target(struct cpufreq_policy *policy, | |||
| 293 | return ret; | 275 | return ret; |
| 294 | } | 276 | } |
| 295 | 277 | ||
| 296 | static struct freq_attr *corenet_cpufreq_attr[] = { | ||
| 297 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 298 | NULL, | ||
| 299 | }; | ||
| 300 | |||
| 301 | static struct cpufreq_driver ppc_corenet_cpufreq_driver = { | 278 | static struct cpufreq_driver ppc_corenet_cpufreq_driver = { |
| 302 | .name = "ppc_cpufreq", | 279 | .name = "ppc_cpufreq", |
| 303 | .flags = CPUFREQ_CONST_LOOPS, | 280 | .flags = CPUFREQ_CONST_LOOPS, |
| 304 | .init = corenet_cpufreq_cpu_init, | 281 | .init = corenet_cpufreq_cpu_init, |
| 305 | .exit = __exit_p(corenet_cpufreq_cpu_exit), | 282 | .exit = __exit_p(corenet_cpufreq_cpu_exit), |
| 306 | .verify = corenet_cpufreq_verify, | 283 | .verify = cpufreq_generic_frequency_table_verify, |
| 307 | .target = corenet_cpufreq_target, | 284 | .target_index = corenet_cpufreq_target, |
| 308 | .get = corenet_cpufreq_get_speed, | 285 | .get = corenet_cpufreq_get_speed, |
| 309 | .attr = corenet_cpufreq_attr, | 286 | .attr = cpufreq_generic_attr, |
| 310 | }; | 287 | }; |
| 311 | 288 | ||
| 312 | static const struct of_device_id node_matches[] __initdata = { | 289 | static const struct of_device_id node_matches[] __initdata = { |
diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c index 2e448f0bbdc5..52f707d5f458 100644 --- a/drivers/cpufreq/ppc_cbe_cpufreq.c +++ b/drivers/cpufreq/ppc_cbe_cpufreq.c | |||
| @@ -123,37 +123,16 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
| 123 | cpumask_copy(policy->cpus, cpu_sibling_mask(policy->cpu)); | 123 | cpumask_copy(policy->cpus, cpu_sibling_mask(policy->cpu)); |
| 124 | #endif | 124 | #endif |
| 125 | 125 | ||
| 126 | cpufreq_frequency_table_get_attr(cbe_freqs, policy->cpu); | ||
| 127 | |||
| 128 | /* this ensures that policy->cpuinfo_min | 126 | /* this ensures that policy->cpuinfo_min |
| 129 | * and policy->cpuinfo_max are set correctly */ | 127 | * and policy->cpuinfo_max are set correctly */ |
| 130 | return cpufreq_frequency_table_cpuinfo(policy, cbe_freqs); | 128 | return cpufreq_table_validate_and_show(policy, cbe_freqs); |
| 131 | } | ||
| 132 | |||
| 133 | static int cbe_cpufreq_cpu_exit(struct cpufreq_policy *policy) | ||
| 134 | { | ||
| 135 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 136 | return 0; | ||
| 137 | } | ||
| 138 | |||
| 139 | static int cbe_cpufreq_verify(struct cpufreq_policy *policy) | ||
| 140 | { | ||
| 141 | return cpufreq_frequency_table_verify(policy, cbe_freqs); | ||
| 142 | } | 129 | } |
| 143 | 130 | ||
| 144 | static int cbe_cpufreq_target(struct cpufreq_policy *policy, | 131 | static int cbe_cpufreq_target(struct cpufreq_policy *policy, |
| 145 | unsigned int target_freq, | 132 | unsigned int cbe_pmode_new) |
| 146 | unsigned int relation) | ||
| 147 | { | 133 | { |
| 148 | int rc; | 134 | int rc; |
| 149 | struct cpufreq_freqs freqs; | 135 | struct cpufreq_freqs freqs; |
| 150 | unsigned int cbe_pmode_new; | ||
| 151 | |||
| 152 | cpufreq_frequency_table_target(policy, | ||
| 153 | cbe_freqs, | ||
| 154 | target_freq, | ||
| 155 | relation, | ||
| 156 | &cbe_pmode_new); | ||
| 157 | 136 | ||
| 158 | freqs.old = policy->cur; | 137 | freqs.old = policy->cur; |
| 159 | freqs.new = cbe_freqs[cbe_pmode_new].frequency; | 138 | freqs.new = cbe_freqs[cbe_pmode_new].frequency; |
| @@ -176,10 +155,10 @@ static int cbe_cpufreq_target(struct cpufreq_policy *policy, | |||
| 176 | } | 155 | } |
| 177 | 156 | ||
| 178 | static struct cpufreq_driver cbe_cpufreq_driver = { | 157 | static struct cpufreq_driver cbe_cpufreq_driver = { |
| 179 | .verify = cbe_cpufreq_verify, | 158 | .verify = cpufreq_generic_frequency_table_verify, |
| 180 | .target = cbe_cpufreq_target, | 159 | .target_index = cbe_cpufreq_target, |
| 181 | .init = cbe_cpufreq_cpu_init, | 160 | .init = cbe_cpufreq_cpu_init, |
| 182 | .exit = cbe_cpufreq_cpu_exit, | 161 | .exit = cpufreq_generic_exit, |
| 183 | .name = "cbe-cpufreq", | 162 | .name = "cbe-cpufreq", |
| 184 | .flags = CPUFREQ_CONST_LOOPS, | 163 | .flags = CPUFREQ_CONST_LOOPS, |
| 185 | }; | 164 | }; |
diff --git a/drivers/cpufreq/pxa2xx-cpufreq.c b/drivers/cpufreq/pxa2xx-cpufreq.c index 8749eaf18793..183bc13f13e5 100644 --- a/drivers/cpufreq/pxa2xx-cpufreq.c +++ b/drivers/cpufreq/pxa2xx-cpufreq.c | |||
| @@ -262,36 +262,16 @@ static u32 mdrefr_dri(unsigned int freq) | |||
| 262 | return (interval - (cpu_is_pxa27x() ? 31 : 0)) / 32; | 262 | return (interval - (cpu_is_pxa27x() ? 31 : 0)) / 32; |
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | /* find a valid frequency point */ | ||
| 266 | static int pxa_verify_policy(struct cpufreq_policy *policy) | ||
| 267 | { | ||
| 268 | struct cpufreq_frequency_table *pxa_freqs_table; | ||
| 269 | pxa_freqs_t *pxa_freqs; | ||
| 270 | int ret; | ||
| 271 | |||
| 272 | find_freq_tables(&pxa_freqs_table, &pxa_freqs); | ||
| 273 | ret = cpufreq_frequency_table_verify(policy, pxa_freqs_table); | ||
| 274 | |||
| 275 | if (freq_debug) | ||
| 276 | pr_debug("Verified CPU policy: %dKhz min to %dKhz max\n", | ||
| 277 | policy->min, policy->max); | ||
| 278 | |||
| 279 | return ret; | ||
| 280 | } | ||
| 281 | |||
| 282 | static unsigned int pxa_cpufreq_get(unsigned int cpu) | 265 | static unsigned int pxa_cpufreq_get(unsigned int cpu) |
| 283 | { | 266 | { |
| 284 | return get_clk_frequency_khz(0); | 267 | return get_clk_frequency_khz(0); |
| 285 | } | 268 | } |
| 286 | 269 | ||
| 287 | static int pxa_set_target(struct cpufreq_policy *policy, | 270 | static int pxa_set_target(struct cpufreq_policy *policy, unsigned int idx) |
| 288 | unsigned int target_freq, | ||
| 289 | unsigned int relation) | ||
| 290 | { | 271 | { |
| 291 | struct cpufreq_frequency_table *pxa_freqs_table; | 272 | struct cpufreq_frequency_table *pxa_freqs_table; |
| 292 | pxa_freqs_t *pxa_freq_settings; | 273 | pxa_freqs_t *pxa_freq_settings; |
| 293 | struct cpufreq_freqs freqs; | 274 | struct cpufreq_freqs freqs; |
| 294 | unsigned int idx; | ||
| 295 | unsigned long flags; | 275 | unsigned long flags; |
| 296 | unsigned int new_freq_cpu, new_freq_mem; | 276 | unsigned int new_freq_cpu, new_freq_mem; |
| 297 | unsigned int unused, preset_mdrefr, postset_mdrefr, cclkcfg; | 277 | unsigned int unused, preset_mdrefr, postset_mdrefr, cclkcfg; |
| @@ -300,12 +280,6 @@ static int pxa_set_target(struct cpufreq_policy *policy, | |||
| 300 | /* Get the current policy */ | 280 | /* Get the current policy */ |
| 301 | find_freq_tables(&pxa_freqs_table, &pxa_freq_settings); | 281 | find_freq_tables(&pxa_freqs_table, &pxa_freq_settings); |
| 302 | 282 | ||
| 303 | /* Lookup the next frequency */ | ||
| 304 | if (cpufreq_frequency_table_target(policy, pxa_freqs_table, | ||
| 305 | target_freq, relation, &idx)) { | ||
| 306 | return -EINVAL; | ||
| 307 | } | ||
| 308 | |||
| 309 | new_freq_cpu = pxa_freq_settings[idx].khz; | 283 | new_freq_cpu = pxa_freq_settings[idx].khz; |
| 310 | new_freq_mem = pxa_freq_settings[idx].membus; | 284 | new_freq_mem = pxa_freq_settings[idx].membus; |
| 311 | freqs.old = policy->cur; | 285 | freqs.old = policy->cur; |
| @@ -414,8 +388,6 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy) | |||
| 414 | 388 | ||
| 415 | /* set default policy and cpuinfo */ | 389 | /* set default policy and cpuinfo */ |
| 416 | policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ | 390 | policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ |
| 417 | policy->cur = get_clk_frequency_khz(0); /* current freq */ | ||
| 418 | policy->min = policy->max = policy->cur; | ||
| 419 | 391 | ||
| 420 | /* Generate pxa25x the run cpufreq_frequency_table struct */ | 392 | /* Generate pxa25x the run cpufreq_frequency_table struct */ |
| 421 | for (i = 0; i < NUM_PXA25x_RUN_FREQS; i++) { | 393 | for (i = 0; i < NUM_PXA25x_RUN_FREQS; i++) { |
| @@ -453,10 +425,12 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy) | |||
| 453 | find_freq_tables(&pxa255_freq_table, &pxa255_freqs); | 425 | find_freq_tables(&pxa255_freq_table, &pxa255_freqs); |
| 454 | pr_info("PXA255 cpufreq using %s frequency table\n", | 426 | pr_info("PXA255 cpufreq using %s frequency table\n", |
| 455 | pxa255_turbo_table ? "turbo" : "run"); | 427 | pxa255_turbo_table ? "turbo" : "run"); |
| 456 | cpufreq_frequency_table_cpuinfo(policy, pxa255_freq_table); | 428 | |
| 429 | cpufreq_table_validate_and_show(policy, pxa255_freq_table); | ||
| 430 | } | ||
| 431 | else if (cpu_is_pxa27x()) { | ||
| 432 | cpufreq_table_validate_and_show(policy, pxa27x_freq_table); | ||
| 457 | } | 433 | } |
| 458 | else if (cpu_is_pxa27x()) | ||
| 459 | cpufreq_frequency_table_cpuinfo(policy, pxa27x_freq_table); | ||
| 460 | 434 | ||
| 461 | printk(KERN_INFO "PXA CPU frequency change support initialized\n"); | 435 | printk(KERN_INFO "PXA CPU frequency change support initialized\n"); |
| 462 | 436 | ||
| @@ -464,9 +438,10 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy) | |||
| 464 | } | 438 | } |
| 465 | 439 | ||
| 466 | static struct cpufreq_driver pxa_cpufreq_driver = { | 440 | static struct cpufreq_driver pxa_cpufreq_driver = { |
| 467 | .verify = pxa_verify_policy, | 441 | .verify = cpufreq_generic_frequency_table_verify, |
| 468 | .target = pxa_set_target, | 442 | .target_index = pxa_set_target, |
| 469 | .init = pxa_cpufreq_init, | 443 | .init = pxa_cpufreq_init, |
| 444 | .exit = cpufreq_generic_exit, | ||
| 470 | .get = pxa_cpufreq_get, | 445 | .get = pxa_cpufreq_get, |
| 471 | .name = "PXA2xx", | 446 | .name = "PXA2xx", |
| 472 | }; | 447 | }; |
diff --git a/drivers/cpufreq/pxa3xx-cpufreq.c b/drivers/cpufreq/pxa3xx-cpufreq.c index d26306fb00d2..132e37d578c2 100644 --- a/drivers/cpufreq/pxa3xx-cpufreq.c +++ b/drivers/cpufreq/pxa3xx-cpufreq.c | |||
| @@ -108,7 +108,7 @@ static int setup_freqs_table(struct cpufreq_policy *policy, | |||
| 108 | pxa3xx_freqs_num = num; | 108 | pxa3xx_freqs_num = num; |
| 109 | pxa3xx_freqs_table = table; | 109 | pxa3xx_freqs_table = table; |
| 110 | 110 | ||
| 111 | return cpufreq_frequency_table_cpuinfo(policy, table); | 111 | return cpufreq_table_validate_and_show(policy, table); |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | static void __update_core_freq(struct pxa3xx_freq_info *info) | 114 | static void __update_core_freq(struct pxa3xx_freq_info *info) |
| @@ -150,34 +150,21 @@ static void __update_bus_freq(struct pxa3xx_freq_info *info) | |||
| 150 | cpu_relax(); | 150 | cpu_relax(); |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | static int pxa3xx_cpufreq_verify(struct cpufreq_policy *policy) | ||
| 154 | { | ||
| 155 | return cpufreq_frequency_table_verify(policy, pxa3xx_freqs_table); | ||
| 156 | } | ||
| 157 | |||
| 158 | static unsigned int pxa3xx_cpufreq_get(unsigned int cpu) | 153 | static unsigned int pxa3xx_cpufreq_get(unsigned int cpu) |
| 159 | { | 154 | { |
| 160 | return pxa3xx_get_clk_frequency_khz(0); | 155 | return pxa3xx_get_clk_frequency_khz(0); |
| 161 | } | 156 | } |
| 162 | 157 | ||
| 163 | static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy, | 158 | static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy, unsigned int index) |
| 164 | unsigned int target_freq, | ||
| 165 | unsigned int relation) | ||
| 166 | { | 159 | { |
| 167 | struct pxa3xx_freq_info *next; | 160 | struct pxa3xx_freq_info *next; |
| 168 | struct cpufreq_freqs freqs; | 161 | struct cpufreq_freqs freqs; |
| 169 | unsigned long flags; | 162 | unsigned long flags; |
| 170 | int idx; | ||
| 171 | 163 | ||
| 172 | if (policy->cpu != 0) | 164 | if (policy->cpu != 0) |
| 173 | return -EINVAL; | 165 | return -EINVAL; |
| 174 | 166 | ||
| 175 | /* Lookup the next frequency */ | 167 | next = &pxa3xx_freqs[index]; |
| 176 | if (cpufreq_frequency_table_target(policy, pxa3xx_freqs_table, | ||
| 177 | target_freq, relation, &idx)) | ||
| 178 | return -EINVAL; | ||
| 179 | |||
| 180 | next = &pxa3xx_freqs[idx]; | ||
| 181 | 168 | ||
| 182 | freqs.old = policy->cur; | 169 | freqs.old = policy->cur; |
| 183 | freqs.new = next->cpufreq_mhz * 1000; | 170 | freqs.new = next->cpufreq_mhz * 1000; |
| @@ -186,9 +173,6 @@ static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy, | |||
| 186 | freqs.old / 1000, freqs.new / 1000, | 173 | freqs.old / 1000, freqs.new / 1000, |
| 187 | (freqs.old == freqs.new) ? " (skipped)" : ""); | 174 | (freqs.old == freqs.new) ? " (skipped)" : ""); |
| 188 | 175 | ||
| 189 | if (freqs.old == target_freq) | ||
| 190 | return 0; | ||
| 191 | |||
| 192 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 176 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 193 | 177 | ||
| 194 | local_irq_save(flags); | 178 | local_irq_save(flags); |
| @@ -206,11 +190,10 @@ static int pxa3xx_cpufreq_init(struct cpufreq_policy *policy) | |||
| 206 | int ret = -EINVAL; | 190 | int ret = -EINVAL; |
| 207 | 191 | ||
| 208 | /* set default policy and cpuinfo */ | 192 | /* set default policy and cpuinfo */ |
| 209 | policy->cpuinfo.min_freq = 104000; | 193 | policy->min = policy->cpuinfo.min_freq = 104000; |
| 210 | policy->cpuinfo.max_freq = (cpu_is_pxa320()) ? 806000 : 624000; | 194 | policy->max = policy->cpuinfo.max_freq = |
| 195 | (cpu_is_pxa320()) ? 806000 : 624000; | ||
| 211 | policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ | 196 | policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ |
| 212 | policy->max = pxa3xx_get_clk_frequency_khz(0); | ||
| 213 | policy->cur = policy->min = policy->max; | ||
| 214 | 197 | ||
| 215 | if (cpu_is_pxa300() || cpu_is_pxa310()) | 198 | if (cpu_is_pxa300() || cpu_is_pxa310()) |
| 216 | ret = setup_freqs_table(policy, pxa300_freqs, | 199 | ret = setup_freqs_table(policy, pxa300_freqs, |
| @@ -230,9 +213,10 @@ static int pxa3xx_cpufreq_init(struct cpufreq_policy *policy) | |||
| 230 | } | 213 | } |
| 231 | 214 | ||
| 232 | static struct cpufreq_driver pxa3xx_cpufreq_driver = { | 215 | static struct cpufreq_driver pxa3xx_cpufreq_driver = { |
| 233 | .verify = pxa3xx_cpufreq_verify, | 216 | .verify = cpufreq_generic_frequency_table_verify, |
| 234 | .target = pxa3xx_cpufreq_set, | 217 | .target_index = pxa3xx_cpufreq_set, |
| 235 | .init = pxa3xx_cpufreq_init, | 218 | .init = pxa3xx_cpufreq_init, |
| 219 | .exit = cpufreq_generic_exit, | ||
| 236 | .get = pxa3xx_cpufreq_get, | 220 | .get = pxa3xx_cpufreq_get, |
| 237 | .name = "pxa3xx-cpufreq", | 221 | .name = "pxa3xx-cpufreq", |
| 238 | }; | 222 | }; |
diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c index 22dcb81ef9d0..4188accd34ab 100644 --- a/drivers/cpufreq/s3c2416-cpufreq.c +++ b/drivers/cpufreq/s3c2416-cpufreq.c | |||
| @@ -87,16 +87,6 @@ static struct cpufreq_frequency_table s3c2450_freq_table[] = { | |||
| 87 | { 0, CPUFREQ_TABLE_END }, | 87 | { 0, CPUFREQ_TABLE_END }, |
| 88 | }; | 88 | }; |
| 89 | 89 | ||
| 90 | static int s3c2416_cpufreq_verify_speed(struct cpufreq_policy *policy) | ||
| 91 | { | ||
| 92 | struct s3c2416_data *s3c_freq = &s3c2416_cpufreq; | ||
| 93 | |||
| 94 | if (policy->cpu != 0) | ||
| 95 | return -EINVAL; | ||
| 96 | |||
| 97 | return cpufreq_frequency_table_verify(policy, s3c_freq->freq_table); | ||
| 98 | } | ||
| 99 | |||
| 100 | static unsigned int s3c2416_cpufreq_get_speed(unsigned int cpu) | 90 | static unsigned int s3c2416_cpufreq_get_speed(unsigned int cpu) |
| 101 | { | 91 | { |
| 102 | struct s3c2416_data *s3c_freq = &s3c2416_cpufreq; | 92 | struct s3c2416_data *s3c_freq = &s3c2416_cpufreq; |
| @@ -227,24 +217,15 @@ static int s3c2416_cpufreq_leave_dvs(struct s3c2416_data *s3c_freq, int idx) | |||
| 227 | } | 217 | } |
| 228 | 218 | ||
| 229 | static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy, | 219 | static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy, |
| 230 | unsigned int target_freq, | 220 | unsigned int index) |
| 231 | unsigned int relation) | ||
| 232 | { | 221 | { |
| 233 | struct s3c2416_data *s3c_freq = &s3c2416_cpufreq; | 222 | struct s3c2416_data *s3c_freq = &s3c2416_cpufreq; |
| 234 | struct cpufreq_freqs freqs; | 223 | struct cpufreq_freqs freqs; |
| 235 | int idx, ret, to_dvs = 0; | 224 | int idx, ret, to_dvs = 0; |
| 236 | unsigned int i; | ||
| 237 | 225 | ||
| 238 | mutex_lock(&cpufreq_lock); | 226 | mutex_lock(&cpufreq_lock); |
| 239 | 227 | ||
| 240 | pr_debug("cpufreq: to %dKHz, relation %d\n", target_freq, relation); | 228 | idx = s3c_freq->freq_table[index].driver_data; |
| 241 | |||
| 242 | ret = cpufreq_frequency_table_target(policy, s3c_freq->freq_table, | ||
| 243 | target_freq, relation, &i); | ||
| 244 | if (ret != 0) | ||
| 245 | goto out; | ||
| 246 | |||
| 247 | idx = s3c_freq->freq_table[i].driver_data; | ||
| 248 | 229 | ||
| 249 | if (idx == SOURCE_HCLK) | 230 | if (idx == SOURCE_HCLK) |
| 250 | to_dvs = 1; | 231 | to_dvs = 1; |
| @@ -266,7 +247,7 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy, | |||
| 266 | */ | 247 | */ |
| 267 | freqs.new = (s3c_freq->is_dvs && !to_dvs) | 248 | freqs.new = (s3c_freq->is_dvs && !to_dvs) |
| 268 | ? clk_get_rate(s3c_freq->hclk) / 1000 | 249 | ? clk_get_rate(s3c_freq->hclk) / 1000 |
| 269 | : s3c_freq->freq_table[i].frequency; | 250 | : s3c_freq->freq_table[index].frequency; |
| 270 | 251 | ||
| 271 | pr_debug("cpufreq: Transition %d-%dkHz\n", freqs.old, freqs.new); | 252 | pr_debug("cpufreq: Transition %d-%dkHz\n", freqs.old, freqs.new); |
| 272 | 253 | ||
| @@ -486,20 +467,14 @@ static int __init s3c2416_cpufreq_driver_init(struct cpufreq_policy *policy) | |||
| 486 | freq++; | 467 | freq++; |
| 487 | } | 468 | } |
| 488 | 469 | ||
| 489 | policy->cur = clk_get_rate(s3c_freq->armclk) / 1000; | ||
| 490 | |||
| 491 | /* Datasheet says PLL stabalisation time must be at least 300us, | 470 | /* Datasheet says PLL stabalisation time must be at least 300us, |
| 492 | * so but add some fudge. (reference in LOCKCON0 register description) | 471 | * so but add some fudge. (reference in LOCKCON0 register description) |
| 493 | */ | 472 | */ |
| 494 | policy->cpuinfo.transition_latency = (500 * 1000) + | 473 | ret = cpufreq_generic_init(policy, s3c_freq->freq_table, |
| 495 | s3c_freq->regulator_latency; | 474 | (500 * 1000) + s3c_freq->regulator_latency); |
| 496 | |||
| 497 | ret = cpufreq_frequency_table_cpuinfo(policy, s3c_freq->freq_table); | ||
| 498 | if (ret) | 475 | if (ret) |
| 499 | goto err_freq_table; | 476 | goto err_freq_table; |
| 500 | 477 | ||
| 501 | cpufreq_frequency_table_get_attr(s3c_freq->freq_table, 0); | ||
| 502 | |||
| 503 | register_reboot_notifier(&s3c2416_cpufreq_reboot_notifier); | 478 | register_reboot_notifier(&s3c2416_cpufreq_reboot_notifier); |
| 504 | 479 | ||
| 505 | return 0; | 480 | return 0; |
| @@ -518,19 +493,14 @@ err_hclk: | |||
| 518 | return ret; | 493 | return ret; |
| 519 | } | 494 | } |
| 520 | 495 | ||
| 521 | static struct freq_attr *s3c2416_cpufreq_attr[] = { | ||
| 522 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 523 | NULL, | ||
| 524 | }; | ||
| 525 | |||
| 526 | static struct cpufreq_driver s3c2416_cpufreq_driver = { | 496 | static struct cpufreq_driver s3c2416_cpufreq_driver = { |
| 527 | .flags = 0, | 497 | .flags = 0, |
| 528 | .verify = s3c2416_cpufreq_verify_speed, | 498 | .verify = cpufreq_generic_frequency_table_verify, |
| 529 | .target = s3c2416_cpufreq_set_target, | 499 | .target_index = s3c2416_cpufreq_set_target, |
| 530 | .get = s3c2416_cpufreq_get_speed, | 500 | .get = s3c2416_cpufreq_get_speed, |
| 531 | .init = s3c2416_cpufreq_driver_init, | 501 | .init = s3c2416_cpufreq_driver_init, |
| 532 | .name = "s3c2416", | 502 | .name = "s3c2416", |
| 533 | .attr = s3c2416_cpufreq_attr, | 503 | .attr = cpufreq_generic_attr, |
| 534 | }; | 504 | }; |
| 535 | 505 | ||
| 536 | static int __init s3c2416_cpufreq_init(void) | 506 | static int __init s3c2416_cpufreq_init(void) |
diff --git a/drivers/cpufreq/s3c24xx-cpufreq.c b/drivers/cpufreq/s3c24xx-cpufreq.c index b0f343fcb7ee..485088253358 100644 --- a/drivers/cpufreq/s3c24xx-cpufreq.c +++ b/drivers/cpufreq/s3c24xx-cpufreq.c | |||
| @@ -373,23 +373,7 @@ struct clk *s3c_cpufreq_clk_get(struct device *dev, const char *name) | |||
| 373 | 373 | ||
| 374 | static int s3c_cpufreq_init(struct cpufreq_policy *policy) | 374 | static int s3c_cpufreq_init(struct cpufreq_policy *policy) |
| 375 | { | 375 | { |
| 376 | printk(KERN_INFO "%s: initialising policy %p\n", __func__, policy); | 376 | return cpufreq_generic_init(policy, ftab, cpu_cur.info->latency); |
| 377 | |||
| 378 | if (policy->cpu != 0) | ||
| 379 | return -EINVAL; | ||
| 380 | |||
| 381 | policy->cur = s3c_cpufreq_get(0); | ||
| 382 | policy->min = policy->cpuinfo.min_freq = 0; | ||
| 383 | policy->max = policy->cpuinfo.max_freq = cpu_cur.info->max.fclk / 1000; | ||
| 384 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
| 385 | |||
| 386 | /* feed the latency information from the cpu driver */ | ||
| 387 | policy->cpuinfo.transition_latency = cpu_cur.info->latency; | ||
| 388 | |||
| 389 | if (ftab) | ||
| 390 | cpufreq_frequency_table_cpuinfo(policy, ftab); | ||
| 391 | |||
| 392 | return 0; | ||
| 393 | } | 377 | } |
| 394 | 378 | ||
| 395 | static int __init s3c_cpufreq_initclks(void) | 379 | static int __init s3c_cpufreq_initclks(void) |
| @@ -416,14 +400,6 @@ static int __init s3c_cpufreq_initclks(void) | |||
| 416 | return 0; | 400 | return 0; |
| 417 | } | 401 | } |
| 418 | 402 | ||
| 419 | static int s3c_cpufreq_verify(struct cpufreq_policy *policy) | ||
| 420 | { | ||
| 421 | if (policy->cpu != 0) | ||
| 422 | return -EINVAL; | ||
| 423 | |||
| 424 | return 0; | ||
| 425 | } | ||
| 426 | |||
| 427 | #ifdef CONFIG_PM | 403 | #ifdef CONFIG_PM |
| 428 | static struct cpufreq_frequency_table suspend_pll; | 404 | static struct cpufreq_frequency_table suspend_pll; |
| 429 | static unsigned int suspend_freq; | 405 | static unsigned int suspend_freq; |
| @@ -473,7 +449,6 @@ static int s3c_cpufreq_resume(struct cpufreq_policy *policy) | |||
| 473 | 449 | ||
| 474 | static struct cpufreq_driver s3c24xx_driver = { | 450 | static struct cpufreq_driver s3c24xx_driver = { |
| 475 | .flags = CPUFREQ_STICKY, | 451 | .flags = CPUFREQ_STICKY, |
| 476 | .verify = s3c_cpufreq_verify, | ||
| 477 | .target = s3c_cpufreq_target, | 452 | .target = s3c_cpufreq_target, |
| 478 | .get = s3c_cpufreq_get, | 453 | .get = s3c_cpufreq_get, |
| 479 | .init = s3c_cpufreq_init, | 454 | .init = s3c_cpufreq_init, |
diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c index 8a72b0c555f8..8bdcf32a4418 100644 --- a/drivers/cpufreq/s3c64xx-cpufreq.c +++ b/drivers/cpufreq/s3c64xx-cpufreq.c | |||
| @@ -54,14 +54,6 @@ static struct cpufreq_frequency_table s3c64xx_freq_table[] = { | |||
| 54 | }; | 54 | }; |
| 55 | #endif | 55 | #endif |
| 56 | 56 | ||
| 57 | static int s3c64xx_cpufreq_verify_speed(struct cpufreq_policy *policy) | ||
| 58 | { | ||
| 59 | if (policy->cpu != 0) | ||
| 60 | return -EINVAL; | ||
| 61 | |||
| 62 | return cpufreq_frequency_table_verify(policy, s3c64xx_freq_table); | ||
| 63 | } | ||
| 64 | |||
| 65 | static unsigned int s3c64xx_cpufreq_get_speed(unsigned int cpu) | 57 | static unsigned int s3c64xx_cpufreq_get_speed(unsigned int cpu) |
| 66 | { | 58 | { |
| 67 | if (cpu != 0) | 59 | if (cpu != 0) |
| @@ -71,26 +63,16 @@ static unsigned int s3c64xx_cpufreq_get_speed(unsigned int cpu) | |||
| 71 | } | 63 | } |
| 72 | 64 | ||
| 73 | static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy, | 65 | static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy, |
| 74 | unsigned int target_freq, | 66 | unsigned int index) |
| 75 | unsigned int relation) | ||
| 76 | { | 67 | { |
| 77 | int ret; | 68 | int ret; |
| 78 | unsigned int i; | ||
| 79 | struct cpufreq_freqs freqs; | 69 | struct cpufreq_freqs freqs; |
| 80 | struct s3c64xx_dvfs *dvfs; | 70 | struct s3c64xx_dvfs *dvfs; |
| 81 | 71 | ||
| 82 | ret = cpufreq_frequency_table_target(policy, s3c64xx_freq_table, | ||
| 83 | target_freq, relation, &i); | ||
| 84 | if (ret != 0) | ||
| 85 | return ret; | ||
| 86 | |||
| 87 | freqs.old = clk_get_rate(armclk) / 1000; | 72 | freqs.old = clk_get_rate(armclk) / 1000; |
| 88 | freqs.new = s3c64xx_freq_table[i].frequency; | 73 | freqs.new = s3c64xx_freq_table[index].frequency; |
| 89 | freqs.flags = 0; | 74 | freqs.flags = 0; |
| 90 | dvfs = &s3c64xx_dvfs_table[s3c64xx_freq_table[i].driver_data]; | 75 | dvfs = &s3c64xx_dvfs_table[s3c64xx_freq_table[index].driver_data]; |
| 91 | |||
| 92 | if (freqs.old == freqs.new) | ||
| 93 | return 0; | ||
| 94 | 76 | ||
| 95 | pr_debug("Transition %d-%dkHz\n", freqs.old, freqs.new); | 77 | pr_debug("Transition %d-%dkHz\n", freqs.old, freqs.new); |
| 96 | 78 | ||
| @@ -166,7 +148,7 @@ static void __init s3c64xx_cpufreq_config_regulator(void) | |||
| 166 | if (freq->frequency == CPUFREQ_ENTRY_INVALID) | 148 | if (freq->frequency == CPUFREQ_ENTRY_INVALID) |
| 167 | continue; | 149 | continue; |
| 168 | 150 | ||
| 169 | dvfs = &s3c64xx_dvfs_table[freq->index]; | 151 | dvfs = &s3c64xx_dvfs_table[freq->driver_data]; |
| 170 | found = 0; | 152 | found = 0; |
| 171 | 153 | ||
| 172 | for (i = 0; i < count; i++) { | 154 | for (i = 0; i < count; i++) { |
| @@ -243,15 +225,12 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy) | |||
| 243 | freq++; | 225 | freq++; |
| 244 | } | 226 | } |
| 245 | 227 | ||
| 246 | policy->cur = clk_get_rate(armclk) / 1000; | ||
| 247 | |||
| 248 | /* Datasheet says PLL stabalisation time (if we were to use | 228 | /* Datasheet says PLL stabalisation time (if we were to use |
| 249 | * the PLLs, which we don't currently) is ~300us worst case, | 229 | * the PLLs, which we don't currently) is ~300us worst case, |
| 250 | * but add some fudge. | 230 | * but add some fudge. |
| 251 | */ | 231 | */ |
| 252 | policy->cpuinfo.transition_latency = (500 * 1000) + regulator_latency; | 232 | ret = cpufreq_generic_init(policy, s3c64xx_freq_table, |
| 253 | 233 | (500 * 1000) + regulator_latency); | |
| 254 | ret = cpufreq_frequency_table_cpuinfo(policy, s3c64xx_freq_table); | ||
| 255 | if (ret != 0) { | 234 | if (ret != 0) { |
| 256 | pr_err("Failed to configure frequency table: %d\n", | 235 | pr_err("Failed to configure frequency table: %d\n", |
| 257 | ret); | 236 | ret); |
| @@ -264,8 +243,8 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy) | |||
| 264 | 243 | ||
| 265 | static struct cpufreq_driver s3c64xx_cpufreq_driver = { | 244 | static struct cpufreq_driver s3c64xx_cpufreq_driver = { |
| 266 | .flags = 0, | 245 | .flags = 0, |
| 267 | .verify = s3c64xx_cpufreq_verify_speed, | 246 | .verify = cpufreq_generic_frequency_table_verify, |
| 268 | .target = s3c64xx_cpufreq_set_target, | 247 | .target_index = s3c64xx_cpufreq_set_target, |
| 269 | .get = s3c64xx_cpufreq_get_speed, | 248 | .get = s3c64xx_cpufreq_get_speed, |
| 270 | .init = s3c64xx_cpufreq_driver_init, | 249 | .init = s3c64xx_cpufreq_driver_init, |
| 271 | .name = "s3c", | 250 | .name = "s3c", |
diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c index 5c7757073793..5978b94e0340 100644 --- a/drivers/cpufreq/s5pv210-cpufreq.c +++ b/drivers/cpufreq/s5pv210-cpufreq.c | |||
| @@ -36,16 +36,7 @@ static DEFINE_MUTEX(set_freq_lock); | |||
| 36 | /* Use 800MHz when entering sleep mode */ | 36 | /* Use 800MHz when entering sleep mode */ |
| 37 | #define SLEEP_FREQ (800 * 1000) | 37 | #define SLEEP_FREQ (800 * 1000) |
| 38 | 38 | ||
| 39 | /* | 39 | /* Tracks if cpu freqency can be updated anymore */ |
| 40 | * relation has an additional symantics other than the standard of cpufreq | ||
| 41 | * DISALBE_FURTHER_CPUFREQ: disable further access to target | ||
| 42 | * ENABLE_FURTUER_CPUFREQ: enable access to target | ||
| 43 | */ | ||
| 44 | enum cpufreq_access { | ||
| 45 | DISABLE_FURTHER_CPUFREQ = 0x10, | ||
| 46 | ENABLE_FURTHER_CPUFREQ = 0x20, | ||
| 47 | }; | ||
| 48 | |||
| 49 | static bool no_cpufreq_access; | 40 | static bool no_cpufreq_access; |
| 50 | 41 | ||
| 51 | /* | 42 | /* |
| @@ -174,14 +165,6 @@ static void s5pv210_set_refresh(enum s5pv210_dmc_port ch, unsigned long freq) | |||
| 174 | __raw_writel(tmp1, reg); | 165 | __raw_writel(tmp1, reg); |
| 175 | } | 166 | } |
| 176 | 167 | ||
| 177 | static int s5pv210_verify_speed(struct cpufreq_policy *policy) | ||
| 178 | { | ||
| 179 | if (policy->cpu) | ||
| 180 | return -EINVAL; | ||
| 181 | |||
| 182 | return cpufreq_frequency_table_verify(policy, s5pv210_freq_table); | ||
| 183 | } | ||
| 184 | |||
| 185 | static unsigned int s5pv210_getspeed(unsigned int cpu) | 168 | static unsigned int s5pv210_getspeed(unsigned int cpu) |
| 186 | { | 169 | { |
| 187 | if (cpu) | 170 | if (cpu) |
| @@ -190,12 +173,10 @@ static unsigned int s5pv210_getspeed(unsigned int cpu) | |||
| 190 | return clk_get_rate(cpu_clk) / 1000; | 173 | return clk_get_rate(cpu_clk) / 1000; |
| 191 | } | 174 | } |
| 192 | 175 | ||
| 193 | static int s5pv210_target(struct cpufreq_policy *policy, | 176 | static int s5pv210_target(struct cpufreq_policy *policy, unsigned int index) |
| 194 | unsigned int target_freq, | ||
| 195 | unsigned int relation) | ||
| 196 | { | 177 | { |
| 197 | unsigned long reg; | 178 | unsigned long reg; |
| 198 | unsigned int index, priv_index; | 179 | unsigned int priv_index; |
| 199 | unsigned int pll_changing = 0; | 180 | unsigned int pll_changing = 0; |
| 200 | unsigned int bus_speed_changing = 0; | 181 | unsigned int bus_speed_changing = 0; |
| 201 | int arm_volt, int_volt; | 182 | int arm_volt, int_volt; |
| @@ -203,9 +184,6 @@ static int s5pv210_target(struct cpufreq_policy *policy, | |||
| 203 | 184 | ||
| 204 | mutex_lock(&set_freq_lock); | 185 | mutex_lock(&set_freq_lock); |
| 205 | 186 | ||
| 206 | if (relation & ENABLE_FURTHER_CPUFREQ) | ||
| 207 | no_cpufreq_access = false; | ||
| 208 | |||
| 209 | if (no_cpufreq_access) { | 187 | if (no_cpufreq_access) { |
| 210 | #ifdef CONFIG_PM_VERBOSE | 188 | #ifdef CONFIG_PM_VERBOSE |
| 211 | pr_err("%s:%d denied access to %s as it is disabled" | 189 | pr_err("%s:%d denied access to %s as it is disabled" |
| @@ -215,27 +193,13 @@ static int s5pv210_target(struct cpufreq_policy *policy, | |||
| 215 | goto exit; | 193 | goto exit; |
| 216 | } | 194 | } |
| 217 | 195 | ||
| 218 | if (relation & DISABLE_FURTHER_CPUFREQ) | ||
| 219 | no_cpufreq_access = true; | ||
| 220 | |||
| 221 | relation &= ~(ENABLE_FURTHER_CPUFREQ | DISABLE_FURTHER_CPUFREQ); | ||
| 222 | |||
| 223 | freqs.old = s5pv210_getspeed(0); | 196 | freqs.old = s5pv210_getspeed(0); |
| 224 | |||
| 225 | if (cpufreq_frequency_table_target(policy, s5pv210_freq_table, | ||
| 226 | target_freq, relation, &index)) { | ||
| 227 | ret = -EINVAL; | ||
| 228 | goto exit; | ||
| 229 | } | ||
| 230 | |||
| 231 | freqs.new = s5pv210_freq_table[index].frequency; | 197 | freqs.new = s5pv210_freq_table[index].frequency; |
| 232 | 198 | ||
| 233 | if (freqs.new == freqs.old) | ||
| 234 | goto exit; | ||
| 235 | |||
| 236 | /* Finding current running level index */ | 199 | /* Finding current running level index */ |
| 237 | if (cpufreq_frequency_table_target(policy, s5pv210_freq_table, | 200 | if (cpufreq_frequency_table_target(policy, s5pv210_freq_table, |
| 238 | freqs.old, relation, &priv_index)) { | 201 | freqs.old, CPUFREQ_RELATION_H, |
| 202 | &priv_index)) { | ||
| 239 | ret = -EINVAL; | 203 | ret = -EINVAL; |
| 240 | goto exit; | 204 | goto exit; |
| 241 | } | 205 | } |
| @@ -551,13 +515,7 @@ static int __init s5pv210_cpu_init(struct cpufreq_policy *policy) | |||
| 551 | s5pv210_dram_conf[1].refresh = (__raw_readl(S5P_VA_DMC1 + 0x30) * 1000); | 515 | s5pv210_dram_conf[1].refresh = (__raw_readl(S5P_VA_DMC1 + 0x30) * 1000); |
| 552 | s5pv210_dram_conf[1].freq = clk_get_rate(dmc1_clk); | 516 | s5pv210_dram_conf[1].freq = clk_get_rate(dmc1_clk); |
| 553 | 517 | ||
| 554 | policy->cur = policy->min = policy->max = s5pv210_getspeed(0); | 518 | return cpufreq_generic_init(policy, s5pv210_freq_table, 40000); |
| 555 | |||
| 556 | cpufreq_frequency_table_get_attr(s5pv210_freq_table, policy->cpu); | ||
| 557 | |||
| 558 | policy->cpuinfo.transition_latency = 40000; | ||
| 559 | |||
| 560 | return cpufreq_frequency_table_cpuinfo(policy, s5pv210_freq_table); | ||
| 561 | 519 | ||
| 562 | out_dmc1: | 520 | out_dmc1: |
| 563 | clk_put(dmc0_clk); | 521 | clk_put(dmc0_clk); |
| @@ -573,16 +531,18 @@ static int s5pv210_cpufreq_notifier_event(struct notifier_block *this, | |||
| 573 | 531 | ||
| 574 | switch (event) { | 532 | switch (event) { |
| 575 | case PM_SUSPEND_PREPARE: | 533 | case PM_SUSPEND_PREPARE: |
| 576 | ret = cpufreq_driver_target(cpufreq_cpu_get(0), SLEEP_FREQ, | 534 | ret = cpufreq_driver_target(cpufreq_cpu_get(0), SLEEP_FREQ, 0); |
| 577 | DISABLE_FURTHER_CPUFREQ); | ||
| 578 | if (ret < 0) | 535 | if (ret < 0) |
| 579 | return NOTIFY_BAD; | 536 | return NOTIFY_BAD; |
| 580 | 537 | ||
| 538 | /* Disable updation of cpu frequency */ | ||
| 539 | no_cpufreq_access = true; | ||
| 581 | return NOTIFY_OK; | 540 | return NOTIFY_OK; |
| 582 | case PM_POST_RESTORE: | 541 | case PM_POST_RESTORE: |
| 583 | case PM_POST_SUSPEND: | 542 | case PM_POST_SUSPEND: |
| 584 | cpufreq_driver_target(cpufreq_cpu_get(0), SLEEP_FREQ, | 543 | /* Enable updation of cpu frequency */ |
| 585 | ENABLE_FURTHER_CPUFREQ); | 544 | no_cpufreq_access = false; |
| 545 | cpufreq_driver_target(cpufreq_cpu_get(0), SLEEP_FREQ, 0); | ||
| 586 | 546 | ||
| 587 | return NOTIFY_OK; | 547 | return NOTIFY_OK; |
| 588 | } | 548 | } |
| @@ -595,18 +555,18 @@ static int s5pv210_cpufreq_reboot_notifier_event(struct notifier_block *this, | |||
| 595 | { | 555 | { |
| 596 | int ret; | 556 | int ret; |
| 597 | 557 | ||
| 598 | ret = cpufreq_driver_target(cpufreq_cpu_get(0), SLEEP_FREQ, | 558 | ret = cpufreq_driver_target(cpufreq_cpu_get(0), SLEEP_FREQ, 0); |
| 599 | DISABLE_FURTHER_CPUFREQ); | ||
| 600 | if (ret < 0) | 559 | if (ret < 0) |
| 601 | return NOTIFY_BAD; | 560 | return NOTIFY_BAD; |
| 602 | 561 | ||
| 562 | no_cpufreq_access = true; | ||
| 603 | return NOTIFY_DONE; | 563 | return NOTIFY_DONE; |
| 604 | } | 564 | } |
| 605 | 565 | ||
| 606 | static struct cpufreq_driver s5pv210_driver = { | 566 | static struct cpufreq_driver s5pv210_driver = { |
| 607 | .flags = CPUFREQ_STICKY, | 567 | .flags = CPUFREQ_STICKY, |
| 608 | .verify = s5pv210_verify_speed, | 568 | .verify = cpufreq_generic_frequency_table_verify, |
| 609 | .target = s5pv210_target, | 569 | .target_index = s5pv210_target, |
| 610 | .get = s5pv210_getspeed, | 570 | .get = s5pv210_getspeed, |
| 611 | .init = s5pv210_cpu_init, | 571 | .init = s5pv210_cpu_init, |
| 612 | .name = "s5pv210", | 572 | .name = "s5pv210", |
diff --git a/drivers/cpufreq/sa1100-cpufreq.c b/drivers/cpufreq/sa1100-cpufreq.c index cff18e87ca58..b0da1fe40b1d 100644 --- a/drivers/cpufreq/sa1100-cpufreq.c +++ b/drivers/cpufreq/sa1100-cpufreq.c | |||
| @@ -177,36 +177,20 @@ static void sa1100_update_dram_timings(int current_speed, int new_speed) | |||
| 177 | } | 177 | } |
| 178 | } | 178 | } |
| 179 | 179 | ||
| 180 | static int sa1100_target(struct cpufreq_policy *policy, | 180 | static int sa1100_target(struct cpufreq_policy *policy, unsigned int ppcr) |
| 181 | unsigned int target_freq, | ||
| 182 | unsigned int relation) | ||
| 183 | { | 181 | { |
| 184 | unsigned int cur = sa11x0_getspeed(0); | 182 | unsigned int cur = sa11x0_getspeed(0); |
| 185 | unsigned int new_ppcr; | ||
| 186 | struct cpufreq_freqs freqs; | 183 | struct cpufreq_freqs freqs; |
| 187 | 184 | ||
| 188 | new_ppcr = sa11x0_freq_to_ppcr(target_freq); | ||
| 189 | switch (relation) { | ||
| 190 | case CPUFREQ_RELATION_L: | ||
| 191 | if (sa11x0_ppcr_to_freq(new_ppcr) > policy->max) | ||
| 192 | new_ppcr--; | ||
| 193 | break; | ||
| 194 | case CPUFREQ_RELATION_H: | ||
| 195 | if ((sa11x0_ppcr_to_freq(new_ppcr) > target_freq) && | ||
| 196 | (sa11x0_ppcr_to_freq(new_ppcr - 1) >= policy->min)) | ||
| 197 | new_ppcr--; | ||
| 198 | break; | ||
| 199 | } | ||
| 200 | |||
| 201 | freqs.old = cur; | 185 | freqs.old = cur; |
| 202 | freqs.new = sa11x0_ppcr_to_freq(new_ppcr); | 186 | freqs.new = sa11x0_freq_table[ppcr].frequency; |
| 203 | 187 | ||
| 204 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 188 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 205 | 189 | ||
| 206 | if (freqs.new > cur) | 190 | if (freqs.new > cur) |
| 207 | sa1100_update_dram_timings(cur, freqs.new); | 191 | sa1100_update_dram_timings(cur, freqs.new); |
| 208 | 192 | ||
| 209 | PPCR = new_ppcr; | 193 | PPCR = ppcr; |
| 210 | 194 | ||
| 211 | if (freqs.new < cur) | 195 | if (freqs.new < cur) |
| 212 | sa1100_update_dram_timings(cur, freqs.new); | 196 | sa1100_update_dram_timings(cur, freqs.new); |
| @@ -218,19 +202,13 @@ static int sa1100_target(struct cpufreq_policy *policy, | |||
| 218 | 202 | ||
| 219 | static int __init sa1100_cpu_init(struct cpufreq_policy *policy) | 203 | static int __init sa1100_cpu_init(struct cpufreq_policy *policy) |
| 220 | { | 204 | { |
| 221 | if (policy->cpu != 0) | 205 | return cpufreq_generic_init(policy, sa11x0_freq_table, CPUFREQ_ETERNAL); |
| 222 | return -EINVAL; | ||
| 223 | policy->cur = policy->min = policy->max = sa11x0_getspeed(0); | ||
| 224 | policy->cpuinfo.min_freq = 59000; | ||
| 225 | policy->cpuinfo.max_freq = 287000; | ||
| 226 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | ||
| 227 | return 0; | ||
| 228 | } | 206 | } |
| 229 | 207 | ||
| 230 | static struct cpufreq_driver sa1100_driver __refdata = { | 208 | static struct cpufreq_driver sa1100_driver __refdata = { |
| 231 | .flags = CPUFREQ_STICKY, | 209 | .flags = CPUFREQ_STICKY, |
| 232 | .verify = sa11x0_verify_speed, | 210 | .verify = cpufreq_generic_frequency_table_verify, |
| 233 | .target = sa1100_target, | 211 | .target_index = sa1100_target, |
| 234 | .get = sa11x0_getspeed, | 212 | .get = sa11x0_getspeed, |
| 235 | .init = sa1100_cpu_init, | 213 | .init = sa1100_cpu_init, |
| 236 | .name = "sa1100", | 214 | .name = "sa1100", |
diff --git a/drivers/cpufreq/sa1110-cpufreq.c b/drivers/cpufreq/sa1110-cpufreq.c index 39c90b6f4286..55b1818c3e49 100644 --- a/drivers/cpufreq/sa1110-cpufreq.c +++ b/drivers/cpufreq/sa1110-cpufreq.c | |||
| @@ -229,34 +229,16 @@ sdram_update_refresh(u_int cpu_khz, struct sdram_params *sdram) | |||
| 229 | /* | 229 | /* |
| 230 | * Ok, set the CPU frequency. | 230 | * Ok, set the CPU frequency. |
| 231 | */ | 231 | */ |
| 232 | static int sa1110_target(struct cpufreq_policy *policy, | 232 | static int sa1110_target(struct cpufreq_policy *policy, unsigned int ppcr) |
| 233 | unsigned int target_freq, | ||
| 234 | unsigned int relation) | ||
| 235 | { | 233 | { |
| 236 | struct sdram_params *sdram = &sdram_params; | 234 | struct sdram_params *sdram = &sdram_params; |
| 237 | struct cpufreq_freqs freqs; | 235 | struct cpufreq_freqs freqs; |
| 238 | struct sdram_info sd; | 236 | struct sdram_info sd; |
| 239 | unsigned long flags; | 237 | unsigned long flags; |
| 240 | unsigned int ppcr, unused; | 238 | unsigned int unused; |
| 241 | |||
| 242 | switch (relation) { | ||
| 243 | case CPUFREQ_RELATION_L: | ||
| 244 | ppcr = sa11x0_freq_to_ppcr(target_freq); | ||
| 245 | if (sa11x0_ppcr_to_freq(ppcr) > policy->max) | ||
| 246 | ppcr--; | ||
| 247 | break; | ||
| 248 | case CPUFREQ_RELATION_H: | ||
| 249 | ppcr = sa11x0_freq_to_ppcr(target_freq); | ||
| 250 | if (ppcr && (sa11x0_ppcr_to_freq(ppcr) > target_freq) && | ||
| 251 | (sa11x0_ppcr_to_freq(ppcr-1) >= policy->min)) | ||
| 252 | ppcr--; | ||
| 253 | break; | ||
| 254 | default: | ||
| 255 | return -EINVAL; | ||
| 256 | } | ||
| 257 | 239 | ||
| 258 | freqs.old = sa11x0_getspeed(0); | 240 | freqs.old = sa11x0_getspeed(0); |
| 259 | freqs.new = sa11x0_ppcr_to_freq(ppcr); | 241 | freqs.new = sa11x0_freq_table[ppcr].frequency; |
| 260 | 242 | ||
| 261 | sdram_calculate_timing(&sd, freqs.new, sdram); | 243 | sdram_calculate_timing(&sd, freqs.new, sdram); |
| 262 | 244 | ||
| @@ -332,21 +314,15 @@ static int sa1110_target(struct cpufreq_policy *policy, | |||
| 332 | 314 | ||
| 333 | static int __init sa1110_cpu_init(struct cpufreq_policy *policy) | 315 | static int __init sa1110_cpu_init(struct cpufreq_policy *policy) |
| 334 | { | 316 | { |
| 335 | if (policy->cpu != 0) | 317 | return cpufreq_generic_init(policy, sa11x0_freq_table, CPUFREQ_ETERNAL); |
| 336 | return -EINVAL; | ||
| 337 | policy->cur = policy->min = policy->max = sa11x0_getspeed(0); | ||
| 338 | policy->cpuinfo.min_freq = 59000; | ||
| 339 | policy->cpuinfo.max_freq = 287000; | ||
| 340 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | ||
| 341 | return 0; | ||
| 342 | } | 318 | } |
| 343 | 319 | ||
| 344 | /* sa1110_driver needs __refdata because it must remain after init registers | 320 | /* sa1110_driver needs __refdata because it must remain after init registers |
| 345 | * it with cpufreq_register_driver() */ | 321 | * it with cpufreq_register_driver() */ |
| 346 | static struct cpufreq_driver sa1110_driver __refdata = { | 322 | static struct cpufreq_driver sa1110_driver __refdata = { |
| 347 | .flags = CPUFREQ_STICKY, | 323 | .flags = CPUFREQ_STICKY, |
| 348 | .verify = sa11x0_verify_speed, | 324 | .verify = cpufreq_generic_frequency_table_verify, |
| 349 | .target = sa1110_target, | 325 | .target_index = sa1110_target, |
| 350 | .get = sa11x0_getspeed, | 326 | .get = sa11x0_getspeed, |
| 351 | .init = sa1110_cpu_init, | 327 | .init = sa1110_cpu_init, |
| 352 | .name = "sa1110", | 328 | .name = "sa1110", |
diff --git a/drivers/cpufreq/sc520_freq.c b/drivers/cpufreq/sc520_freq.c index d6f6c6f4efa7..6c86452e1737 100644 --- a/drivers/cpufreq/sc520_freq.c +++ b/drivers/cpufreq/sc520_freq.c | |||
| @@ -53,8 +53,7 @@ static unsigned int sc520_freq_get_cpu_frequency(unsigned int cpu) | |||
| 53 | } | 53 | } |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | static void sc520_freq_set_cpu_state(struct cpufreq_policy *policy, | 56 | static int sc520_freq_target(struct cpufreq_policy *policy, unsigned int state) |
| 57 | unsigned int state) | ||
| 58 | { | 57 | { |
| 59 | 58 | ||
| 60 | struct cpufreq_freqs freqs; | 59 | struct cpufreq_freqs freqs; |
| @@ -76,29 +75,10 @@ static void sc520_freq_set_cpu_state(struct cpufreq_policy *policy, | |||
| 76 | local_irq_enable(); | 75 | local_irq_enable(); |
| 77 | 76 | ||
| 78 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 77 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 79 | }; | ||
| 80 | |||
| 81 | static int sc520_freq_verify(struct cpufreq_policy *policy) | ||
| 82 | { | ||
| 83 | return cpufreq_frequency_table_verify(policy, &sc520_freq_table[0]); | ||
| 84 | } | ||
| 85 | |||
| 86 | static int sc520_freq_target(struct cpufreq_policy *policy, | ||
| 87 | unsigned int target_freq, | ||
| 88 | unsigned int relation) | ||
| 89 | { | ||
| 90 | unsigned int newstate = 0; | ||
| 91 | |||
| 92 | if (cpufreq_frequency_table_target(policy, sc520_freq_table, | ||
| 93 | target_freq, relation, &newstate)) | ||
| 94 | return -EINVAL; | ||
| 95 | |||
| 96 | sc520_freq_set_cpu_state(policy, newstate); | ||
| 97 | 78 | ||
| 98 | return 0; | 79 | return 0; |
| 99 | } | 80 | } |
| 100 | 81 | ||
| 101 | |||
| 102 | /* | 82 | /* |
| 103 | * Module init and exit code | 83 | * Module init and exit code |
| 104 | */ | 84 | */ |
| @@ -106,7 +86,6 @@ static int sc520_freq_target(struct cpufreq_policy *policy, | |||
| 106 | static int sc520_freq_cpu_init(struct cpufreq_policy *policy) | 86 | static int sc520_freq_cpu_init(struct cpufreq_policy *policy) |
| 107 | { | 87 | { |
| 108 | struct cpuinfo_x86 *c = &cpu_data(0); | 88 | struct cpuinfo_x86 *c = &cpu_data(0); |
| 109 | int result; | ||
| 110 | 89 | ||
| 111 | /* capability check */ | 90 | /* capability check */ |
| 112 | if (c->x86_vendor != X86_VENDOR_AMD || | 91 | if (c->x86_vendor != X86_VENDOR_AMD || |
| @@ -115,39 +94,19 @@ static int sc520_freq_cpu_init(struct cpufreq_policy *policy) | |||
| 115 | 94 | ||
| 116 | /* cpuinfo and default policy values */ | 95 | /* cpuinfo and default policy values */ |
| 117 | policy->cpuinfo.transition_latency = 1000000; /* 1ms */ | 96 | policy->cpuinfo.transition_latency = 1000000; /* 1ms */ |
| 118 | policy->cur = sc520_freq_get_cpu_frequency(0); | ||
| 119 | |||
| 120 | result = cpufreq_frequency_table_cpuinfo(policy, sc520_freq_table); | ||
| 121 | if (result) | ||
| 122 | return result; | ||
| 123 | 97 | ||
| 124 | cpufreq_frequency_table_get_attr(sc520_freq_table, policy->cpu); | 98 | return cpufreq_table_validate_and_show(policy, sc520_freq_table); |
| 125 | |||
| 126 | return 0; | ||
| 127 | } | ||
| 128 | |||
| 129 | |||
| 130 | static int sc520_freq_cpu_exit(struct cpufreq_policy *policy) | ||
| 131 | { | ||
| 132 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 133 | return 0; | ||
| 134 | } | 99 | } |
| 135 | 100 | ||
| 136 | 101 | ||
| 137 | static struct freq_attr *sc520_freq_attr[] = { | ||
| 138 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 139 | NULL, | ||
| 140 | }; | ||
| 141 | |||
| 142 | |||
| 143 | static struct cpufreq_driver sc520_freq_driver = { | 102 | static struct cpufreq_driver sc520_freq_driver = { |
| 144 | .get = sc520_freq_get_cpu_frequency, | 103 | .get = sc520_freq_get_cpu_frequency, |
| 145 | .verify = sc520_freq_verify, | 104 | .verify = cpufreq_generic_frequency_table_verify, |
| 146 | .target = sc520_freq_target, | 105 | .target_index = sc520_freq_target, |
| 147 | .init = sc520_freq_cpu_init, | 106 | .init = sc520_freq_cpu_init, |
| 148 | .exit = sc520_freq_cpu_exit, | 107 | .exit = cpufreq_generic_exit, |
| 149 | .name = "sc520_freq", | 108 | .name = "sc520_freq", |
| 150 | .attr = sc520_freq_attr, | 109 | .attr = cpufreq_generic_attr, |
| 151 | }; | 110 | }; |
| 152 | 111 | ||
| 153 | static const struct x86_cpu_id sc520_ids[] = { | 112 | static const struct x86_cpu_id sc520_ids[] = { |
diff --git a/drivers/cpufreq/sh-cpufreq.c b/drivers/cpufreq/sh-cpufreq.c index ffc6d24b0cfb..387af12503a6 100644 --- a/drivers/cpufreq/sh-cpufreq.c +++ b/drivers/cpufreq/sh-cpufreq.c | |||
| @@ -87,15 +87,12 @@ static int sh_cpufreq_verify(struct cpufreq_policy *policy) | |||
| 87 | if (freq_table) | 87 | if (freq_table) |
| 88 | return cpufreq_frequency_table_verify(policy, freq_table); | 88 | return cpufreq_frequency_table_verify(policy, freq_table); |
| 89 | 89 | ||
| 90 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, | 90 | cpufreq_verify_within_cpu_limits(policy); |
| 91 | policy->cpuinfo.max_freq); | ||
| 92 | 91 | ||
| 93 | policy->min = (clk_round_rate(cpuclk, 1) + 500) / 1000; | 92 | policy->min = (clk_round_rate(cpuclk, 1) + 500) / 1000; |
| 94 | policy->max = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000; | 93 | policy->max = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000; |
| 95 | 94 | ||
| 96 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, | 95 | cpufreq_verify_within_cpu_limits(policy); |
| 97 | policy->cpuinfo.max_freq); | ||
| 98 | |||
| 99 | return 0; | 96 | return 0; |
| 100 | } | 97 | } |
| 101 | 98 | ||
| @@ -114,15 +111,13 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy) | |||
| 114 | return PTR_ERR(cpuclk); | 111 | return PTR_ERR(cpuclk); |
| 115 | } | 112 | } |
| 116 | 113 | ||
| 117 | policy->cur = sh_cpufreq_get(cpu); | ||
| 118 | |||
| 119 | freq_table = cpuclk->nr_freqs ? cpuclk->freq_table : NULL; | 114 | freq_table = cpuclk->nr_freqs ? cpuclk->freq_table : NULL; |
| 120 | if (freq_table) { | 115 | if (freq_table) { |
| 121 | int result; | 116 | int result; |
| 122 | 117 | ||
| 123 | result = cpufreq_frequency_table_cpuinfo(policy, freq_table); | 118 | result = cpufreq_table_validate_and_show(policy, freq_table); |
| 124 | if (!result) | 119 | if (result) |
| 125 | cpufreq_frequency_table_get_attr(freq_table, cpu); | 120 | return result; |
| 126 | } else { | 121 | } else { |
| 127 | dev_notice(dev, "no frequency table found, falling back " | 122 | dev_notice(dev, "no frequency table found, falling back " |
| 128 | "to rate rounding.\n"); | 123 | "to rate rounding.\n"); |
| @@ -154,11 +149,6 @@ static int sh_cpufreq_cpu_exit(struct cpufreq_policy *policy) | |||
| 154 | return 0; | 149 | return 0; |
| 155 | } | 150 | } |
| 156 | 151 | ||
| 157 | static struct freq_attr *sh_freq_attr[] = { | ||
| 158 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 159 | NULL, | ||
| 160 | }; | ||
| 161 | |||
| 162 | static struct cpufreq_driver sh_cpufreq_driver = { | 152 | static struct cpufreq_driver sh_cpufreq_driver = { |
| 163 | .name = "sh", | 153 | .name = "sh", |
| 164 | .get = sh_cpufreq_get, | 154 | .get = sh_cpufreq_get, |
| @@ -166,7 +156,7 @@ static struct cpufreq_driver sh_cpufreq_driver = { | |||
| 166 | .verify = sh_cpufreq_verify, | 156 | .verify = sh_cpufreq_verify, |
| 167 | .init = sh_cpufreq_cpu_init, | 157 | .init = sh_cpufreq_cpu_init, |
| 168 | .exit = sh_cpufreq_cpu_exit, | 158 | .exit = sh_cpufreq_cpu_exit, |
| 169 | .attr = sh_freq_attr, | 159 | .attr = cpufreq_generic_attr, |
| 170 | }; | 160 | }; |
| 171 | 161 | ||
| 172 | static int __init sh_cpufreq_module_init(void) | 162 | static int __init sh_cpufreq_module_init(void) |
diff --git a/drivers/cpufreq/sparc-us2e-cpufreq.c b/drivers/cpufreq/sparc-us2e-cpufreq.c index cf5bc2ca16fa..3bf5b8f03661 100644 --- a/drivers/cpufreq/sparc-us2e-cpufreq.c +++ b/drivers/cpufreq/sparc-us2e-cpufreq.c | |||
| @@ -245,8 +245,7 @@ static unsigned int us2e_freq_get(unsigned int cpu) | |||
| 245 | return clock_tick / estar_to_divisor(estar); | 245 | return clock_tick / estar_to_divisor(estar); |
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | static void us2e_set_cpu_divider_index(struct cpufreq_policy *policy, | 248 | static int us2e_freq_target(struct cpufreq_policy *policy, unsigned int index) |
| 249 | unsigned int index) | ||
| 250 | { | 249 | { |
| 251 | unsigned int cpu = policy->cpu; | 250 | unsigned int cpu = policy->cpu; |
| 252 | unsigned long new_bits, new_freq; | 251 | unsigned long new_bits, new_freq; |
| @@ -277,30 +276,10 @@ static void us2e_set_cpu_divider_index(struct cpufreq_policy *policy, | |||
| 277 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 276 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 278 | 277 | ||
| 279 | set_cpus_allowed_ptr(current, &cpus_allowed); | 278 | set_cpus_allowed_ptr(current, &cpus_allowed); |
| 280 | } | ||
| 281 | |||
| 282 | static int us2e_freq_target(struct cpufreq_policy *policy, | ||
| 283 | unsigned int target_freq, | ||
| 284 | unsigned int relation) | ||
| 285 | { | ||
| 286 | unsigned int new_index = 0; | ||
| 287 | |||
| 288 | if (cpufreq_frequency_table_target(policy, | ||
| 289 | &us2e_freq_table[policy->cpu].table[0], | ||
| 290 | target_freq, relation, &new_index)) | ||
| 291 | return -EINVAL; | ||
| 292 | |||
| 293 | us2e_set_cpu_divider_index(policy, new_index); | ||
| 294 | 279 | ||
| 295 | return 0; | 280 | return 0; |
| 296 | } | 281 | } |
| 297 | 282 | ||
| 298 | static int us2e_freq_verify(struct cpufreq_policy *policy) | ||
| 299 | { | ||
| 300 | return cpufreq_frequency_table_verify(policy, | ||
| 301 | &us2e_freq_table[policy->cpu].table[0]); | ||
| 302 | } | ||
| 303 | |||
| 304 | static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy) | 283 | static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy) |
| 305 | { | 284 | { |
| 306 | unsigned int cpu = policy->cpu; | 285 | unsigned int cpu = policy->cpu; |
| @@ -324,13 +303,15 @@ static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy) | |||
| 324 | policy->cpuinfo.transition_latency = 0; | 303 | policy->cpuinfo.transition_latency = 0; |
| 325 | policy->cur = clock_tick; | 304 | policy->cur = clock_tick; |
| 326 | 305 | ||
| 327 | return cpufreq_frequency_table_cpuinfo(policy, table); | 306 | return cpufreq_table_validate_and_show(policy, table); |
| 328 | } | 307 | } |
| 329 | 308 | ||
| 330 | static int us2e_freq_cpu_exit(struct cpufreq_policy *policy) | 309 | static int us2e_freq_cpu_exit(struct cpufreq_policy *policy) |
| 331 | { | 310 | { |
| 332 | if (cpufreq_us2e_driver) | 311 | if (cpufreq_us2e_driver) { |
| 333 | us2e_set_cpu_divider_index(policy, 0); | 312 | cpufreq_frequency_table_put_attr(policy->cpu); |
| 313 | us2e_freq_target(policy, 0); | ||
| 314 | } | ||
| 334 | 315 | ||
| 335 | return 0; | 316 | return 0; |
| 336 | } | 317 | } |
| @@ -361,8 +342,8 @@ static int __init us2e_freq_init(void) | |||
| 361 | goto err_out; | 342 | goto err_out; |
| 362 | 343 | ||
| 363 | driver->init = us2e_freq_cpu_init; | 344 | driver->init = us2e_freq_cpu_init; |
| 364 | driver->verify = us2e_freq_verify; | 345 | driver->verify = cpufreq_generic_frequency_table_verify; |
| 365 | driver->target = us2e_freq_target; | 346 | driver->target_index = us2e_freq_target; |
| 366 | driver->get = us2e_freq_get; | 347 | driver->get = us2e_freq_get; |
| 367 | driver->exit = us2e_freq_cpu_exit; | 348 | driver->exit = us2e_freq_cpu_exit; |
| 368 | strcpy(driver->name, "UltraSPARC-IIe"); | 349 | strcpy(driver->name, "UltraSPARC-IIe"); |
diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c index ac76b489979d..2e54d55915df 100644 --- a/drivers/cpufreq/sparc-us3-cpufreq.c +++ b/drivers/cpufreq/sparc-us3-cpufreq.c | |||
| @@ -93,8 +93,7 @@ static unsigned int us3_freq_get(unsigned int cpu) | |||
| 93 | return ret; | 93 | return ret; |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | static void us3_set_cpu_divider_index(struct cpufreq_policy *policy, | 96 | static int us3_freq_target(struct cpufreq_policy *policy, unsigned int index) |
| 97 | unsigned int index) | ||
| 98 | { | 97 | { |
| 99 | unsigned int cpu = policy->cpu; | 98 | unsigned int cpu = policy->cpu; |
| 100 | unsigned long new_bits, new_freq, reg; | 99 | unsigned long new_bits, new_freq, reg; |
| @@ -136,32 +135,10 @@ static void us3_set_cpu_divider_index(struct cpufreq_policy *policy, | |||
| 136 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 135 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 137 | 136 | ||
| 138 | set_cpus_allowed_ptr(current, &cpus_allowed); | 137 | set_cpus_allowed_ptr(current, &cpus_allowed); |
| 139 | } | ||
| 140 | |||
| 141 | static int us3_freq_target(struct cpufreq_policy *policy, | ||
| 142 | unsigned int target_freq, | ||
| 143 | unsigned int relation) | ||
| 144 | { | ||
| 145 | unsigned int new_index = 0; | ||
| 146 | |||
| 147 | if (cpufreq_frequency_table_target(policy, | ||
| 148 | &us3_freq_table[policy->cpu].table[0], | ||
| 149 | target_freq, | ||
| 150 | relation, | ||
| 151 | &new_index)) | ||
| 152 | return -EINVAL; | ||
| 153 | |||
| 154 | us3_set_cpu_divider_index(policy, new_index); | ||
| 155 | 138 | ||
| 156 | return 0; | 139 | return 0; |
| 157 | } | 140 | } |
| 158 | 141 | ||
| 159 | static int us3_freq_verify(struct cpufreq_policy *policy) | ||
| 160 | { | ||
| 161 | return cpufreq_frequency_table_verify(policy, | ||
| 162 | &us3_freq_table[policy->cpu].table[0]); | ||
| 163 | } | ||
| 164 | |||
| 165 | static int __init us3_freq_cpu_init(struct cpufreq_policy *policy) | 142 | static int __init us3_freq_cpu_init(struct cpufreq_policy *policy) |
| 166 | { | 143 | { |
| 167 | unsigned int cpu = policy->cpu; | 144 | unsigned int cpu = policy->cpu; |
| @@ -181,13 +158,15 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy) | |||
| 181 | policy->cpuinfo.transition_latency = 0; | 158 | policy->cpuinfo.transition_latency = 0; |
| 182 | policy->cur = clock_tick; | 159 | policy->cur = clock_tick; |
| 183 | 160 | ||
| 184 | return cpufreq_frequency_table_cpuinfo(policy, table); | 161 | return cpufreq_table_validate_and_show(policy, table); |
| 185 | } | 162 | } |
| 186 | 163 | ||
| 187 | static int us3_freq_cpu_exit(struct cpufreq_policy *policy) | 164 | static int us3_freq_cpu_exit(struct cpufreq_policy *policy) |
| 188 | { | 165 | { |
| 189 | if (cpufreq_us3_driver) | 166 | if (cpufreq_us3_driver) { |
| 190 | us3_set_cpu_divider_index(policy, 0); | 167 | cpufreq_frequency_table_put_attr(policy->cpu); |
| 168 | us3_freq_target(policy, 0); | ||
| 169 | } | ||
| 191 | 170 | ||
| 192 | return 0; | 171 | return 0; |
| 193 | } | 172 | } |
| @@ -222,8 +201,8 @@ static int __init us3_freq_init(void) | |||
| 222 | goto err_out; | 201 | goto err_out; |
| 223 | 202 | ||
| 224 | driver->init = us3_freq_cpu_init; | 203 | driver->init = us3_freq_cpu_init; |
| 225 | driver->verify = us3_freq_verify; | 204 | driver->verify = cpufreq_generic_frequency_table_verify; |
| 226 | driver->target = us3_freq_target; | 205 | driver->target_index = us3_freq_target; |
| 227 | driver->get = us3_freq_get; | 206 | driver->get = us3_freq_get; |
| 228 | driver->exit = us3_freq_cpu_exit; | 207 | driver->exit = us3_freq_cpu_exit; |
| 229 | strcpy(driver->name, "UltraSPARC-III"); | 208 | strcpy(driver->name, "UltraSPARC-III"); |
diff --git a/drivers/cpufreq/spear-cpufreq.c b/drivers/cpufreq/spear-cpufreq.c index 3f418166ce02..11a65be3fd76 100644 --- a/drivers/cpufreq/spear-cpufreq.c +++ b/drivers/cpufreq/spear-cpufreq.c | |||
| @@ -30,11 +30,6 @@ static struct { | |||
| 30 | u32 cnt; | 30 | u32 cnt; |
| 31 | } spear_cpufreq; | 31 | } spear_cpufreq; |
| 32 | 32 | ||
| 33 | static int spear_cpufreq_verify(struct cpufreq_policy *policy) | ||
| 34 | { | ||
| 35 | return cpufreq_frequency_table_verify(policy, spear_cpufreq.freq_tbl); | ||
| 36 | } | ||
| 37 | |||
| 38 | static unsigned int spear_cpufreq_get(unsigned int cpu) | 33 | static unsigned int spear_cpufreq_get(unsigned int cpu) |
| 39 | { | 34 | { |
| 40 | return clk_get_rate(spear_cpufreq.clk) / 1000; | 35 | return clk_get_rate(spear_cpufreq.clk) / 1000; |
| @@ -110,20 +105,16 @@ static int spear1340_set_cpu_rate(struct clk *sys_pclk, unsigned long newfreq) | |||
| 110 | } | 105 | } |
| 111 | 106 | ||
| 112 | static int spear_cpufreq_target(struct cpufreq_policy *policy, | 107 | static int spear_cpufreq_target(struct cpufreq_policy *policy, |
| 113 | unsigned int target_freq, unsigned int relation) | 108 | unsigned int index) |
| 114 | { | 109 | { |
| 115 | struct cpufreq_freqs freqs; | 110 | struct cpufreq_freqs freqs; |
| 116 | long newfreq; | 111 | long newfreq; |
| 117 | struct clk *srcclk; | 112 | struct clk *srcclk; |
| 118 | int index, ret, mult = 1; | 113 | int ret, mult = 1; |
| 119 | |||
| 120 | if (cpufreq_frequency_table_target(policy, spear_cpufreq.freq_tbl, | ||
| 121 | target_freq, relation, &index)) | ||
| 122 | return -EINVAL; | ||
| 123 | 114 | ||
| 124 | freqs.old = spear_cpufreq_get(0); | 115 | freqs.old = spear_cpufreq_get(0); |
| 125 | |||
| 126 | newfreq = spear_cpufreq.freq_tbl[index].frequency * 1000; | 116 | newfreq = spear_cpufreq.freq_tbl[index].frequency * 1000; |
| 117 | |||
| 127 | if (of_machine_is_compatible("st,spear1340")) { | 118 | if (of_machine_is_compatible("st,spear1340")) { |
| 128 | /* | 119 | /* |
| 129 | * SPEAr1340 is special in the sense that due to the possibility | 120 | * SPEAr1340 is special in the sense that due to the possibility |
| @@ -176,43 +167,19 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy, | |||
| 176 | 167 | ||
| 177 | static int spear_cpufreq_init(struct cpufreq_policy *policy) | 168 | static int spear_cpufreq_init(struct cpufreq_policy *policy) |
| 178 | { | 169 | { |
| 179 | int ret; | 170 | return cpufreq_generic_init(policy, spear_cpufreq.freq_tbl, |
| 180 | 171 | spear_cpufreq.transition_latency); | |
| 181 | ret = cpufreq_frequency_table_cpuinfo(policy, spear_cpufreq.freq_tbl); | ||
| 182 | if (ret) { | ||
| 183 | pr_err("cpufreq_frequency_table_cpuinfo() failed"); | ||
| 184 | return ret; | ||
| 185 | } | ||
| 186 | |||
| 187 | cpufreq_frequency_table_get_attr(spear_cpufreq.freq_tbl, policy->cpu); | ||
| 188 | policy->cpuinfo.transition_latency = spear_cpufreq.transition_latency; | ||
| 189 | policy->cur = spear_cpufreq_get(0); | ||
| 190 | |||
| 191 | cpumask_setall(policy->cpus); | ||
| 192 | |||
| 193 | return 0; | ||
| 194 | } | ||
| 195 | |||
| 196 | static int spear_cpufreq_exit(struct cpufreq_policy *policy) | ||
| 197 | { | ||
| 198 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 199 | return 0; | ||
| 200 | } | 172 | } |
| 201 | 173 | ||
| 202 | static struct freq_attr *spear_cpufreq_attr[] = { | ||
| 203 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 204 | NULL, | ||
| 205 | }; | ||
| 206 | |||
| 207 | static struct cpufreq_driver spear_cpufreq_driver = { | 174 | static struct cpufreq_driver spear_cpufreq_driver = { |
| 208 | .name = "cpufreq-spear", | 175 | .name = "cpufreq-spear", |
| 209 | .flags = CPUFREQ_STICKY, | 176 | .flags = CPUFREQ_STICKY, |
| 210 | .verify = spear_cpufreq_verify, | 177 | .verify = cpufreq_generic_frequency_table_verify, |
| 211 | .target = spear_cpufreq_target, | 178 | .target_index = spear_cpufreq_target, |
| 212 | .get = spear_cpufreq_get, | 179 | .get = spear_cpufreq_get, |
| 213 | .init = spear_cpufreq_init, | 180 | .init = spear_cpufreq_init, |
| 214 | .exit = spear_cpufreq_exit, | 181 | .exit = cpufreq_generic_exit, |
| 215 | .attr = spear_cpufreq_attr, | 182 | .attr = cpufreq_generic_attr, |
| 216 | }; | 183 | }; |
| 217 | 184 | ||
| 218 | static int spear_cpufreq_driver_init(void) | 185 | static int spear_cpufreq_driver_init(void) |
diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c index f897d5105842..c51ec8c0e3a8 100644 --- a/drivers/cpufreq/speedstep-centrino.c +++ b/drivers/cpufreq/speedstep-centrino.c | |||
| @@ -343,9 +343,7 @@ static unsigned int get_cur_freq(unsigned int cpu) | |||
| 343 | static int centrino_cpu_init(struct cpufreq_policy *policy) | 343 | static int centrino_cpu_init(struct cpufreq_policy *policy) |
| 344 | { | 344 | { |
| 345 | struct cpuinfo_x86 *cpu = &cpu_data(policy->cpu); | 345 | struct cpuinfo_x86 *cpu = &cpu_data(policy->cpu); |
| 346 | unsigned freq; | ||
| 347 | unsigned l, h; | 346 | unsigned l, h; |
| 348 | int ret; | ||
| 349 | int i; | 347 | int i; |
| 350 | 348 | ||
| 351 | /* Only Intel makes Enhanced Speedstep-capable CPUs */ | 349 | /* Only Intel makes Enhanced Speedstep-capable CPUs */ |
| @@ -373,9 +371,8 @@ static int centrino_cpu_init(struct cpufreq_policy *policy) | |||
| 373 | return -ENODEV; | 371 | return -ENODEV; |
| 374 | } | 372 | } |
| 375 | 373 | ||
| 376 | if (centrino_cpu_init_table(policy)) { | 374 | if (centrino_cpu_init_table(policy)) |
| 377 | return -ENODEV; | 375 | return -ENODEV; |
| 378 | } | ||
| 379 | 376 | ||
| 380 | /* Check to see if Enhanced SpeedStep is enabled, and try to | 377 | /* Check to see if Enhanced SpeedStep is enabled, and try to |
| 381 | enable it if not. */ | 378 | enable it if not. */ |
| @@ -395,22 +392,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy) | |||
| 395 | } | 392 | } |
| 396 | } | 393 | } |
| 397 | 394 | ||
| 398 | freq = get_cur_freq(policy->cpu); | ||
| 399 | policy->cpuinfo.transition_latency = 10000; | 395 | policy->cpuinfo.transition_latency = 10000; |
| 400 | /* 10uS transition latency */ | 396 | /* 10uS transition latency */ |
| 401 | policy->cur = freq; | ||
| 402 | |||
| 403 | pr_debug("centrino_cpu_init: cur=%dkHz\n", policy->cur); | ||
| 404 | 397 | ||
| 405 | ret = cpufreq_frequency_table_cpuinfo(policy, | 398 | return cpufreq_table_validate_and_show(policy, |
| 406 | per_cpu(centrino_model, policy->cpu)->op_points); | 399 | per_cpu(centrino_model, policy->cpu)->op_points); |
| 407 | if (ret) | ||
| 408 | return (ret); | ||
| 409 | |||
| 410 | cpufreq_frequency_table_get_attr( | ||
| 411 | per_cpu(centrino_model, policy->cpu)->op_points, policy->cpu); | ||
| 412 | |||
| 413 | return 0; | ||
| 414 | } | 400 | } |
| 415 | 401 | ||
| 416 | static int centrino_cpu_exit(struct cpufreq_policy *policy) | 402 | static int centrino_cpu_exit(struct cpufreq_policy *policy) |
| @@ -428,36 +414,19 @@ static int centrino_cpu_exit(struct cpufreq_policy *policy) | |||
| 428 | } | 414 | } |
| 429 | 415 | ||
| 430 | /** | 416 | /** |
| 431 | * centrino_verify - verifies a new CPUFreq policy | ||
| 432 | * @policy: new policy | ||
| 433 | * | ||
| 434 | * Limit must be within this model's frequency range at least one | ||
| 435 | * border included. | ||
| 436 | */ | ||
| 437 | static int centrino_verify (struct cpufreq_policy *policy) | ||
| 438 | { | ||
| 439 | return cpufreq_frequency_table_verify(policy, | ||
| 440 | per_cpu(centrino_model, policy->cpu)->op_points); | ||
| 441 | } | ||
| 442 | |||
| 443 | /** | ||
| 444 | * centrino_setpolicy - set a new CPUFreq policy | 417 | * centrino_setpolicy - set a new CPUFreq policy |
| 445 | * @policy: new policy | 418 | * @policy: new policy |
| 446 | * @target_freq: the target frequency | 419 | * @index: index of target frequency |
| 447 | * @relation: how that frequency relates to achieved frequency | ||
| 448 | * (CPUFREQ_RELATION_L or CPUFREQ_RELATION_H) | ||
| 449 | * | 420 | * |
| 450 | * Sets a new CPUFreq policy. | 421 | * Sets a new CPUFreq policy. |
| 451 | */ | 422 | */ |
| 452 | static int centrino_target (struct cpufreq_policy *policy, | 423 | static int centrino_target(struct cpufreq_policy *policy, unsigned int index) |
| 453 | unsigned int target_freq, | ||
| 454 | unsigned int relation) | ||
| 455 | { | 424 | { |
| 456 | unsigned int newstate = 0; | ||
| 457 | unsigned int msr, oldmsr = 0, h = 0, cpu = policy->cpu; | 425 | unsigned int msr, oldmsr = 0, h = 0, cpu = policy->cpu; |
| 458 | struct cpufreq_freqs freqs; | 426 | struct cpufreq_freqs freqs; |
| 459 | int retval = 0; | 427 | int retval = 0; |
| 460 | unsigned int j, first_cpu, tmp; | 428 | unsigned int j, first_cpu, tmp; |
| 429 | struct cpufreq_frequency_table *op_points; | ||
| 461 | cpumask_var_t covered_cpus; | 430 | cpumask_var_t covered_cpus; |
| 462 | 431 | ||
| 463 | if (unlikely(!zalloc_cpumask_var(&covered_cpus, GFP_KERNEL))) | 432 | if (unlikely(!zalloc_cpumask_var(&covered_cpus, GFP_KERNEL))) |
| @@ -468,16 +437,8 @@ static int centrino_target (struct cpufreq_policy *policy, | |||
| 468 | goto out; | 437 | goto out; |
| 469 | } | 438 | } |
| 470 | 439 | ||
| 471 | if (unlikely(cpufreq_frequency_table_target(policy, | ||
| 472 | per_cpu(centrino_model, cpu)->op_points, | ||
| 473 | target_freq, | ||
| 474 | relation, | ||
| 475 | &newstate))) { | ||
| 476 | retval = -EINVAL; | ||
| 477 | goto out; | ||
| 478 | } | ||
| 479 | |||
| 480 | first_cpu = 1; | 440 | first_cpu = 1; |
| 441 | op_points = &per_cpu(centrino_model, cpu)->op_points[index]; | ||
| 481 | for_each_cpu(j, policy->cpus) { | 442 | for_each_cpu(j, policy->cpus) { |
| 482 | int good_cpu; | 443 | int good_cpu; |
| 483 | 444 | ||
| @@ -501,7 +462,7 @@ static int centrino_target (struct cpufreq_policy *policy, | |||
| 501 | break; | 462 | break; |
| 502 | } | 463 | } |
| 503 | 464 | ||
| 504 | msr = per_cpu(centrino_model, cpu)->op_points[newstate].driver_data; | 465 | msr = op_points->driver_data; |
| 505 | 466 | ||
| 506 | if (first_cpu) { | 467 | if (first_cpu) { |
| 507 | rdmsr_on_cpu(good_cpu, MSR_IA32_PERF_CTL, &oldmsr, &h); | 468 | rdmsr_on_cpu(good_cpu, MSR_IA32_PERF_CTL, &oldmsr, &h); |
| @@ -516,7 +477,8 @@ static int centrino_target (struct cpufreq_policy *policy, | |||
| 516 | freqs.new = extract_clock(msr, cpu, 0); | 477 | freqs.new = extract_clock(msr, cpu, 0); |
| 517 | 478 | ||
| 518 | pr_debug("target=%dkHz old=%d new=%d msr=%04x\n", | 479 | pr_debug("target=%dkHz old=%d new=%d msr=%04x\n", |
| 519 | target_freq, freqs.old, freqs.new, msr); | 480 | op_points->frequency, freqs.old, freqs.new, |
| 481 | msr); | ||
| 520 | 482 | ||
| 521 | cpufreq_notify_transition(policy, &freqs, | 483 | cpufreq_notify_transition(policy, &freqs, |
| 522 | CPUFREQ_PRECHANGE); | 484 | CPUFREQ_PRECHANGE); |
| @@ -561,20 +523,15 @@ out: | |||
| 561 | return retval; | 523 | return retval; |
| 562 | } | 524 | } |
| 563 | 525 | ||
| 564 | static struct freq_attr* centrino_attr[] = { | ||
| 565 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 566 | NULL, | ||
| 567 | }; | ||
| 568 | |||
| 569 | static struct cpufreq_driver centrino_driver = { | 526 | static struct cpufreq_driver centrino_driver = { |
| 570 | .name = "centrino", /* should be speedstep-centrino, | 527 | .name = "centrino", /* should be speedstep-centrino, |
| 571 | but there's a 16 char limit */ | 528 | but there's a 16 char limit */ |
| 572 | .init = centrino_cpu_init, | 529 | .init = centrino_cpu_init, |
| 573 | .exit = centrino_cpu_exit, | 530 | .exit = centrino_cpu_exit, |
| 574 | .verify = centrino_verify, | 531 | .verify = cpufreq_generic_frequency_table_verify, |
| 575 | .target = centrino_target, | 532 | .target_index = centrino_target, |
| 576 | .get = get_cur_freq, | 533 | .get = get_cur_freq, |
| 577 | .attr = centrino_attr, | 534 | .attr = cpufreq_generic_attr, |
| 578 | }; | 535 | }; |
| 579 | 536 | ||
| 580 | /* | 537 | /* |
diff --git a/drivers/cpufreq/speedstep-ich.c b/drivers/cpufreq/speedstep-ich.c index 5355abb69afc..707721ebb853 100644 --- a/drivers/cpufreq/speedstep-ich.c +++ b/drivers/cpufreq/speedstep-ich.c | |||
| @@ -251,36 +251,24 @@ static unsigned int speedstep_get(unsigned int cpu) | |||
| 251 | /** | 251 | /** |
| 252 | * speedstep_target - set a new CPUFreq policy | 252 | * speedstep_target - set a new CPUFreq policy |
| 253 | * @policy: new policy | 253 | * @policy: new policy |
| 254 | * @target_freq: the target frequency | 254 | * @index: index of target frequency |
| 255 | * @relation: how that frequency relates to achieved frequency | ||
| 256 | * (CPUFREQ_RELATION_L or CPUFREQ_RELATION_H) | ||
| 257 | * | 255 | * |
| 258 | * Sets a new CPUFreq policy. | 256 | * Sets a new CPUFreq policy. |
| 259 | */ | 257 | */ |
| 260 | static int speedstep_target(struct cpufreq_policy *policy, | 258 | static int speedstep_target(struct cpufreq_policy *policy, unsigned int index) |
| 261 | unsigned int target_freq, | ||
| 262 | unsigned int relation) | ||
| 263 | { | 259 | { |
| 264 | unsigned int newstate = 0, policy_cpu; | 260 | unsigned int policy_cpu; |
| 265 | struct cpufreq_freqs freqs; | 261 | struct cpufreq_freqs freqs; |
| 266 | 262 | ||
| 267 | if (cpufreq_frequency_table_target(policy, &speedstep_freqs[0], | ||
| 268 | target_freq, relation, &newstate)) | ||
| 269 | return -EINVAL; | ||
| 270 | |||
| 271 | policy_cpu = cpumask_any_and(policy->cpus, cpu_online_mask); | 263 | policy_cpu = cpumask_any_and(policy->cpus, cpu_online_mask); |
| 272 | freqs.old = speedstep_get(policy_cpu); | 264 | freqs.old = speedstep_get(policy_cpu); |
| 273 | freqs.new = speedstep_freqs[newstate].frequency; | 265 | freqs.new = speedstep_freqs[index].frequency; |
| 274 | 266 | ||
| 275 | pr_debug("transiting from %u to %u kHz\n", freqs.old, freqs.new); | 267 | pr_debug("transiting from %u to %u kHz\n", freqs.old, freqs.new); |
| 276 | 268 | ||
| 277 | /* no transition necessary */ | ||
| 278 | if (freqs.old == freqs.new) | ||
| 279 | return 0; | ||
| 280 | |||
| 281 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 269 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 282 | 270 | ||
| 283 | smp_call_function_single(policy_cpu, _speedstep_set_state, &newstate, | 271 | smp_call_function_single(policy_cpu, _speedstep_set_state, &index, |
| 284 | true); | 272 | true); |
| 285 | 273 | ||
| 286 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 274 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| @@ -289,18 +277,6 @@ static int speedstep_target(struct cpufreq_policy *policy, | |||
| 289 | } | 277 | } |
| 290 | 278 | ||
| 291 | 279 | ||
| 292 | /** | ||
| 293 | * speedstep_verify - verifies a new CPUFreq policy | ||
| 294 | * @policy: new policy | ||
| 295 | * | ||
| 296 | * Limit must be within speedstep_low_freq and speedstep_high_freq, with | ||
| 297 | * at least one border included. | ||
| 298 | */ | ||
| 299 | static int speedstep_verify(struct cpufreq_policy *policy) | ||
| 300 | { | ||
| 301 | return cpufreq_frequency_table_verify(policy, &speedstep_freqs[0]); | ||
| 302 | } | ||
| 303 | |||
| 304 | struct get_freqs { | 280 | struct get_freqs { |
| 305 | struct cpufreq_policy *policy; | 281 | struct cpufreq_policy *policy; |
| 306 | int ret; | 282 | int ret; |
| @@ -320,8 +296,7 @@ static void get_freqs_on_cpu(void *_get_freqs) | |||
| 320 | 296 | ||
| 321 | static int speedstep_cpu_init(struct cpufreq_policy *policy) | 297 | static int speedstep_cpu_init(struct cpufreq_policy *policy) |
| 322 | { | 298 | { |
| 323 | int result; | 299 | unsigned int policy_cpu; |
| 324 | unsigned int policy_cpu, speed; | ||
| 325 | struct get_freqs gf; | 300 | struct get_freqs gf; |
| 326 | 301 | ||
| 327 | /* only run on CPU to be set, or on its sibling */ | 302 | /* only run on CPU to be set, or on its sibling */ |
| @@ -336,49 +311,18 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy) | |||
| 336 | if (gf.ret) | 311 | if (gf.ret) |
| 337 | return gf.ret; | 312 | return gf.ret; |
| 338 | 313 | ||
| 339 | /* get current speed setting */ | 314 | return cpufreq_table_validate_and_show(policy, speedstep_freqs); |
| 340 | speed = speedstep_get(policy_cpu); | ||
| 341 | if (!speed) | ||
| 342 | return -EIO; | ||
| 343 | |||
| 344 | pr_debug("currently at %s speed setting - %i MHz\n", | ||
| 345 | (speed == speedstep_freqs[SPEEDSTEP_LOW].frequency) | ||
| 346 | ? "low" : "high", | ||
| 347 | (speed / 1000)); | ||
| 348 | |||
| 349 | /* cpuinfo and default policy values */ | ||
| 350 | policy->cur = speed; | ||
| 351 | |||
| 352 | result = cpufreq_frequency_table_cpuinfo(policy, speedstep_freqs); | ||
| 353 | if (result) | ||
| 354 | return result; | ||
| 355 | |||
| 356 | cpufreq_frequency_table_get_attr(speedstep_freqs, policy->cpu); | ||
| 357 | |||
| 358 | return 0; | ||
| 359 | } | 315 | } |
| 360 | 316 | ||
| 361 | 317 | ||
| 362 | static int speedstep_cpu_exit(struct cpufreq_policy *policy) | ||
| 363 | { | ||
| 364 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 365 | return 0; | ||
| 366 | } | ||
| 367 | |||
| 368 | static struct freq_attr *speedstep_attr[] = { | ||
| 369 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 370 | NULL, | ||
| 371 | }; | ||
| 372 | |||
| 373 | |||
| 374 | static struct cpufreq_driver speedstep_driver = { | 318 | static struct cpufreq_driver speedstep_driver = { |
| 375 | .name = "speedstep-ich", | 319 | .name = "speedstep-ich", |
| 376 | .verify = speedstep_verify, | 320 | .verify = cpufreq_generic_frequency_table_verify, |
| 377 | .target = speedstep_target, | 321 | .target_index = speedstep_target, |
| 378 | .init = speedstep_cpu_init, | 322 | .init = speedstep_cpu_init, |
| 379 | .exit = speedstep_cpu_exit, | 323 | .exit = cpufreq_generic_exit, |
| 380 | .get = speedstep_get, | 324 | .get = speedstep_get, |
| 381 | .attr = speedstep_attr, | 325 | .attr = cpufreq_generic_attr, |
| 382 | }; | 326 | }; |
| 383 | 327 | ||
| 384 | static const struct x86_cpu_id ss_smi_ids[] = { | 328 | static const struct x86_cpu_id ss_smi_ids[] = { |
diff --git a/drivers/cpufreq/speedstep-smi.c b/drivers/cpufreq/speedstep-smi.c index abfba4f731eb..19446e479ccc 100644 --- a/drivers/cpufreq/speedstep-smi.c +++ b/drivers/cpufreq/speedstep-smi.c | |||
| @@ -235,52 +235,28 @@ static void speedstep_set_state(unsigned int state) | |||
| 235 | /** | 235 | /** |
| 236 | * speedstep_target - set a new CPUFreq policy | 236 | * speedstep_target - set a new CPUFreq policy |
| 237 | * @policy: new policy | 237 | * @policy: new policy |
| 238 | * @target_freq: new freq | 238 | * @index: index of new freq |
| 239 | * @relation: | ||
| 240 | * | 239 | * |
| 241 | * Sets a new CPUFreq policy/freq. | 240 | * Sets a new CPUFreq policy/freq. |
| 242 | */ | 241 | */ |
| 243 | static int speedstep_target(struct cpufreq_policy *policy, | 242 | static int speedstep_target(struct cpufreq_policy *policy, unsigned int index) |
| 244 | unsigned int target_freq, unsigned int relation) | ||
| 245 | { | 243 | { |
| 246 | unsigned int newstate = 0; | ||
| 247 | struct cpufreq_freqs freqs; | 244 | struct cpufreq_freqs freqs; |
| 248 | 245 | ||
| 249 | if (cpufreq_frequency_table_target(policy, &speedstep_freqs[0], | ||
| 250 | target_freq, relation, &newstate)) | ||
| 251 | return -EINVAL; | ||
| 252 | |||
| 253 | freqs.old = speedstep_freqs[speedstep_get_state()].frequency; | 246 | freqs.old = speedstep_freqs[speedstep_get_state()].frequency; |
| 254 | freqs.new = speedstep_freqs[newstate].frequency; | 247 | freqs.new = speedstep_freqs[index].frequency; |
| 255 | |||
| 256 | if (freqs.old == freqs.new) | ||
| 257 | return 0; | ||
| 258 | 248 | ||
| 259 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); | 249 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); |
| 260 | speedstep_set_state(newstate); | 250 | speedstep_set_state(index); |
| 261 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); | 251 | cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); |
| 262 | 252 | ||
| 263 | return 0; | 253 | return 0; |
| 264 | } | 254 | } |
| 265 | 255 | ||
| 266 | 256 | ||
| 267 | /** | ||
| 268 | * speedstep_verify - verifies a new CPUFreq policy | ||
| 269 | * @policy: new policy | ||
| 270 | * | ||
| 271 | * Limit must be within speedstep_low_freq and speedstep_high_freq, with | ||
| 272 | * at least one border included. | ||
| 273 | */ | ||
| 274 | static int speedstep_verify(struct cpufreq_policy *policy) | ||
| 275 | { | ||
| 276 | return cpufreq_frequency_table_verify(policy, &speedstep_freqs[0]); | ||
| 277 | } | ||
| 278 | |||
| 279 | |||
| 280 | static int speedstep_cpu_init(struct cpufreq_policy *policy) | 257 | static int speedstep_cpu_init(struct cpufreq_policy *policy) |
| 281 | { | 258 | { |
| 282 | int result; | 259 | int result; |
| 283 | unsigned int speed, state; | ||
| 284 | unsigned int *low, *high; | 260 | unsigned int *low, *high; |
| 285 | 261 | ||
| 286 | /* capability check */ | 262 | /* capability check */ |
| @@ -316,32 +292,8 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy) | |||
| 316 | pr_debug("workaround worked.\n"); | 292 | pr_debug("workaround worked.\n"); |
| 317 | } | 293 | } |
| 318 | 294 | ||
| 319 | /* get current speed setting */ | ||
| 320 | state = speedstep_get_state(); | ||
| 321 | speed = speedstep_freqs[state].frequency; | ||
| 322 | |||
| 323 | pr_debug("currently at %s speed setting - %i MHz\n", | ||
| 324 | (speed == speedstep_freqs[SPEEDSTEP_LOW].frequency) | ||
| 325 | ? "low" : "high", | ||
| 326 | (speed / 1000)); | ||
| 327 | |||
| 328 | /* cpuinfo and default policy values */ | ||
| 329 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | 295 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; |
| 330 | policy->cur = speed; | 296 | return cpufreq_table_validate_and_show(policy, speedstep_freqs); |
| 331 | |||
| 332 | result = cpufreq_frequency_table_cpuinfo(policy, speedstep_freqs); | ||
| 333 | if (result) | ||
| 334 | return result; | ||
| 335 | |||
| 336 | cpufreq_frequency_table_get_attr(speedstep_freqs, policy->cpu); | ||
| 337 | |||
| 338 | return 0; | ||
| 339 | } | ||
| 340 | |||
| 341 | static int speedstep_cpu_exit(struct cpufreq_policy *policy) | ||
| 342 | { | ||
| 343 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 344 | return 0; | ||
| 345 | } | 297 | } |
| 346 | 298 | ||
| 347 | static unsigned int speedstep_get(unsigned int cpu) | 299 | static unsigned int speedstep_get(unsigned int cpu) |
| @@ -362,20 +314,15 @@ static int speedstep_resume(struct cpufreq_policy *policy) | |||
| 362 | return result; | 314 | return result; |
| 363 | } | 315 | } |
| 364 | 316 | ||
| 365 | static struct freq_attr *speedstep_attr[] = { | ||
| 366 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 367 | NULL, | ||
| 368 | }; | ||
| 369 | |||
| 370 | static struct cpufreq_driver speedstep_driver = { | 317 | static struct cpufreq_driver speedstep_driver = { |
| 371 | .name = "speedstep-smi", | 318 | .name = "speedstep-smi", |
| 372 | .verify = speedstep_verify, | 319 | .verify = cpufreq_generic_frequency_table_verify, |
| 373 | .target = speedstep_target, | 320 | .target_index = speedstep_target, |
| 374 | .init = speedstep_cpu_init, | 321 | .init = speedstep_cpu_init, |
| 375 | .exit = speedstep_cpu_exit, | 322 | .exit = cpufreq_generic_exit, |
| 376 | .get = speedstep_get, | 323 | .get = speedstep_get, |
| 377 | .resume = speedstep_resume, | 324 | .resume = speedstep_resume, |
| 378 | .attr = speedstep_attr, | 325 | .attr = cpufreq_generic_attr, |
| 379 | }; | 326 | }; |
| 380 | 327 | ||
| 381 | static const struct x86_cpu_id ss_smi_ids[] = { | 328 | static const struct x86_cpu_id ss_smi_ids[] = { |
diff --git a/drivers/cpufreq/tegra-cpufreq.c b/drivers/cpufreq/tegra-cpufreq.c index a7b876fdc1d8..bd7d89c013a5 100644 --- a/drivers/cpufreq/tegra-cpufreq.c +++ b/drivers/cpufreq/tegra-cpufreq.c | |||
| @@ -51,11 +51,6 @@ static unsigned long target_cpu_speed[NUM_CPUS]; | |||
| 51 | static DEFINE_MUTEX(tegra_cpu_lock); | 51 | static DEFINE_MUTEX(tegra_cpu_lock); |
| 52 | static bool is_suspended; | 52 | static bool is_suspended; |
| 53 | 53 | ||
| 54 | static int tegra_verify_speed(struct cpufreq_policy *policy) | ||
| 55 | { | ||
| 56 | return cpufreq_frequency_table_verify(policy, freq_table); | ||
| 57 | } | ||
| 58 | |||
| 59 | static unsigned int tegra_getspeed(unsigned int cpu) | 54 | static unsigned int tegra_getspeed(unsigned int cpu) |
| 60 | { | 55 | { |
| 61 | unsigned long rate; | 56 | unsigned long rate; |
| @@ -155,11 +150,8 @@ static unsigned long tegra_cpu_highest_speed(void) | |||
| 155 | return rate; | 150 | return rate; |
| 156 | } | 151 | } |
| 157 | 152 | ||
| 158 | static int tegra_target(struct cpufreq_policy *policy, | 153 | static int tegra_target(struct cpufreq_policy *policy, unsigned int index) |
| 159 | unsigned int target_freq, | ||
| 160 | unsigned int relation) | ||
| 161 | { | 154 | { |
| 162 | unsigned int idx; | ||
| 163 | unsigned int freq; | 155 | unsigned int freq; |
| 164 | int ret = 0; | 156 | int ret = 0; |
| 165 | 157 | ||
| @@ -170,10 +162,7 @@ static int tegra_target(struct cpufreq_policy *policy, | |||
| 170 | goto out; | 162 | goto out; |
| 171 | } | 163 | } |
| 172 | 164 | ||
| 173 | cpufreq_frequency_table_target(policy, freq_table, target_freq, | 165 | freq = freq_table[index].frequency; |
| 174 | relation, &idx); | ||
| 175 | |||
| 176 | freq = freq_table[idx].frequency; | ||
| 177 | 166 | ||
| 178 | target_cpu_speed[policy->cpu] = freq; | 167 | target_cpu_speed[policy->cpu] = freq; |
| 179 | 168 | ||
| @@ -209,21 +198,23 @@ static struct notifier_block tegra_cpu_pm_notifier = { | |||
| 209 | 198 | ||
| 210 | static int tegra_cpu_init(struct cpufreq_policy *policy) | 199 | static int tegra_cpu_init(struct cpufreq_policy *policy) |
| 211 | { | 200 | { |
| 201 | int ret; | ||
| 202 | |||
| 212 | if (policy->cpu >= NUM_CPUS) | 203 | if (policy->cpu >= NUM_CPUS) |
| 213 | return -EINVAL; | 204 | return -EINVAL; |
| 214 | 205 | ||
| 215 | clk_prepare_enable(emc_clk); | 206 | clk_prepare_enable(emc_clk); |
| 216 | clk_prepare_enable(cpu_clk); | 207 | clk_prepare_enable(cpu_clk); |
| 217 | 208 | ||
| 218 | cpufreq_frequency_table_cpuinfo(policy, freq_table); | 209 | target_cpu_speed[policy->cpu] = tegra_getspeed(policy->cpu); |
| 219 | cpufreq_frequency_table_get_attr(freq_table, policy->cpu); | ||
| 220 | policy->cur = tegra_getspeed(policy->cpu); | ||
| 221 | target_cpu_speed[policy->cpu] = policy->cur; | ||
| 222 | 210 | ||
| 223 | /* FIXME: what's the actual transition time? */ | 211 | /* FIXME: what's the actual transition time? */ |
| 224 | policy->cpuinfo.transition_latency = 300 * 1000; | 212 | ret = cpufreq_generic_init(policy, freq_table, 300 * 1000); |
| 225 | 213 | if (ret) { | |
| 226 | cpumask_copy(policy->cpus, cpu_possible_mask); | 214 | clk_disable_unprepare(cpu_clk); |
| 215 | clk_disable_unprepare(emc_clk); | ||
| 216 | return ret; | ||
| 217 | } | ||
| 227 | 218 | ||
| 228 | if (policy->cpu == 0) | 219 | if (policy->cpu == 0) |
| 229 | register_pm_notifier(&tegra_cpu_pm_notifier); | 220 | register_pm_notifier(&tegra_cpu_pm_notifier); |
| @@ -233,24 +224,20 @@ static int tegra_cpu_init(struct cpufreq_policy *policy) | |||
| 233 | 224 | ||
| 234 | static int tegra_cpu_exit(struct cpufreq_policy *policy) | 225 | static int tegra_cpu_exit(struct cpufreq_policy *policy) |
| 235 | { | 226 | { |
| 236 | cpufreq_frequency_table_cpuinfo(policy, freq_table); | 227 | cpufreq_frequency_table_put_attr(policy->cpu); |
| 228 | clk_disable_unprepare(cpu_clk); | ||
| 237 | clk_disable_unprepare(emc_clk); | 229 | clk_disable_unprepare(emc_clk); |
| 238 | return 0; | 230 | return 0; |
| 239 | } | 231 | } |
| 240 | 232 | ||
| 241 | static struct freq_attr *tegra_cpufreq_attr[] = { | ||
| 242 | &cpufreq_freq_attr_scaling_available_freqs, | ||
| 243 | NULL, | ||
| 244 | }; | ||
| 245 | |||
| 246 | static struct cpufreq_driver tegra_cpufreq_driver = { | 233 | static struct cpufreq_driver tegra_cpufreq_driver = { |
| 247 | .verify = tegra_verify_speed, | 234 | .verify = cpufreq_generic_frequency_table_verify, |
| 248 | .target = tegra_target, | 235 | .target_index = tegra_target, |
| 249 | .get = tegra_getspeed, | 236 | .get = tegra_getspeed, |
| 250 | .init = tegra_cpu_init, | 237 | .init = tegra_cpu_init, |
| 251 | .exit = tegra_cpu_exit, | 238 | .exit = tegra_cpu_exit, |
| 252 | .name = "tegra", | 239 | .name = "tegra", |
| 253 | .attr = tegra_cpufreq_attr, | 240 | .attr = cpufreq_generic_attr, |
| 254 | }; | 241 | }; |
| 255 | 242 | ||
| 256 | static int __init tegra_cpufreq_init(void) | 243 | static int __init tegra_cpufreq_init(void) |
diff --git a/drivers/cpufreq/unicore2-cpufreq.c b/drivers/cpufreq/unicore2-cpufreq.c index b225f04d8ae5..653ae2955b55 100644 --- a/drivers/cpufreq/unicore2-cpufreq.c +++ b/drivers/cpufreq/unicore2-cpufreq.c | |||
| @@ -29,9 +29,7 @@ static int ucv2_verify_speed(struct cpufreq_policy *policy) | |||
| 29 | if (policy->cpu) | 29 | if (policy->cpu) |
| 30 | return -EINVAL; | 30 | return -EINVAL; |
| 31 | 31 | ||
| 32 | cpufreq_verify_within_limits(policy, | 32 | cpufreq_verify_within_cpu_limits(policy); |
| 33 | policy->cpuinfo.min_freq, policy->cpuinfo.max_freq); | ||
| 34 | |||
| 35 | return 0; | 33 | return 0; |
| 36 | } | 34 | } |
| 37 | 35 | ||
| @@ -68,7 +66,6 @@ static int __init ucv2_cpu_init(struct cpufreq_policy *policy) | |||
| 68 | { | 66 | { |
| 69 | if (policy->cpu != 0) | 67 | if (policy->cpu != 0) |
| 70 | return -EINVAL; | 68 | return -EINVAL; |
| 71 | policy->cur = ucv2_getspeed(0); | ||
| 72 | policy->min = policy->cpuinfo.min_freq = 250000; | 69 | policy->min = policy->cpuinfo.min_freq = 250000; |
| 73 | policy->max = policy->cpuinfo.max_freq = 1000000; | 70 | policy->max = policy->cpuinfo.max_freq = 1000000; |
| 74 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | 71 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; |
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index 8e3660322308..f23bd75426cd 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm | |||
| @@ -2,6 +2,17 @@ | |||
| 2 | # ARM CPU Idle drivers | 2 | # ARM CPU Idle drivers |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | config ARM_BIG_LITTLE_CPUIDLE | ||
| 6 | bool "Support for ARM big.LITTLE processors" | ||
| 7 | depends on ARCH_VEXPRESS_TC2_PM | ||
| 8 | select ARM_CPU_SUSPEND | ||
| 9 | select CPU_IDLE_MULTIPLE_DRIVERS | ||
| 10 | help | ||
| 11 | Select this option to enable CPU idle driver for big.LITTLE based | ||
| 12 | ARM systems. Driver manages CPUs coordination through MCPM and | ||
| 13 | define different C-states for little and big cores through the | ||
| 14 | multiple CPU idle drivers infrastructure. | ||
| 15 | |||
| 5 | config ARM_HIGHBANK_CPUIDLE | 16 | config ARM_HIGHBANK_CPUIDLE |
| 6 | bool "CPU Idle Driver for Calxeda processors" | 17 | bool "CPU Idle Driver for Calxeda processors" |
| 7 | depends on ARCH_HIGHBANK | 18 | depends on ARCH_HIGHBANK |
| @@ -27,13 +38,9 @@ config ARM_U8500_CPUIDLE | |||
| 27 | help | 38 | help |
| 28 | Select this to enable cpuidle for ST-E u8500 processors | 39 | Select this to enable cpuidle for ST-E u8500 processors |
| 29 | 40 | ||
| 30 | config CPU_IDLE_BIG_LITTLE | 41 | config ARM_AT91_CPUIDLE |
| 31 | bool "Support for ARM big.LITTLE processors" | 42 | bool "Cpu Idle Driver for the AT91 processors" |
| 32 | depends on ARCH_VEXPRESS_TC2_PM | 43 | default y |
| 33 | select ARM_CPU_SUSPEND | 44 | depends on ARCH_AT91 |
| 34 | select CPU_IDLE_MULTIPLE_DRIVERS | ||
| 35 | help | 45 | help |
| 36 | Select this option to enable CPU idle driver for big.LITTLE based | 46 | Select this to enable cpuidle for AT91 processors |
| 37 | ARM systems. Driver manages CPUs coordination through MCPM and | ||
| 38 | define different C-states for little and big cores through the | ||
| 39 | multiple CPU idle drivers infrastructure. | ||
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile index cea5ef58876d..527be28e5c1e 100644 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile | |||
| @@ -7,8 +7,9 @@ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o | |||
| 7 | 7 | ||
| 8 | ################################################################################## | 8 | ################################################################################## |
| 9 | # ARM SoC drivers | 9 | # ARM SoC drivers |
| 10 | obj-$(CONFIG_ARM_BIG_LITTLE_CPUIDLE) += cpuidle-big_little.o | ||
| 10 | obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE) += cpuidle-calxeda.o | 11 | obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE) += cpuidle-calxeda.o |
| 11 | obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE) += cpuidle-kirkwood.o | 12 | obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE) += cpuidle-kirkwood.o |
| 12 | obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o | 13 | obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o |
| 13 | obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o | 14 | obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o |
| 14 | obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o | 15 | obj-$(CONFIG_ARM_AT91_CPUIDLE) += cpuidle-at91.o |
diff --git a/arch/arm/mach-at91/cpuidle.c b/drivers/cpuidle/cpuidle-at91.c index 4ec6a6d9b9be..a0774370c6bc 100644 --- a/arch/arm/mach-at91/cpuidle.c +++ b/drivers/cpuidle/cpuidle-at91.c | |||
| @@ -21,26 +21,17 @@ | |||
| 21 | #include <linux/export.h> | 21 | #include <linux/export.h> |
| 22 | #include <asm/proc-fns.h> | 22 | #include <asm/proc-fns.h> |
| 23 | #include <asm/cpuidle.h> | 23 | #include <asm/cpuidle.h> |
| 24 | #include <mach/cpu.h> | ||
| 25 | |||
| 26 | #include "pm.h" | ||
| 27 | 24 | ||
| 28 | #define AT91_MAX_STATES 2 | 25 | #define AT91_MAX_STATES 2 |
| 29 | 26 | ||
| 27 | static void (*at91_standby)(void); | ||
| 28 | |||
| 30 | /* Actual code that puts the SoC in different idle states */ | 29 | /* Actual code that puts the SoC in different idle states */ |
| 31 | static int at91_enter_idle(struct cpuidle_device *dev, | 30 | static int at91_enter_idle(struct cpuidle_device *dev, |
| 32 | struct cpuidle_driver *drv, | 31 | struct cpuidle_driver *drv, |
| 33 | int index) | 32 | int index) |
| 34 | { | 33 | { |
| 35 | if (cpu_is_at91rm9200()) | 34 | at91_standby(); |
| 36 | at91rm9200_standby(); | ||
| 37 | else if (cpu_is_at91sam9g45()) | ||
| 38 | at91sam9g45_standby(); | ||
| 39 | else if (cpu_is_at91sam9263()) | ||
| 40 | at91sam9263_standby(); | ||
| 41 | else | ||
| 42 | at91sam9_standby(); | ||
| 43 | |||
| 44 | return index; | 35 | return index; |
| 45 | } | 36 | } |
| 46 | 37 | ||
| @@ -60,9 +51,19 @@ static struct cpuidle_driver at91_idle_driver = { | |||
| 60 | }; | 51 | }; |
| 61 | 52 | ||
| 62 | /* Initialize CPU idle by registering the idle states */ | 53 | /* Initialize CPU idle by registering the idle states */ |
| 63 | static int __init at91_init_cpuidle(void) | 54 | static int at91_cpuidle_probe(struct platform_device *dev) |
| 64 | { | 55 | { |
| 56 | at91_standby = (void *)(dev->dev.platform_data); | ||
| 57 | |||
| 65 | return cpuidle_register(&at91_idle_driver, NULL); | 58 | return cpuidle_register(&at91_idle_driver, NULL); |
| 66 | } | 59 | } |
| 67 | 60 | ||
| 68 | device_initcall(at91_init_cpuidle); | 61 | static struct platform_driver at91_cpuidle_driver = { |
| 62 | .driver = { | ||
| 63 | .name = "cpuidle-at91", | ||
| 64 | .owner = THIS_MODULE, | ||
| 65 | }, | ||
| 66 | .probe = at91_cpuidle_probe, | ||
| 67 | }; | ||
| 68 | |||
| 69 | module_platform_driver(at91_cpuidle_driver); | ||
diff --git a/drivers/cpuidle/cpuidle-ux500.c b/drivers/cpuidle/cpuidle-ux500.c index e0564652af35..5e35804b1a95 100644 --- a/drivers/cpuidle/cpuidle-ux500.c +++ b/drivers/cpuidle/cpuidle-ux500.c | |||
| @@ -111,7 +111,7 @@ static struct cpuidle_driver ux500_idle_driver = { | |||
| 111 | .state_count = 2, | 111 | .state_count = 2, |
| 112 | }; | 112 | }; |
| 113 | 113 | ||
| 114 | static int __init dbx500_cpuidle_probe(struct platform_device *pdev) | 114 | static int dbx500_cpuidle_probe(struct platform_device *pdev) |
| 115 | { | 115 | { |
| 116 | /* Configure wake up reasons */ | 116 | /* Configure wake up reasons */ |
| 117 | prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) | | 117 | prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) | |
diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c index 38e03a183591..aded75928028 100644 --- a/drivers/cpuidle/cpuidle-zynq.c +++ b/drivers/cpuidle/cpuidle-zynq.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/cpu_pm.h> | 29 | #include <linux/cpu_pm.h> |
| 30 | #include <linux/cpuidle.h> | 30 | #include <linux/cpuidle.h> |
| 31 | #include <linux/of.h> | 31 | #include <linux/platform_device.h> |
| 32 | #include <asm/proc-fns.h> | 32 | #include <asm/proc-fns.h> |
| 33 | #include <asm/cpuidle.h> | 33 | #include <asm/cpuidle.h> |
| 34 | 34 | ||
| @@ -70,14 +70,19 @@ static struct cpuidle_driver zynq_idle_driver = { | |||
| 70 | }; | 70 | }; |
| 71 | 71 | ||
| 72 | /* Initialize CPU idle by registering the idle states */ | 72 | /* Initialize CPU idle by registering the idle states */ |
| 73 | static int __init zynq_cpuidle_init(void) | 73 | static int zynq_cpuidle_probe(struct platform_device *pdev) |
| 74 | { | 74 | { |
| 75 | if (!of_machine_is_compatible("xlnx,zynq-7000")) | ||
| 76 | return -ENODEV; | ||
| 77 | |||
| 78 | pr_info("Xilinx Zynq CpuIdle Driver started\n"); | 75 | pr_info("Xilinx Zynq CpuIdle Driver started\n"); |
| 79 | 76 | ||
| 80 | return cpuidle_register(&zynq_idle_driver, NULL); | 77 | return cpuidle_register(&zynq_idle_driver, NULL); |
| 81 | } | 78 | } |
| 82 | 79 | ||
| 83 | device_initcall(zynq_cpuidle_init); | 80 | static struct platform_driver zynq_cpuidle_driver = { |
| 81 | .driver = { | ||
| 82 | .name = "cpuidle-zynq", | ||
| 83 | .owner = THIS_MODULE, | ||
| 84 | }, | ||
| 85 | .probe = zynq_cpuidle_probe, | ||
| 86 | }; | ||
| 87 | |||
| 88 | module_platform_driver(zynq_cpuidle_driver); | ||
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index c99c00d35d34..2e23b12c350b 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
| 20 | #include <linux/stat.h> | 20 | #include <linux/stat.h> |
| 21 | #include <linux/opp.h> | 21 | #include <linux/pm_opp.h> |
| 22 | #include <linux/devfreq.h> | 22 | #include <linux/devfreq.h> |
| 23 | #include <linux/workqueue.h> | 23 | #include <linux/workqueue.h> |
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| @@ -902,13 +902,13 @@ static ssize_t available_frequencies_show(struct device *d, | |||
| 902 | { | 902 | { |
| 903 | struct devfreq *df = to_devfreq(d); | 903 | struct devfreq *df = to_devfreq(d); |
| 904 | struct device *dev = df->dev.parent; | 904 | struct device *dev = df->dev.parent; |
| 905 | struct opp *opp; | 905 | struct dev_pm_opp *opp; |
| 906 | ssize_t count = 0; | 906 | ssize_t count = 0; |
| 907 | unsigned long freq = 0; | 907 | unsigned long freq = 0; |
| 908 | 908 | ||
| 909 | rcu_read_lock(); | 909 | rcu_read_lock(); |
| 910 | do { | 910 | do { |
| 911 | opp = opp_find_freq_ceil(dev, &freq); | 911 | opp = dev_pm_opp_find_freq_ceil(dev, &freq); |
| 912 | if (IS_ERR(opp)) | 912 | if (IS_ERR(opp)) |
| 913 | break; | 913 | break; |
| 914 | 914 | ||
| @@ -1029,25 +1029,26 @@ module_exit(devfreq_exit); | |||
| 1029 | * under the locked area. The pointer returned must be used prior to unlocking | 1029 | * under the locked area. The pointer returned must be used prior to unlocking |
| 1030 | * with rcu_read_unlock() to maintain the integrity of the pointer. | 1030 | * with rcu_read_unlock() to maintain the integrity of the pointer. |
| 1031 | */ | 1031 | */ |
| 1032 | struct opp *devfreq_recommended_opp(struct device *dev, unsigned long *freq, | 1032 | struct dev_pm_opp *devfreq_recommended_opp(struct device *dev, |
| 1033 | u32 flags) | 1033 | unsigned long *freq, |
| 1034 | u32 flags) | ||
| 1034 | { | 1035 | { |
| 1035 | struct opp *opp; | 1036 | struct dev_pm_opp *opp; |
| 1036 | 1037 | ||
| 1037 | if (flags & DEVFREQ_FLAG_LEAST_UPPER_BOUND) { | 1038 | if (flags & DEVFREQ_FLAG_LEAST_UPPER_BOUND) { |
| 1038 | /* The freq is an upper bound. opp should be lower */ | 1039 | /* The freq is an upper bound. opp should be lower */ |
| 1039 | opp = opp_find_freq_floor(dev, freq); | 1040 | opp = dev_pm_opp_find_freq_floor(dev, freq); |
| 1040 | 1041 | ||
| 1041 | /* If not available, use the closest opp */ | 1042 | /* If not available, use the closest opp */ |
| 1042 | if (opp == ERR_PTR(-ERANGE)) | 1043 | if (opp == ERR_PTR(-ERANGE)) |
| 1043 | opp = opp_find_freq_ceil(dev, freq); | 1044 | opp = dev_pm_opp_find_freq_ceil(dev, freq); |
| 1044 | } else { | 1045 | } else { |
| 1045 | /* The freq is an lower bound. opp should be higher */ | 1046 | /* The freq is an lower bound. opp should be higher */ |
| 1046 | opp = opp_find_freq_ceil(dev, freq); | 1047 | opp = dev_pm_opp_find_freq_ceil(dev, freq); |
| 1047 | 1048 | ||
| 1048 | /* If not available, use the closest opp */ | 1049 | /* If not available, use the closest opp */ |
| 1049 | if (opp == ERR_PTR(-ERANGE)) | 1050 | if (opp == ERR_PTR(-ERANGE)) |
| 1050 | opp = opp_find_freq_floor(dev, freq); | 1051 | opp = dev_pm_opp_find_freq_floor(dev, freq); |
| 1051 | } | 1052 | } |
| 1052 | 1053 | ||
| 1053 | return opp; | 1054 | return opp; |
| @@ -1066,7 +1067,7 @@ int devfreq_register_opp_notifier(struct device *dev, struct devfreq *devfreq) | |||
| 1066 | int ret = 0; | 1067 | int ret = 0; |
| 1067 | 1068 | ||
| 1068 | rcu_read_lock(); | 1069 | rcu_read_lock(); |
| 1069 | nh = opp_get_notifier(dev); | 1070 | nh = dev_pm_opp_get_notifier(dev); |
| 1070 | if (IS_ERR(nh)) | 1071 | if (IS_ERR(nh)) |
| 1071 | ret = PTR_ERR(nh); | 1072 | ret = PTR_ERR(nh); |
| 1072 | rcu_read_unlock(); | 1073 | rcu_read_unlock(); |
| @@ -1092,7 +1093,7 @@ int devfreq_unregister_opp_notifier(struct device *dev, struct devfreq *devfreq) | |||
| 1092 | int ret = 0; | 1093 | int ret = 0; |
| 1093 | 1094 | ||
| 1094 | rcu_read_lock(); | 1095 | rcu_read_lock(); |
| 1095 | nh = opp_get_notifier(dev); | 1096 | nh = dev_pm_opp_get_notifier(dev); |
| 1096 | if (IS_ERR(nh)) | 1097 | if (IS_ERR(nh)) |
| 1097 | ret = PTR_ERR(nh); | 1098 | ret = PTR_ERR(nh); |
| 1098 | rcu_read_unlock(); | 1099 | rcu_read_unlock(); |
diff --git a/drivers/devfreq/exynos/exynos4_bus.c b/drivers/devfreq/exynos/exynos4_bus.c index c5f86d8caca3..cede6f71cd63 100644 --- a/drivers/devfreq/exynos/exynos4_bus.c +++ b/drivers/devfreq/exynos/exynos4_bus.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
| 20 | #include <linux/mutex.h> | 20 | #include <linux/mutex.h> |
| 21 | #include <linux/suspend.h> | 21 | #include <linux/suspend.h> |
| 22 | #include <linux/opp.h> | 22 | #include <linux/pm_opp.h> |
| 23 | #include <linux/devfreq.h> | 23 | #include <linux/devfreq.h> |
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <linux/regulator/consumer.h> | 25 | #include <linux/regulator/consumer.h> |
| @@ -639,7 +639,7 @@ static int exynos4_bus_target(struct device *dev, unsigned long *_freq, | |||
| 639 | struct platform_device *pdev = container_of(dev, struct platform_device, | 639 | struct platform_device *pdev = container_of(dev, struct platform_device, |
| 640 | dev); | 640 | dev); |
| 641 | struct busfreq_data *data = platform_get_drvdata(pdev); | 641 | struct busfreq_data *data = platform_get_drvdata(pdev); |
| 642 | struct opp *opp; | 642 | struct dev_pm_opp *opp; |
| 643 | unsigned long freq; | 643 | unsigned long freq; |
| 644 | unsigned long old_freq = data->curr_oppinfo.rate; | 644 | unsigned long old_freq = data->curr_oppinfo.rate; |
| 645 | struct busfreq_opp_info new_oppinfo; | 645 | struct busfreq_opp_info new_oppinfo; |
| @@ -650,8 +650,8 @@ static int exynos4_bus_target(struct device *dev, unsigned long *_freq, | |||
| 650 | rcu_read_unlock(); | 650 | rcu_read_unlock(); |
| 651 | return PTR_ERR(opp); | 651 | return PTR_ERR(opp); |
| 652 | } | 652 | } |
| 653 | new_oppinfo.rate = opp_get_freq(opp); | 653 | new_oppinfo.rate = dev_pm_opp_get_freq(opp); |
| 654 | new_oppinfo.volt = opp_get_voltage(opp); | 654 | new_oppinfo.volt = dev_pm_opp_get_voltage(opp); |
| 655 | rcu_read_unlock(); | 655 | rcu_read_unlock(); |
| 656 | freq = new_oppinfo.rate; | 656 | freq = new_oppinfo.rate; |
| 657 | 657 | ||
| @@ -873,7 +873,7 @@ static int exynos4210_init_tables(struct busfreq_data *data) | |||
| 873 | exynos4210_busclk_table[i].volt = exynos4210_asv_volt[mgrp][i]; | 873 | exynos4210_busclk_table[i].volt = exynos4210_asv_volt[mgrp][i]; |
| 874 | 874 | ||
| 875 | for (i = LV_0; i < EX4210_LV_NUM; i++) { | 875 | for (i = LV_0; i < EX4210_LV_NUM; i++) { |
| 876 | err = opp_add(data->dev, exynos4210_busclk_table[i].clk, | 876 | err = dev_pm_opp_add(data->dev, exynos4210_busclk_table[i].clk, |
| 877 | exynos4210_busclk_table[i].volt); | 877 | exynos4210_busclk_table[i].volt); |
| 878 | if (err) { | 878 | if (err) { |
| 879 | dev_err(data->dev, "Cannot add opp entries.\n"); | 879 | dev_err(data->dev, "Cannot add opp entries.\n"); |
| @@ -940,7 +940,7 @@ static int exynos4x12_init_tables(struct busfreq_data *data) | |||
| 940 | } | 940 | } |
| 941 | 941 | ||
| 942 | for (i = 0; i < EX4x12_LV_NUM; i++) { | 942 | for (i = 0; i < EX4x12_LV_NUM; i++) { |
| 943 | ret = opp_add(data->dev, exynos4x12_mifclk_table[i].clk, | 943 | ret = dev_pm_opp_add(data->dev, exynos4x12_mifclk_table[i].clk, |
| 944 | exynos4x12_mifclk_table[i].volt); | 944 | exynos4x12_mifclk_table[i].volt); |
| 945 | if (ret) { | 945 | if (ret) { |
| 946 | dev_err(data->dev, "Fail to add opp entries.\n"); | 946 | dev_err(data->dev, "Fail to add opp entries.\n"); |
| @@ -956,7 +956,7 @@ static int exynos4_busfreq_pm_notifier_event(struct notifier_block *this, | |||
| 956 | { | 956 | { |
| 957 | struct busfreq_data *data = container_of(this, struct busfreq_data, | 957 | struct busfreq_data *data = container_of(this, struct busfreq_data, |
| 958 | pm_notifier); | 958 | pm_notifier); |
| 959 | struct opp *opp; | 959 | struct dev_pm_opp *opp; |
| 960 | struct busfreq_opp_info new_oppinfo; | 960 | struct busfreq_opp_info new_oppinfo; |
| 961 | unsigned long maxfreq = ULONG_MAX; | 961 | unsigned long maxfreq = ULONG_MAX; |
| 962 | int err = 0; | 962 | int err = 0; |
| @@ -969,7 +969,7 @@ static int exynos4_busfreq_pm_notifier_event(struct notifier_block *this, | |||
| 969 | data->disabled = true; | 969 | data->disabled = true; |
| 970 | 970 | ||
| 971 | rcu_read_lock(); | 971 | rcu_read_lock(); |
| 972 | opp = opp_find_freq_floor(data->dev, &maxfreq); | 972 | opp = dev_pm_opp_find_freq_floor(data->dev, &maxfreq); |
| 973 | if (IS_ERR(opp)) { | 973 | if (IS_ERR(opp)) { |
| 974 | rcu_read_unlock(); | 974 | rcu_read_unlock(); |
| 975 | dev_err(data->dev, "%s: unable to find a min freq\n", | 975 | dev_err(data->dev, "%s: unable to find a min freq\n", |
| @@ -977,8 +977,8 @@ static int exynos4_busfreq_pm_notifier_event(struct notifier_block *this, | |||
| 977 | mutex_unlock(&data->lock); | 977 | mutex_unlock(&data->lock); |
| 978 | return PTR_ERR(opp); | 978 | return PTR_ERR(opp); |
| 979 | } | 979 | } |
| 980 | new_oppinfo.rate = opp_get_freq(opp); | 980 | new_oppinfo.rate = dev_pm_opp_get_freq(opp); |
| 981 | new_oppinfo.volt = opp_get_voltage(opp); | 981 | new_oppinfo.volt = dev_pm_opp_get_voltage(opp); |
| 982 | rcu_read_unlock(); | 982 | rcu_read_unlock(); |
| 983 | 983 | ||
| 984 | err = exynos4_bus_setvolt(data, &new_oppinfo, | 984 | err = exynos4_bus_setvolt(data, &new_oppinfo, |
| @@ -1020,7 +1020,7 @@ unlock: | |||
| 1020 | static int exynos4_busfreq_probe(struct platform_device *pdev) | 1020 | static int exynos4_busfreq_probe(struct platform_device *pdev) |
| 1021 | { | 1021 | { |
| 1022 | struct busfreq_data *data; | 1022 | struct busfreq_data *data; |
| 1023 | struct opp *opp; | 1023 | struct dev_pm_opp *opp; |
| 1024 | struct device *dev = &pdev->dev; | 1024 | struct device *dev = &pdev->dev; |
| 1025 | int err = 0; | 1025 | int err = 0; |
| 1026 | 1026 | ||
| @@ -1065,15 +1065,16 @@ static int exynos4_busfreq_probe(struct platform_device *pdev) | |||
| 1065 | } | 1065 | } |
| 1066 | 1066 | ||
| 1067 | rcu_read_lock(); | 1067 | rcu_read_lock(); |
| 1068 | opp = opp_find_freq_floor(dev, &exynos4_devfreq_profile.initial_freq); | 1068 | opp = dev_pm_opp_find_freq_floor(dev, |
| 1069 | &exynos4_devfreq_profile.initial_freq); | ||
| 1069 | if (IS_ERR(opp)) { | 1070 | if (IS_ERR(opp)) { |
| 1070 | rcu_read_unlock(); | 1071 | rcu_read_unlock(); |
| 1071 | dev_err(dev, "Invalid initial frequency %lu kHz.\n", | 1072 | dev_err(dev, "Invalid initial frequency %lu kHz.\n", |
| 1072 | exynos4_devfreq_profile.initial_freq); | 1073 | exynos4_devfreq_profile.initial_freq); |
| 1073 | return PTR_ERR(opp); | 1074 | return PTR_ERR(opp); |
| 1074 | } | 1075 | } |
| 1075 | data->curr_oppinfo.rate = opp_get_freq(opp); | 1076 | data->curr_oppinfo.rate = dev_pm_opp_get_freq(opp); |
| 1076 | data->curr_oppinfo.volt = opp_get_voltage(opp); | 1077 | data->curr_oppinfo.volt = dev_pm_opp_get_voltage(opp); |
| 1077 | rcu_read_unlock(); | 1078 | rcu_read_unlock(); |
| 1078 | 1079 | ||
| 1079 | platform_set_drvdata(pdev, data); | 1080 | platform_set_drvdata(pdev, data); |
diff --git a/drivers/devfreq/exynos/exynos5_bus.c b/drivers/devfreq/exynos/exynos5_bus.c index 574b16b59be5..0e0bfc17cd5b 100644 --- a/drivers/devfreq/exynos/exynos5_bus.c +++ b/drivers/devfreq/exynos/exynos5_bus.c | |||
| @@ -15,10 +15,9 @@ | |||
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/devfreq.h> | 16 | #include <linux/devfreq.h> |
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | #include <linux/opp.h> | 18 | #include <linux/pm_opp.h> |
| 19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
| 20 | #include <linux/suspend.h> | 20 | #include <linux/suspend.h> |
| 21 | #include <linux/opp.h> | ||
| 22 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 24 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| @@ -132,7 +131,7 @@ static int exynos5_busfreq_int_target(struct device *dev, unsigned long *_freq, | |||
| 132 | struct platform_device *pdev = container_of(dev, struct platform_device, | 131 | struct platform_device *pdev = container_of(dev, struct platform_device, |
| 133 | dev); | 132 | dev); |
| 134 | struct busfreq_data_int *data = platform_get_drvdata(pdev); | 133 | struct busfreq_data_int *data = platform_get_drvdata(pdev); |
| 135 | struct opp *opp; | 134 | struct dev_pm_opp *opp; |
| 136 | unsigned long old_freq, freq; | 135 | unsigned long old_freq, freq; |
| 137 | unsigned long volt; | 136 | unsigned long volt; |
| 138 | 137 | ||
| @@ -144,8 +143,8 @@ static int exynos5_busfreq_int_target(struct device *dev, unsigned long *_freq, | |||
| 144 | return PTR_ERR(opp); | 143 | return PTR_ERR(opp); |
| 145 | } | 144 | } |
| 146 | 145 | ||
| 147 | freq = opp_get_freq(opp); | 146 | freq = dev_pm_opp_get_freq(opp); |
| 148 | volt = opp_get_voltage(opp); | 147 | volt = dev_pm_opp_get_voltage(opp); |
| 149 | rcu_read_unlock(); | 148 | rcu_read_unlock(); |
| 150 | 149 | ||
| 151 | old_freq = data->curr_freq; | 150 | old_freq = data->curr_freq; |
| @@ -246,7 +245,7 @@ static int exynos5250_init_int_tables(struct busfreq_data_int *data) | |||
| 246 | int i, err = 0; | 245 | int i, err = 0; |
| 247 | 246 | ||
| 248 | for (i = LV_0; i < _LV_END; i++) { | 247 | for (i = LV_0; i < _LV_END; i++) { |
| 249 | err = opp_add(data->dev, exynos5_int_opp_table[i].clk, | 248 | err = dev_pm_opp_add(data->dev, exynos5_int_opp_table[i].clk, |
| 250 | exynos5_int_opp_table[i].volt); | 249 | exynos5_int_opp_table[i].volt); |
| 251 | if (err) { | 250 | if (err) { |
| 252 | dev_err(data->dev, "Cannot add opp entries.\n"); | 251 | dev_err(data->dev, "Cannot add opp entries.\n"); |
| @@ -262,7 +261,7 @@ static int exynos5_busfreq_int_pm_notifier_event(struct notifier_block *this, | |||
| 262 | { | 261 | { |
| 263 | struct busfreq_data_int *data = container_of(this, | 262 | struct busfreq_data_int *data = container_of(this, |
| 264 | struct busfreq_data_int, pm_notifier); | 263 | struct busfreq_data_int, pm_notifier); |
| 265 | struct opp *opp; | 264 | struct dev_pm_opp *opp; |
| 266 | unsigned long maxfreq = ULONG_MAX; | 265 | unsigned long maxfreq = ULONG_MAX; |
| 267 | unsigned long freq; | 266 | unsigned long freq; |
| 268 | unsigned long volt; | 267 | unsigned long volt; |
| @@ -276,14 +275,14 @@ static int exynos5_busfreq_int_pm_notifier_event(struct notifier_block *this, | |||
| 276 | data->disabled = true; | 275 | data->disabled = true; |
| 277 | 276 | ||
| 278 | rcu_read_lock(); | 277 | rcu_read_lock(); |
| 279 | opp = opp_find_freq_floor(data->dev, &maxfreq); | 278 | opp = dev_pm_opp_find_freq_floor(data->dev, &maxfreq); |
| 280 | if (IS_ERR(opp)) { | 279 | if (IS_ERR(opp)) { |
| 281 | rcu_read_unlock(); | 280 | rcu_read_unlock(); |
| 282 | err = PTR_ERR(opp); | 281 | err = PTR_ERR(opp); |
| 283 | goto unlock; | 282 | goto unlock; |
| 284 | } | 283 | } |
| 285 | freq = opp_get_freq(opp); | 284 | freq = dev_pm_opp_get_freq(opp); |
| 286 | volt = opp_get_voltage(opp); | 285 | volt = dev_pm_opp_get_voltage(opp); |
| 287 | rcu_read_unlock(); | 286 | rcu_read_unlock(); |
| 288 | 287 | ||
| 289 | err = exynos5_int_setvolt(data, volt); | 288 | err = exynos5_int_setvolt(data, volt); |
| @@ -316,7 +315,7 @@ unlock: | |||
| 316 | static int exynos5_busfreq_int_probe(struct platform_device *pdev) | 315 | static int exynos5_busfreq_int_probe(struct platform_device *pdev) |
| 317 | { | 316 | { |
| 318 | struct busfreq_data_int *data; | 317 | struct busfreq_data_int *data; |
| 319 | struct opp *opp; | 318 | struct dev_pm_opp *opp; |
| 320 | struct device *dev = &pdev->dev; | 319 | struct device *dev = &pdev->dev; |
| 321 | struct device_node *np; | 320 | struct device_node *np; |
| 322 | unsigned long initial_freq; | 321 | unsigned long initial_freq; |
| @@ -368,7 +367,7 @@ static int exynos5_busfreq_int_probe(struct platform_device *pdev) | |||
| 368 | } | 367 | } |
| 369 | 368 | ||
| 370 | rcu_read_lock(); | 369 | rcu_read_lock(); |
| 371 | opp = opp_find_freq_floor(dev, | 370 | opp = dev_pm_opp_find_freq_floor(dev, |
| 372 | &exynos5_devfreq_int_profile.initial_freq); | 371 | &exynos5_devfreq_int_profile.initial_freq); |
| 373 | if (IS_ERR(opp)) { | 372 | if (IS_ERR(opp)) { |
| 374 | rcu_read_unlock(); | 373 | rcu_read_unlock(); |
| @@ -377,8 +376,8 @@ static int exynos5_busfreq_int_probe(struct platform_device *pdev) | |||
| 377 | err = PTR_ERR(opp); | 376 | err = PTR_ERR(opp); |
| 378 | goto err_opp_add; | 377 | goto err_opp_add; |
| 379 | } | 378 | } |
| 380 | initial_freq = opp_get_freq(opp); | 379 | initial_freq = dev_pm_opp_get_freq(opp); |
| 381 | initial_volt = opp_get_voltage(opp); | 380 | initial_volt = dev_pm_opp_get_voltage(opp); |
| 382 | rcu_read_unlock(); | 381 | rcu_read_unlock(); |
| 383 | data->curr_freq = initial_freq; | 382 | data->curr_freq = initial_freq; |
| 384 | 383 | ||
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 098a8da450f0..10b577fcf48d 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c | |||
| @@ -305,7 +305,9 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg( | |||
| 305 | edma_alloc_slot(EDMA_CTLR(echan->ch_num), | 305 | edma_alloc_slot(EDMA_CTLR(echan->ch_num), |
| 306 | EDMA_SLOT_ANY); | 306 | EDMA_SLOT_ANY); |
| 307 | if (echan->slot[i] < 0) { | 307 | if (echan->slot[i] < 0) { |
| 308 | kfree(edesc); | ||
| 308 | dev_err(dev, "Failed to allocate slot\n"); | 309 | dev_err(dev, "Failed to allocate slot\n"); |
| 310 | kfree(edesc); | ||
| 309 | return NULL; | 311 | return NULL; |
| 310 | } | 312 | } |
| 311 | } | 313 | } |
| @@ -345,6 +347,7 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg( | |||
| 345 | ccnt = sg_dma_len(sg) / (acnt * bcnt); | 347 | ccnt = sg_dma_len(sg) / (acnt * bcnt); |
| 346 | if (ccnt > (SZ_64K - 1)) { | 348 | if (ccnt > (SZ_64K - 1)) { |
| 347 | dev_err(dev, "Exceeded max SG segment size\n"); | 349 | dev_err(dev, "Exceeded max SG segment size\n"); |
| 350 | kfree(edesc); | ||
| 348 | return NULL; | 351 | return NULL; |
| 349 | } | 352 | } |
| 350 | cidx = acnt * bcnt; | 353 | cidx = acnt * bcnt; |
diff --git a/drivers/dma/sh/rcar-hpbdma.c b/drivers/dma/sh/rcar-hpbdma.c index 45a520281ce1..ebad84591a6e 100644 --- a/drivers/dma/sh/rcar-hpbdma.c +++ b/drivers/dma/sh/rcar-hpbdma.c | |||
| @@ -93,6 +93,7 @@ struct hpb_dmae_chan { | |||
| 93 | void __iomem *base; | 93 | void __iomem *base; |
| 94 | const struct hpb_dmae_slave_config *cfg; | 94 | const struct hpb_dmae_slave_config *cfg; |
| 95 | char dev_id[16]; /* unique name per DMAC of channel */ | 95 | char dev_id[16]; /* unique name per DMAC of channel */ |
| 96 | dma_addr_t slave_addr; | ||
| 96 | }; | 97 | }; |
| 97 | 98 | ||
| 98 | struct hpb_dmae_device { | 99 | struct hpb_dmae_device { |
| @@ -432,7 +433,6 @@ hpb_dmae_alloc_chan_resources(struct hpb_dmae_chan *hpb_chan, | |||
| 432 | hpb_chan->xfer_mode = XFER_DOUBLE; | 433 | hpb_chan->xfer_mode = XFER_DOUBLE; |
| 433 | } else { | 434 | } else { |
| 434 | dev_err(hpb_chan->shdma_chan.dev, "DCR setting error"); | 435 | dev_err(hpb_chan->shdma_chan.dev, "DCR setting error"); |
| 435 | shdma_free_irq(&hpb_chan->shdma_chan); | ||
| 436 | return -EINVAL; | 436 | return -EINVAL; |
| 437 | } | 437 | } |
| 438 | 438 | ||
| @@ -446,7 +446,8 @@ hpb_dmae_alloc_chan_resources(struct hpb_dmae_chan *hpb_chan, | |||
| 446 | return 0; | 446 | return 0; |
| 447 | } | 447 | } |
| 448 | 448 | ||
| 449 | static int hpb_dmae_set_slave(struct shdma_chan *schan, int slave_id, bool try) | 449 | static int hpb_dmae_set_slave(struct shdma_chan *schan, int slave_id, |
| 450 | dma_addr_t slave_addr, bool try) | ||
| 450 | { | 451 | { |
| 451 | struct hpb_dmae_chan *chan = to_chan(schan); | 452 | struct hpb_dmae_chan *chan = to_chan(schan); |
| 452 | const struct hpb_dmae_slave_config *sc = | 453 | const struct hpb_dmae_slave_config *sc = |
| @@ -457,6 +458,7 @@ static int hpb_dmae_set_slave(struct shdma_chan *schan, int slave_id, bool try) | |||
| 457 | if (try) | 458 | if (try) |
| 458 | return 0; | 459 | return 0; |
| 459 | chan->cfg = sc; | 460 | chan->cfg = sc; |
| 461 | chan->slave_addr = slave_addr ? : sc->addr; | ||
| 460 | return hpb_dmae_alloc_chan_resources(chan, sc); | 462 | return hpb_dmae_alloc_chan_resources(chan, sc); |
| 461 | } | 463 | } |
| 462 | 464 | ||
| @@ -468,7 +470,7 @@ static dma_addr_t hpb_dmae_slave_addr(struct shdma_chan *schan) | |||
| 468 | { | 470 | { |
| 469 | struct hpb_dmae_chan *chan = to_chan(schan); | 471 | struct hpb_dmae_chan *chan = to_chan(schan); |
| 470 | 472 | ||
| 471 | return chan->cfg->addr; | 473 | return chan->slave_addr; |
| 472 | } | 474 | } |
| 473 | 475 | ||
| 474 | static struct shdma_desc *hpb_dmae_embedded_desc(void *buf, int i) | 476 | static struct shdma_desc *hpb_dmae_embedded_desc(void *buf, int i) |
| @@ -614,7 +616,6 @@ static void hpb_dmae_chan_remove(struct hpb_dmae_device *hpbdev) | |||
| 614 | shdma_for_each_chan(schan, &hpbdev->shdma_dev, i) { | 616 | shdma_for_each_chan(schan, &hpbdev->shdma_dev, i) { |
| 615 | BUG_ON(!schan); | 617 | BUG_ON(!schan); |
| 616 | 618 | ||
| 617 | shdma_free_irq(schan); | ||
| 618 | shdma_chan_remove(schan); | 619 | shdma_chan_remove(schan); |
| 619 | } | 620 | } |
| 620 | dma_dev->chancnt = 0; | 621 | dma_dev->chancnt = 0; |
diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c index 2d9ca6055e5e..41b5913ddabe 100644 --- a/drivers/gpio/gpio-lynxpoint.c +++ b/drivers/gpio/gpio-lynxpoint.c | |||
| @@ -248,14 +248,15 @@ static void lp_gpio_irq_handler(unsigned irq, struct irq_desc *desc) | |||
| 248 | struct lp_gpio *lg = irq_data_get_irq_handler_data(data); | 248 | struct lp_gpio *lg = irq_data_get_irq_handler_data(data); |
| 249 | struct irq_chip *chip = irq_data_get_irq_chip(data); | 249 | struct irq_chip *chip = irq_data_get_irq_chip(data); |
| 250 | u32 base, pin, mask; | 250 | u32 base, pin, mask; |
| 251 | unsigned long reg, pending; | 251 | unsigned long reg, ena, pending; |
| 252 | unsigned virq; | 252 | unsigned virq; |
| 253 | 253 | ||
| 254 | /* check from GPIO controller which pin triggered the interrupt */ | 254 | /* check from GPIO controller which pin triggered the interrupt */ |
| 255 | for (base = 0; base < lg->chip.ngpio; base += 32) { | 255 | for (base = 0; base < lg->chip.ngpio; base += 32) { |
| 256 | reg = lp_gpio_reg(&lg->chip, base, LP_INT_STAT); | 256 | reg = lp_gpio_reg(&lg->chip, base, LP_INT_STAT); |
| 257 | ena = lp_gpio_reg(&lg->chip, base, LP_INT_ENABLE); | ||
| 257 | 258 | ||
| 258 | while ((pending = inl(reg))) { | 259 | while ((pending = (inl(reg) & inl(ena)))) { |
| 259 | pin = __ffs(pending); | 260 | pin = __ffs(pending); |
| 260 | mask = BIT(pin); | 261 | mask = BIT(pin); |
| 261 | /* Clear before handling so we don't lose an edge */ | 262 | /* Clear before handling so we don't lose an edge */ |
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 5c1ef2b3ef18..f2beb728ed8f 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c | |||
| @@ -73,15 +73,8 @@ static irqreturn_t acpi_gpio_irq_handler(int irq, void *data) | |||
| 73 | static irqreturn_t acpi_gpio_irq_handler_evt(int irq, void *data) | 73 | static irqreturn_t acpi_gpio_irq_handler_evt(int irq, void *data) |
| 74 | { | 74 | { |
| 75 | struct acpi_gpio_evt_pin *evt_pin = data; | 75 | struct acpi_gpio_evt_pin *evt_pin = data; |
| 76 | struct acpi_object_list args; | ||
| 77 | union acpi_object arg; | ||
| 78 | 76 | ||
| 79 | arg.type = ACPI_TYPE_INTEGER; | 77 | acpi_execute_simple_method(evt_pin->evt_handle, NULL, evt_pin->pin); |
| 80 | arg.integer.value = evt_pin->pin; | ||
| 81 | args.count = 1; | ||
| 82 | args.pointer = &arg; | ||
| 83 | |||
| 84 | acpi_evaluate_object(evt_pin->evt_handle, NULL, &args, NULL); | ||
| 85 | 78 | ||
| 86 | return IRQ_HANDLED; | 79 | return IRQ_HANDLED; |
| 87 | } | 80 | } |
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 86ef3461ec06..0dee0e0c247a 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c | |||
| @@ -136,7 +136,7 @@ static struct gpio_desc *gpio_to_desc(unsigned gpio) | |||
| 136 | */ | 136 | */ |
| 137 | static int desc_to_gpio(const struct gpio_desc *desc) | 137 | static int desc_to_gpio(const struct gpio_desc *desc) |
| 138 | { | 138 | { |
| 139 | return desc->chip->base + gpio_chip_hwgpio(desc); | 139 | return desc - &gpio_desc[0]; |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | 142 | ||
| @@ -1398,7 +1398,7 @@ static int gpiod_request(struct gpio_desc *desc, const char *label) | |||
| 1398 | int status = -EPROBE_DEFER; | 1398 | int status = -EPROBE_DEFER; |
| 1399 | unsigned long flags; | 1399 | unsigned long flags; |
| 1400 | 1400 | ||
| 1401 | if (!desc || !desc->chip) { | 1401 | if (!desc) { |
| 1402 | pr_warn("%s: invalid GPIO\n", __func__); | 1402 | pr_warn("%s: invalid GPIO\n", __func__); |
| 1403 | return -EINVAL; | 1403 | return -EINVAL; |
| 1404 | } | 1404 | } |
| @@ -1406,6 +1406,8 @@ static int gpiod_request(struct gpio_desc *desc, const char *label) | |||
| 1406 | spin_lock_irqsave(&gpio_lock, flags); | 1406 | spin_lock_irqsave(&gpio_lock, flags); |
| 1407 | 1407 | ||
| 1408 | chip = desc->chip; | 1408 | chip = desc->chip; |
| 1409 | if (chip == NULL) | ||
| 1410 | goto done; | ||
| 1409 | 1411 | ||
| 1410 | if (!try_module_get(chip->owner)) | 1412 | if (!try_module_get(chip->owner)) |
| 1411 | goto done; | 1413 | goto done; |
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index e572dd20bdee..05ad9ba0a67e 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
| @@ -402,9 +402,16 @@ long drm_ioctl(struct file *filp, | |||
| 402 | cmd = ioctl->cmd_drv; | 402 | cmd = ioctl->cmd_drv; |
| 403 | } | 403 | } |
| 404 | else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) { | 404 | else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) { |
| 405 | u32 drv_size; | ||
| 406 | |||
| 405 | ioctl = &drm_ioctls[nr]; | 407 | ioctl = &drm_ioctls[nr]; |
| 406 | cmd = ioctl->cmd; | 408 | |
| 409 | drv_size = _IOC_SIZE(ioctl->cmd); | ||
| 407 | usize = asize = _IOC_SIZE(cmd); | 410 | usize = asize = _IOC_SIZE(cmd); |
| 411 | if (drv_size > asize) | ||
| 412 | asize = drv_size; | ||
| 413 | |||
| 414 | cmd = ioctl->cmd; | ||
| 408 | } else | 415 | } else |
| 409 | goto err_i1; | 416 | goto err_i1; |
| 410 | 417 | ||
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 1688ff500513..830f7501cb4d 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c | |||
| @@ -2925,6 +2925,8 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb) | |||
| 2925 | /* Speaker Allocation Data Block */ | 2925 | /* Speaker Allocation Data Block */ |
| 2926 | if (dbl == 3) { | 2926 | if (dbl == 3) { |
| 2927 | *sadb = kmalloc(dbl, GFP_KERNEL); | 2927 | *sadb = kmalloc(dbl, GFP_KERNEL); |
| 2928 | if (!*sadb) | ||
| 2929 | return -ENOMEM; | ||
| 2928 | memcpy(*sadb, &db[1], dbl); | 2930 | memcpy(*sadb, &db[1], dbl); |
| 2929 | count = dbl; | 2931 | count = dbl; |
| 2930 | break; | 2932 | break; |
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index f6f6cc7fc133..3d13ca6e257f 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c | |||
| @@ -416,14 +416,6 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) | |||
| 416 | return; | 416 | return; |
| 417 | 417 | ||
| 418 | /* | 418 | /* |
| 419 | * fbdev->blank can be called from irq context in case of a panic. | ||
| 420 | * Since we already have our own special panic handler which will | ||
| 421 | * restore the fbdev console mode completely, just bail out early. | ||
| 422 | */ | ||
| 423 | if (oops_in_progress) | ||
| 424 | return; | ||
| 425 | |||
| 426 | /* | ||
| 427 | * For each CRTC in this fb, turn the connectors on/off. | 419 | * For each CRTC in this fb, turn the connectors on/off. |
| 428 | */ | 420 | */ |
| 429 | drm_modeset_lock_all(dev); | 421 | drm_modeset_lock_all(dev); |
diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c index 92babac362ec..2db731f00930 100644 --- a/drivers/gpu/drm/gma500/gtt.c +++ b/drivers/gpu/drm/gma500/gtt.c | |||
| @@ -204,6 +204,7 @@ static int psb_gtt_attach_pages(struct gtt_range *gt) | |||
| 204 | if (IS_ERR(pages)) | 204 | if (IS_ERR(pages)) |
| 205 | return PTR_ERR(pages); | 205 | return PTR_ERR(pages); |
| 206 | 206 | ||
| 207 | gt->npage = gt->gem.size / PAGE_SIZE; | ||
| 207 | gt->pages = pages; | 208 | gt->pages = pages; |
| 208 | 209 | ||
| 209 | return 0; | 210 | return 0; |
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index c27a21034a5e..d5c784d48671 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
| @@ -1290,12 +1290,9 @@ static int i915_load_modeset_init(struct drm_device *dev) | |||
| 1290 | * then we do not take part in VGA arbitration and the | 1290 | * then we do not take part in VGA arbitration and the |
| 1291 | * vga_client_register() fails with -ENODEV. | 1291 | * vga_client_register() fails with -ENODEV. |
| 1292 | */ | 1292 | */ |
| 1293 | if (!HAS_PCH_SPLIT(dev)) { | 1293 | ret = vga_client_register(dev->pdev, dev, NULL, i915_vga_set_decode); |
| 1294 | ret = vga_client_register(dev->pdev, dev, NULL, | 1294 | if (ret && ret != -ENODEV) |
| 1295 | i915_vga_set_decode); | 1295 | goto out; |
| 1296 | if (ret && ret != -ENODEV) | ||
| 1297 | goto out; | ||
| 1298 | } | ||
| 1299 | 1296 | ||
| 1300 | intel_register_dsm_handler(); | 1297 | intel_register_dsm_handler(); |
| 1301 | 1298 | ||
| @@ -1351,12 +1348,6 @@ static int i915_load_modeset_init(struct drm_device *dev) | |||
| 1351 | */ | 1348 | */ |
| 1352 | intel_fbdev_initial_config(dev); | 1349 | intel_fbdev_initial_config(dev); |
| 1353 | 1350 | ||
| 1354 | /* | ||
| 1355 | * Must do this after fbcon init so that | ||
| 1356 | * vgacon_save_screen() works during the handover. | ||
| 1357 | */ | ||
| 1358 | i915_disable_vga_mem(dev); | ||
| 1359 | |||
| 1360 | /* Only enable hotplug handling once the fbdev is fully set up. */ | 1351 | /* Only enable hotplug handling once the fbdev is fully set up. */ |
| 1361 | dev_priv->enable_hotplug_processing = true; | 1352 | dev_priv->enable_hotplug_processing = true; |
| 1362 | 1353 | ||
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 69d8ed5416c3..2ad27880cd04 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
| @@ -505,6 +505,8 @@ static int i915_drm_freeze(struct drm_device *dev) | |||
| 505 | intel_modeset_suspend_hw(dev); | 505 | intel_modeset_suspend_hw(dev); |
| 506 | } | 506 | } |
| 507 | 507 | ||
| 508 | i915_gem_suspend_gtt_mappings(dev); | ||
| 509 | |||
| 508 | i915_save_state(dev); | 510 | i915_save_state(dev); |
| 509 | 511 | ||
| 510 | intel_opregion_fini(dev); | 512 | intel_opregion_fini(dev); |
| @@ -648,7 +650,8 @@ static int i915_drm_thaw(struct drm_device *dev) | |||
| 648 | mutex_lock(&dev->struct_mutex); | 650 | mutex_lock(&dev->struct_mutex); |
| 649 | i915_gem_restore_gtt_mappings(dev); | 651 | i915_gem_restore_gtt_mappings(dev); |
| 650 | mutex_unlock(&dev->struct_mutex); | 652 | mutex_unlock(&dev->struct_mutex); |
| 651 | } | 653 | } else if (drm_core_check_feature(dev, DRIVER_MODESET)) |
| 654 | i915_check_and_clear_faults(dev); | ||
| 652 | 655 | ||
| 653 | __i915_drm_thaw(dev); | 656 | __i915_drm_thaw(dev); |
| 654 | 657 | ||
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 35874b3a86dc..ab0f2c0a440c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -497,10 +497,12 @@ struct i915_address_space { | |||
| 497 | 497 | ||
| 498 | /* FIXME: Need a more generic return type */ | 498 | /* FIXME: Need a more generic return type */ |
| 499 | gen6_gtt_pte_t (*pte_encode)(dma_addr_t addr, | 499 | gen6_gtt_pte_t (*pte_encode)(dma_addr_t addr, |
| 500 | enum i915_cache_level level); | 500 | enum i915_cache_level level, |
| 501 | bool valid); /* Create a valid PTE */ | ||
| 501 | void (*clear_range)(struct i915_address_space *vm, | 502 | void (*clear_range)(struct i915_address_space *vm, |
| 502 | unsigned int first_entry, | 503 | unsigned int first_entry, |
| 503 | unsigned int num_entries); | 504 | unsigned int num_entries, |
| 505 | bool use_scratch); | ||
| 504 | void (*insert_entries)(struct i915_address_space *vm, | 506 | void (*insert_entries)(struct i915_address_space *vm, |
| 505 | struct sg_table *st, | 507 | struct sg_table *st, |
| 506 | unsigned int first_entry, | 508 | unsigned int first_entry, |
| @@ -2065,6 +2067,8 @@ void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt, | |||
| 2065 | void i915_ppgtt_unbind_object(struct i915_hw_ppgtt *ppgtt, | 2067 | void i915_ppgtt_unbind_object(struct i915_hw_ppgtt *ppgtt, |
| 2066 | struct drm_i915_gem_object *obj); | 2068 | struct drm_i915_gem_object *obj); |
| 2067 | 2069 | ||
| 2070 | void i915_check_and_clear_faults(struct drm_device *dev); | ||
| 2071 | void i915_gem_suspend_gtt_mappings(struct drm_device *dev); | ||
| 2068 | void i915_gem_restore_gtt_mappings(struct drm_device *dev); | 2072 | void i915_gem_restore_gtt_mappings(struct drm_device *dev); |
| 2069 | int __must_check i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj); | 2073 | int __must_check i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj); |
| 2070 | void i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj, | 2074 | void i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj, |
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 212f6d8c35ec..1f7b4caefb6e 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c | |||
| @@ -58,9 +58,10 @@ | |||
| 58 | #define HSW_WT_ELLC_LLC_AGE0 HSW_CACHEABILITY_CONTROL(0x6) | 58 | #define HSW_WT_ELLC_LLC_AGE0 HSW_CACHEABILITY_CONTROL(0x6) |
| 59 | 59 | ||
| 60 | static gen6_gtt_pte_t snb_pte_encode(dma_addr_t addr, | 60 | static gen6_gtt_pte_t snb_pte_encode(dma_addr_t addr, |
| 61 | enum i915_cache_level level) | 61 | enum i915_cache_level level, |
| 62 | bool valid) | ||
| 62 | { | 63 | { |
| 63 | gen6_gtt_pte_t pte = GEN6_PTE_VALID; | 64 | gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0; |
| 64 | pte |= GEN6_PTE_ADDR_ENCODE(addr); | 65 | pte |= GEN6_PTE_ADDR_ENCODE(addr); |
| 65 | 66 | ||
| 66 | switch (level) { | 67 | switch (level) { |
| @@ -79,9 +80,10 @@ static gen6_gtt_pte_t snb_pte_encode(dma_addr_t addr, | |||
| 79 | } | 80 | } |
| 80 | 81 | ||
| 81 | static gen6_gtt_pte_t ivb_pte_encode(dma_addr_t addr, | 82 | static gen6_gtt_pte_t ivb_pte_encode(dma_addr_t addr, |
| 82 | enum i915_cache_level level) | 83 | enum i915_cache_level level, |
| 84 | bool valid) | ||
| 83 | { | 85 | { |
| 84 | gen6_gtt_pte_t pte = GEN6_PTE_VALID; | 86 | gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0; |
| 85 | pte |= GEN6_PTE_ADDR_ENCODE(addr); | 87 | pte |= GEN6_PTE_ADDR_ENCODE(addr); |
| 86 | 88 | ||
| 87 | switch (level) { | 89 | switch (level) { |
| @@ -105,9 +107,10 @@ static gen6_gtt_pte_t ivb_pte_encode(dma_addr_t addr, | |||
| 105 | #define BYT_PTE_SNOOPED_BY_CPU_CACHES (1 << 2) | 107 | #define BYT_PTE_SNOOPED_BY_CPU_CACHES (1 << 2) |
| 106 | 108 | ||
| 107 | static gen6_gtt_pte_t byt_pte_encode(dma_addr_t addr, | 109 | static gen6_gtt_pte_t byt_pte_encode(dma_addr_t addr, |
| 108 | enum i915_cache_level level) | 110 | enum i915_cache_level level, |
| 111 | bool valid) | ||
| 109 | { | 112 | { |
| 110 | gen6_gtt_pte_t pte = GEN6_PTE_VALID; | 113 | gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0; |
| 111 | pte |= GEN6_PTE_ADDR_ENCODE(addr); | 114 | pte |= GEN6_PTE_ADDR_ENCODE(addr); |
| 112 | 115 | ||
| 113 | /* Mark the page as writeable. Other platforms don't have a | 116 | /* Mark the page as writeable. Other platforms don't have a |
| @@ -122,9 +125,10 @@ static gen6_gtt_pte_t byt_pte_encode(dma_addr_t addr, | |||
| 122 | } | 125 | } |
| 123 | 126 | ||
| 124 | static gen6_gtt_pte_t hsw_pte_encode(dma_addr_t addr, | 127 | static gen6_gtt_pte_t hsw_pte_encode(dma_addr_t addr, |
| 125 | enum i915_cache_level level) | 128 | enum i915_cache_level level, |
| 129 | bool valid) | ||
| 126 | { | 130 | { |
| 127 | gen6_gtt_pte_t pte = GEN6_PTE_VALID; | 131 | gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0; |
| 128 | pte |= HSW_PTE_ADDR_ENCODE(addr); | 132 | pte |= HSW_PTE_ADDR_ENCODE(addr); |
| 129 | 133 | ||
| 130 | if (level != I915_CACHE_NONE) | 134 | if (level != I915_CACHE_NONE) |
| @@ -134,9 +138,10 @@ static gen6_gtt_pte_t hsw_pte_encode(dma_addr_t addr, | |||
| 134 | } | 138 | } |
| 135 | 139 | ||
| 136 | static gen6_gtt_pte_t iris_pte_encode(dma_addr_t addr, | 140 | static gen6_gtt_pte_t iris_pte_encode(dma_addr_t addr, |
| 137 | enum i915_cache_level level) | 141 | enum i915_cache_level level, |
| 142 | bool valid) | ||
| 138 | { | 143 | { |
| 139 | gen6_gtt_pte_t pte = GEN6_PTE_VALID; | 144 | gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0; |
| 140 | pte |= HSW_PTE_ADDR_ENCODE(addr); | 145 | pte |= HSW_PTE_ADDR_ENCODE(addr); |
| 141 | 146 | ||
| 142 | switch (level) { | 147 | switch (level) { |
| @@ -236,7 +241,8 @@ static int gen6_ppgtt_enable(struct drm_device *dev) | |||
| 236 | /* PPGTT support for Sandybdrige/Gen6 and later */ | 241 | /* PPGTT support for Sandybdrige/Gen6 and later */ |
| 237 | static void gen6_ppgtt_clear_range(struct i915_address_space *vm, | 242 | static void gen6_ppgtt_clear_range(struct i915_address_space *vm, |
| 238 | unsigned first_entry, | 243 | unsigned first_entry, |
| 239 | unsigned num_entries) | 244 | unsigned num_entries, |
| 245 | bool use_scratch) | ||
| 240 | { | 246 | { |
| 241 | struct i915_hw_ppgtt *ppgtt = | 247 | struct i915_hw_ppgtt *ppgtt = |
| 242 | container_of(vm, struct i915_hw_ppgtt, base); | 248 | container_of(vm, struct i915_hw_ppgtt, base); |
| @@ -245,7 +251,7 @@ static void gen6_ppgtt_clear_range(struct i915_address_space *vm, | |||
| 245 | unsigned first_pte = first_entry % I915_PPGTT_PT_ENTRIES; | 251 | unsigned first_pte = first_entry % I915_PPGTT_PT_ENTRIES; |
| 246 | unsigned last_pte, i; | 252 | unsigned last_pte, i; |
| 247 | 253 | ||
| 248 | scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC); | 254 | scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC, true); |
| 249 | 255 | ||
| 250 | while (num_entries) { | 256 | while (num_entries) { |
| 251 | last_pte = first_pte + num_entries; | 257 | last_pte = first_pte + num_entries; |
| @@ -282,7 +288,7 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm, | |||
| 282 | dma_addr_t page_addr; | 288 | dma_addr_t page_addr; |
| 283 | 289 | ||
| 284 | page_addr = sg_page_iter_dma_address(&sg_iter); | 290 | page_addr = sg_page_iter_dma_address(&sg_iter); |
| 285 | pt_vaddr[act_pte] = vm->pte_encode(page_addr, cache_level); | 291 | pt_vaddr[act_pte] = vm->pte_encode(page_addr, cache_level, true); |
| 286 | if (++act_pte == I915_PPGTT_PT_ENTRIES) { | 292 | if (++act_pte == I915_PPGTT_PT_ENTRIES) { |
| 287 | kunmap_atomic(pt_vaddr); | 293 | kunmap_atomic(pt_vaddr); |
| 288 | act_pt++; | 294 | act_pt++; |
| @@ -367,7 +373,7 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt) | |||
| 367 | } | 373 | } |
| 368 | 374 | ||
| 369 | ppgtt->base.clear_range(&ppgtt->base, 0, | 375 | ppgtt->base.clear_range(&ppgtt->base, 0, |
| 370 | ppgtt->num_pd_entries * I915_PPGTT_PT_ENTRIES); | 376 | ppgtt->num_pd_entries * I915_PPGTT_PT_ENTRIES, true); |
| 371 | 377 | ||
| 372 | ppgtt->pd_offset = first_pd_entry_in_global_pt * sizeof(gen6_gtt_pte_t); | 378 | ppgtt->pd_offset = first_pd_entry_in_global_pt * sizeof(gen6_gtt_pte_t); |
| 373 | 379 | ||
| @@ -444,7 +450,8 @@ void i915_ppgtt_unbind_object(struct i915_hw_ppgtt *ppgtt, | |||
| 444 | { | 450 | { |
| 445 | ppgtt->base.clear_range(&ppgtt->base, | 451 | ppgtt->base.clear_range(&ppgtt->base, |
| 446 | i915_gem_obj_ggtt_offset(obj) >> PAGE_SHIFT, | 452 | i915_gem_obj_ggtt_offset(obj) >> PAGE_SHIFT, |
| 447 | obj->base.size >> PAGE_SHIFT); | 453 | obj->base.size >> PAGE_SHIFT, |
| 454 | true); | ||
| 448 | } | 455 | } |
| 449 | 456 | ||
| 450 | extern int intel_iommu_gfx_mapped; | 457 | extern int intel_iommu_gfx_mapped; |
| @@ -485,15 +492,65 @@ static void undo_idling(struct drm_i915_private *dev_priv, bool interruptible) | |||
| 485 | dev_priv->mm.interruptible = interruptible; | 492 | dev_priv->mm.interruptible = interruptible; |
| 486 | } | 493 | } |
| 487 | 494 | ||
| 495 | void i915_check_and_clear_faults(struct drm_device *dev) | ||
| 496 | { | ||
| 497 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
| 498 | struct intel_ring_buffer *ring; | ||
| 499 | int i; | ||
| 500 | |||
| 501 | if (INTEL_INFO(dev)->gen < 6) | ||
| 502 | return; | ||
| 503 | |||
| 504 | for_each_ring(ring, dev_priv, i) { | ||
| 505 | u32 fault_reg; | ||
| 506 | fault_reg = I915_READ(RING_FAULT_REG(ring)); | ||
| 507 | if (fault_reg & RING_FAULT_VALID) { | ||
| 508 | DRM_DEBUG_DRIVER("Unexpected fault\n" | ||
| 509 | "\tAddr: 0x%08lx\\n" | ||
| 510 | "\tAddress space: %s\n" | ||
| 511 | "\tSource ID: %d\n" | ||
| 512 | "\tType: %d\n", | ||
| 513 | fault_reg & PAGE_MASK, | ||
| 514 | fault_reg & RING_FAULT_GTTSEL_MASK ? "GGTT" : "PPGTT", | ||
| 515 | RING_FAULT_SRCID(fault_reg), | ||
| 516 | RING_FAULT_FAULT_TYPE(fault_reg)); | ||
| 517 | I915_WRITE(RING_FAULT_REG(ring), | ||
| 518 | fault_reg & ~RING_FAULT_VALID); | ||
| 519 | } | ||
| 520 | } | ||
| 521 | POSTING_READ(RING_FAULT_REG(&dev_priv->ring[RCS])); | ||
| 522 | } | ||
| 523 | |||
| 524 | void i915_gem_suspend_gtt_mappings(struct drm_device *dev) | ||
| 525 | { | ||
| 526 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
| 527 | |||
| 528 | /* Don't bother messing with faults pre GEN6 as we have little | ||
| 529 | * documentation supporting that it's a good idea. | ||
| 530 | */ | ||
| 531 | if (INTEL_INFO(dev)->gen < 6) | ||
| 532 | return; | ||
| 533 | |||
| 534 | i915_check_and_clear_faults(dev); | ||
| 535 | |||
| 536 | dev_priv->gtt.base.clear_range(&dev_priv->gtt.base, | ||
| 537 | dev_priv->gtt.base.start / PAGE_SIZE, | ||
| 538 | dev_priv->gtt.base.total / PAGE_SIZE, | ||
| 539 | false); | ||
| 540 | } | ||
| 541 | |||
| 488 | void i915_gem_restore_gtt_mappings(struct drm_device *dev) | 542 | void i915_gem_restore_gtt_mappings(struct drm_device *dev) |
| 489 | { | 543 | { |
| 490 | struct drm_i915_private *dev_priv = dev->dev_private; | 544 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 491 | struct drm_i915_gem_object *obj; | 545 | struct drm_i915_gem_object *obj; |
| 492 | 546 | ||
| 547 | i915_check_and_clear_faults(dev); | ||
| 548 | |||
| 493 | /* First fill our portion of the GTT with scratch pages */ | 549 | /* First fill our portion of the GTT with scratch pages */ |
| 494 | dev_priv->gtt.base.clear_range(&dev_priv->gtt.base, | 550 | dev_priv->gtt.base.clear_range(&dev_priv->gtt.base, |
| 495 | dev_priv->gtt.base.start / PAGE_SIZE, | 551 | dev_priv->gtt.base.start / PAGE_SIZE, |
| 496 | dev_priv->gtt.base.total / PAGE_SIZE); | 552 | dev_priv->gtt.base.total / PAGE_SIZE, |
| 553 | true); | ||
| 497 | 554 | ||
| 498 | list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) { | 555 | list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) { |
| 499 | i915_gem_clflush_object(obj, obj->pin_display); | 556 | i915_gem_clflush_object(obj, obj->pin_display); |
| @@ -536,7 +593,7 @@ static void gen6_ggtt_insert_entries(struct i915_address_space *vm, | |||
| 536 | 593 | ||
| 537 | for_each_sg_page(st->sgl, &sg_iter, st->nents, 0) { | 594 | for_each_sg_page(st->sgl, &sg_iter, st->nents, 0) { |
| 538 | addr = sg_page_iter_dma_address(&sg_iter); | 595 | addr = sg_page_iter_dma_address(&sg_iter); |
| 539 | iowrite32(vm->pte_encode(addr, level), >t_entries[i]); | 596 | iowrite32(vm->pte_encode(addr, level, true), >t_entries[i]); |
| 540 | i++; | 597 | i++; |
| 541 | } | 598 | } |
| 542 | 599 | ||
| @@ -548,7 +605,7 @@ static void gen6_ggtt_insert_entries(struct i915_address_space *vm, | |||
| 548 | */ | 605 | */ |
| 549 | if (i != 0) | 606 | if (i != 0) |
| 550 | WARN_ON(readl(>t_entries[i-1]) != | 607 | WARN_ON(readl(>t_entries[i-1]) != |
| 551 | vm->pte_encode(addr, level)); | 608 | vm->pte_encode(addr, level, true)); |
| 552 | 609 | ||
| 553 | /* This next bit makes the above posting read even more important. We | 610 | /* This next bit makes the above posting read even more important. We |
| 554 | * want to flush the TLBs only after we're certain all the PTE updates | 611 | * want to flush the TLBs only after we're certain all the PTE updates |
| @@ -560,7 +617,8 @@ static void gen6_ggtt_insert_entries(struct i915_address_space *vm, | |||
| 560 | 617 | ||
| 561 | static void gen6_ggtt_clear_range(struct i915_address_space *vm, | 618 | static void gen6_ggtt_clear_range(struct i915_address_space *vm, |
| 562 | unsigned int first_entry, | 619 | unsigned int first_entry, |
| 563 | unsigned int num_entries) | 620 | unsigned int num_entries, |
| 621 | bool use_scratch) | ||
| 564 | { | 622 | { |
| 565 | struct drm_i915_private *dev_priv = vm->dev->dev_private; | 623 | struct drm_i915_private *dev_priv = vm->dev->dev_private; |
| 566 | gen6_gtt_pte_t scratch_pte, __iomem *gtt_base = | 624 | gen6_gtt_pte_t scratch_pte, __iomem *gtt_base = |
| @@ -573,7 +631,8 @@ static void gen6_ggtt_clear_range(struct i915_address_space *vm, | |||
| 573 | first_entry, num_entries, max_entries)) | 631 | first_entry, num_entries, max_entries)) |
| 574 | num_entries = max_entries; | 632 | num_entries = max_entries; |
| 575 | 633 | ||
| 576 | scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC); | 634 | scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC, use_scratch); |
| 635 | |||
| 577 | for (i = 0; i < num_entries; i++) | 636 | for (i = 0; i < num_entries; i++) |
| 578 | iowrite32(scratch_pte, >t_base[i]); | 637 | iowrite32(scratch_pte, >t_base[i]); |
| 579 | readl(gtt_base); | 638 | readl(gtt_base); |
| @@ -594,7 +653,8 @@ static void i915_ggtt_insert_entries(struct i915_address_space *vm, | |||
| 594 | 653 | ||
| 595 | static void i915_ggtt_clear_range(struct i915_address_space *vm, | 654 | static void i915_ggtt_clear_range(struct i915_address_space *vm, |
| 596 | unsigned int first_entry, | 655 | unsigned int first_entry, |
| 597 | unsigned int num_entries) | 656 | unsigned int num_entries, |
| 657 | bool unused) | ||
| 598 | { | 658 | { |
| 599 | intel_gtt_clear_range(first_entry, num_entries); | 659 | intel_gtt_clear_range(first_entry, num_entries); |
| 600 | } | 660 | } |
| @@ -622,7 +682,8 @@ void i915_gem_gtt_unbind_object(struct drm_i915_gem_object *obj) | |||
| 622 | 682 | ||
| 623 | dev_priv->gtt.base.clear_range(&dev_priv->gtt.base, | 683 | dev_priv->gtt.base.clear_range(&dev_priv->gtt.base, |
| 624 | entry, | 684 | entry, |
| 625 | obj->base.size >> PAGE_SHIFT); | 685 | obj->base.size >> PAGE_SHIFT, |
| 686 | true); | ||
| 626 | 687 | ||
| 627 | obj->has_global_gtt_mapping = 0; | 688 | obj->has_global_gtt_mapping = 0; |
| 628 | } | 689 | } |
| @@ -709,11 +770,11 @@ void i915_gem_setup_global_gtt(struct drm_device *dev, | |||
| 709 | const unsigned long count = (hole_end - hole_start) / PAGE_SIZE; | 770 | const unsigned long count = (hole_end - hole_start) / PAGE_SIZE; |
| 710 | DRM_DEBUG_KMS("clearing unused GTT space: [%lx, %lx]\n", | 771 | DRM_DEBUG_KMS("clearing unused GTT space: [%lx, %lx]\n", |
| 711 | hole_start, hole_end); | 772 | hole_start, hole_end); |
| 712 | ggtt_vm->clear_range(ggtt_vm, hole_start / PAGE_SIZE, count); | 773 | ggtt_vm->clear_range(ggtt_vm, hole_start / PAGE_SIZE, count, true); |
| 713 | } | 774 | } |
| 714 | 775 | ||
| 715 | /* And finally clear the reserved guard page */ | 776 | /* And finally clear the reserved guard page */ |
| 716 | ggtt_vm->clear_range(ggtt_vm, end / PAGE_SIZE - 1, 1); | 777 | ggtt_vm->clear_range(ggtt_vm, end / PAGE_SIZE - 1, 1, true); |
| 717 | } | 778 | } |
| 718 | 779 | ||
| 719 | static bool | 780 | static bool |
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index c159e1a6810f..ef9b35479f01 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
| @@ -604,6 +604,10 @@ | |||
| 604 | #define ARB_MODE_SWIZZLE_IVB (1<<5) | 604 | #define ARB_MODE_SWIZZLE_IVB (1<<5) |
| 605 | #define RENDER_HWS_PGA_GEN7 (0x04080) | 605 | #define RENDER_HWS_PGA_GEN7 (0x04080) |
| 606 | #define RING_FAULT_REG(ring) (0x4094 + 0x100*(ring)->id) | 606 | #define RING_FAULT_REG(ring) (0x4094 + 0x100*(ring)->id) |
| 607 | #define RING_FAULT_GTTSEL_MASK (1<<11) | ||
| 608 | #define RING_FAULT_SRCID(x) ((x >> 3) & 0xff) | ||
| 609 | #define RING_FAULT_FAULT_TYPE(x) ((x >> 1) & 0x3) | ||
| 610 | #define RING_FAULT_VALID (1<<0) | ||
| 607 | #define DONE_REG 0x40b0 | 611 | #define DONE_REG 0x40b0 |
| 608 | #define BSD_HWS_PGA_GEN7 (0x04180) | 612 | #define BSD_HWS_PGA_GEN7 (0x04180) |
| 609 | #define BLT_HWS_PGA_GEN7 (0x04280) | 613 | #define BLT_HWS_PGA_GEN7 (0x04280) |
| @@ -3881,6 +3885,9 @@ | |||
| 3881 | #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG 0x9030 | 3885 | #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG 0x9030 |
| 3882 | #define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11) | 3886 | #define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11) |
| 3883 | 3887 | ||
| 3888 | #define HSW_SCRATCH1 0xb038 | ||
| 3889 | #define HSW_SCRATCH1_L3_DATA_ATOMICS_DISABLE (1<<27) | ||
| 3890 | |||
| 3884 | #define HSW_FUSE_STRAP 0x42014 | 3891 | #define HSW_FUSE_STRAP 0x42014 |
| 3885 | #define HSW_CDCLK_LIMIT (1 << 24) | 3892 | #define HSW_CDCLK_LIMIT (1 << 24) |
| 3886 | 3893 | ||
| @@ -4276,7 +4283,9 @@ | |||
| 4276 | #define FDI_RX_CHICKEN(pipe) _PIPE(pipe, _FDI_RXA_CHICKEN, _FDI_RXB_CHICKEN) | 4283 | #define FDI_RX_CHICKEN(pipe) _PIPE(pipe, _FDI_RXA_CHICKEN, _FDI_RXB_CHICKEN) |
| 4277 | 4284 | ||
| 4278 | #define SOUTH_DSPCLK_GATE_D 0xc2020 | 4285 | #define SOUTH_DSPCLK_GATE_D 0xc2020 |
| 4286 | #define PCH_DPLUNIT_CLOCK_GATE_DISABLE (1<<30) | ||
| 4279 | #define PCH_DPLSUNIT_CLOCK_GATE_DISABLE (1<<29) | 4287 | #define PCH_DPLSUNIT_CLOCK_GATE_DISABLE (1<<29) |
| 4288 | #define PCH_CPUNIT_CLOCK_GATE_DISABLE (1<<14) | ||
| 4280 | #define PCH_LP_PARTITION_LEVEL_DISABLE (1<<12) | 4289 | #define PCH_LP_PARTITION_LEVEL_DISABLE (1<<12) |
| 4281 | 4290 | ||
| 4282 | /* CPU: FDI_TX */ | 4291 | /* CPU: FDI_TX */ |
| @@ -4728,6 +4737,9 @@ | |||
| 4728 | #define GEN7_ROW_CHICKEN2_GT2 0xf4f4 | 4737 | #define GEN7_ROW_CHICKEN2_GT2 0xf4f4 |
| 4729 | #define DOP_CLOCK_GATING_DISABLE (1<<0) | 4738 | #define DOP_CLOCK_GATING_DISABLE (1<<0) |
| 4730 | 4739 | ||
| 4740 | #define HSW_ROW_CHICKEN3 0xe49c | ||
| 4741 | #define HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE (1 << 6) | ||
| 4742 | |||
| 4731 | #define G4X_AUD_VID_DID (dev_priv->info->display_mmio_offset + 0x62020) | 4743 | #define G4X_AUD_VID_DID (dev_priv->info->display_mmio_offset + 0x62020) |
| 4732 | #define INTEL_AUDIO_DEVCL 0x808629FB | 4744 | #define INTEL_AUDIO_DEVCL 0x808629FB |
| 4733 | #define INTEL_AUDIO_DEVBLC 0x80862801 | 4745 | #define INTEL_AUDIO_DEVBLC 0x80862801 |
diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c index 57fe1ae32a0d..43959edd4291 100644 --- a/drivers/gpu/drm/i915/intel_acpi.c +++ b/drivers/gpu/drm/i915/intel_acpi.c | |||
| @@ -193,16 +193,14 @@ out: | |||
| 193 | 193 | ||
| 194 | static bool intel_dsm_pci_probe(struct pci_dev *pdev) | 194 | static bool intel_dsm_pci_probe(struct pci_dev *pdev) |
| 195 | { | 195 | { |
| 196 | acpi_handle dhandle, intel_handle; | 196 | acpi_handle dhandle; |
| 197 | acpi_status status; | ||
| 198 | int ret; | 197 | int ret; |
| 199 | 198 | ||
| 200 | dhandle = DEVICE_ACPI_HANDLE(&pdev->dev); | 199 | dhandle = DEVICE_ACPI_HANDLE(&pdev->dev); |
| 201 | if (!dhandle) | 200 | if (!dhandle) |
| 202 | return false; | 201 | return false; |
| 203 | 202 | ||
| 204 | status = acpi_get_handle(dhandle, "_DSM", &intel_handle); | 203 | if (!acpi_has_method(dhandle, "_DSM")) { |
| 205 | if (ACPI_FAILURE(status)) { | ||
| 206 | DRM_DEBUG_KMS("no _DSM method for intel device\n"); | 204 | DRM_DEBUG_KMS("no _DSM method for intel device\n"); |
| 207 | return false; | 205 | return false; |
| 208 | } | 206 | } |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e5822e79f912..581fb4b2f766 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -3941,8 +3941,6 @@ static void intel_connector_check_state(struct intel_connector *connector) | |||
| 3941 | * consider. */ | 3941 | * consider. */ |
| 3942 | void intel_connector_dpms(struct drm_connector *connector, int mode) | 3942 | void intel_connector_dpms(struct drm_connector *connector, int mode) |
| 3943 | { | 3943 | { |
| 3944 | struct intel_encoder *encoder = intel_attached_encoder(connector); | ||
| 3945 | |||
| 3946 | /* All the simple cases only support two dpms states. */ | 3944 | /* All the simple cases only support two dpms states. */ |
| 3947 | if (mode != DRM_MODE_DPMS_ON) | 3945 | if (mode != DRM_MODE_DPMS_ON) |
| 3948 | mode = DRM_MODE_DPMS_OFF; | 3946 | mode = DRM_MODE_DPMS_OFF; |
| @@ -3953,10 +3951,8 @@ void intel_connector_dpms(struct drm_connector *connector, int mode) | |||
| 3953 | connector->dpms = mode; | 3951 | connector->dpms = mode; |
| 3954 | 3952 | ||
| 3955 | /* Only need to change hw state when actually enabled */ | 3953 | /* Only need to change hw state when actually enabled */ |
| 3956 | if (encoder->base.crtc) | 3954 | if (connector->encoder) |
| 3957 | intel_encoder_dpms(encoder, mode); | 3955 | intel_encoder_dpms(to_intel_encoder(connector->encoder), mode); |
| 3958 | else | ||
| 3959 | WARN_ON(encoder->connectors_active != false); | ||
| 3960 | 3956 | ||
| 3961 | intel_modeset_check_state(connector->dev); | 3957 | intel_modeset_check_state(connector->dev); |
| 3962 | } | 3958 | } |
| @@ -10049,33 +10045,6 @@ static void i915_disable_vga(struct drm_device *dev) | |||
| 10049 | POSTING_READ(vga_reg); | 10045 | POSTING_READ(vga_reg); |
| 10050 | } | 10046 | } |
| 10051 | 10047 | ||
| 10052 | static void i915_enable_vga_mem(struct drm_device *dev) | ||
| 10053 | { | ||
| 10054 | /* Enable VGA memory on Intel HD */ | ||
| 10055 | if (HAS_PCH_SPLIT(dev)) { | ||
| 10056 | vga_get_uninterruptible(dev->pdev, VGA_RSRC_LEGACY_IO); | ||
| 10057 | outb(inb(VGA_MSR_READ) | VGA_MSR_MEM_EN, VGA_MSR_WRITE); | ||
| 10058 | vga_set_legacy_decoding(dev->pdev, VGA_RSRC_LEGACY_IO | | ||
| 10059 | VGA_RSRC_LEGACY_MEM | | ||
| 10060 | VGA_RSRC_NORMAL_IO | | ||
| 10061 | VGA_RSRC_NORMAL_MEM); | ||
| 10062 | vga_put(dev->pdev, VGA_RSRC_LEGACY_IO); | ||
| 10063 | } | ||
| 10064 | } | ||
| 10065 | |||
| 10066 | void i915_disable_vga_mem(struct drm_device *dev) | ||
| 10067 | { | ||
| 10068 | /* Disable VGA memory on Intel HD */ | ||
| 10069 | if (HAS_PCH_SPLIT(dev)) { | ||
| 10070 | vga_get_uninterruptible(dev->pdev, VGA_RSRC_LEGACY_IO); | ||
| 10071 | outb(inb(VGA_MSR_READ) & ~VGA_MSR_MEM_EN, VGA_MSR_WRITE); | ||
| 10072 | vga_set_legacy_decoding(dev->pdev, VGA_RSRC_LEGACY_IO | | ||
| 10073 | VGA_RSRC_NORMAL_IO | | ||
| 10074 | VGA_RSRC_NORMAL_MEM); | ||
| 10075 | vga_put(dev->pdev, VGA_RSRC_LEGACY_IO); | ||
| 10076 | } | ||
| 10077 | } | ||
| 10078 | |||
| 10079 | void intel_modeset_init_hw(struct drm_device *dev) | 10048 | void intel_modeset_init_hw(struct drm_device *dev) |
| 10080 | { | 10049 | { |
| 10081 | intel_init_power_well(dev); | 10050 | intel_init_power_well(dev); |
| @@ -10354,7 +10323,6 @@ void i915_redisable_vga(struct drm_device *dev) | |||
| 10354 | if (I915_READ(vga_reg) != VGA_DISP_DISABLE) { | 10323 | if (I915_READ(vga_reg) != VGA_DISP_DISABLE) { |
| 10355 | DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n"); | 10324 | DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n"); |
| 10356 | i915_disable_vga(dev); | 10325 | i915_disable_vga(dev); |
| 10357 | i915_disable_vga_mem(dev); | ||
| 10358 | } | 10326 | } |
| 10359 | } | 10327 | } |
| 10360 | 10328 | ||
| @@ -10568,8 +10536,6 @@ void intel_modeset_cleanup(struct drm_device *dev) | |||
| 10568 | 10536 | ||
| 10569 | intel_disable_fbc(dev); | 10537 | intel_disable_fbc(dev); |
| 10570 | 10538 | ||
| 10571 | i915_enable_vga_mem(dev); | ||
| 10572 | |||
| 10573 | intel_disable_gt_powersave(dev); | 10539 | intel_disable_gt_powersave(dev); |
| 10574 | 10540 | ||
| 10575 | ironlake_teardown_rc6(dev); | 10541 | ironlake_teardown_rc6(dev); |
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 79c14e298ba6..2c555f91bfae 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
| @@ -1467,7 +1467,7 @@ static void intel_edp_psr_setup(struct intel_dp *intel_dp) | |||
| 1467 | 1467 | ||
| 1468 | /* Avoid continuous PSR exit by masking memup and hpd */ | 1468 | /* Avoid continuous PSR exit by masking memup and hpd */ |
| 1469 | I915_WRITE(EDP_PSR_DEBUG_CTL, EDP_PSR_DEBUG_MASK_MEMUP | | 1469 | I915_WRITE(EDP_PSR_DEBUG_CTL, EDP_PSR_DEBUG_MASK_MEMUP | |
| 1470 | EDP_PSR_DEBUG_MASK_HPD); | 1470 | EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP); |
| 1471 | 1471 | ||
| 1472 | intel_dp->psr_setup_done = true; | 1472 | intel_dp->psr_setup_done = true; |
| 1473 | } | 1473 | } |
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 28cae80495e2..9b7b68fd5d47 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
| @@ -793,6 +793,5 @@ extern void hsw_pc8_disable_interrupts(struct drm_device *dev); | |||
| 793 | extern void hsw_pc8_restore_interrupts(struct drm_device *dev); | 793 | extern void hsw_pc8_restore_interrupts(struct drm_device *dev); |
| 794 | extern void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv); | 794 | extern void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv); |
| 795 | extern void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv); | 795 | extern void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv); |
| 796 | extern void i915_disable_vga_mem(struct drm_device *dev); | ||
| 797 | 796 | ||
| 798 | #endif /* __INTEL_DRV_H__ */ | 797 | #endif /* __INTEL_DRV_H__ */ |
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index dd176b7296c1..26c2ea3e985c 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
| @@ -3864,8 +3864,6 @@ static void valleyview_enable_rps(struct drm_device *dev) | |||
| 3864 | dev_priv->rps.rpe_delay), | 3864 | dev_priv->rps.rpe_delay), |
| 3865 | dev_priv->rps.rpe_delay); | 3865 | dev_priv->rps.rpe_delay); |
| 3866 | 3866 | ||
| 3867 | INIT_DELAYED_WORK(&dev_priv->rps.vlv_work, vlv_rps_timer_work); | ||
| 3868 | |||
| 3869 | valleyview_set_rps(dev_priv->dev, dev_priv->rps.rpe_delay); | 3867 | valleyview_set_rps(dev_priv->dev, dev_priv->rps.rpe_delay); |
| 3870 | 3868 | ||
| 3871 | gen6_enable_rps_interrupts(dev); | 3869 | gen6_enable_rps_interrupts(dev); |
| @@ -4761,7 +4759,9 @@ static void cpt_init_clock_gating(struct drm_device *dev) | |||
| 4761 | * gating for the panel power sequencer or it will fail to | 4759 | * gating for the panel power sequencer or it will fail to |
| 4762 | * start up when no ports are active. | 4760 | * start up when no ports are active. |
| 4763 | */ | 4761 | */ |
| 4764 | I915_WRITE(SOUTH_DSPCLK_GATE_D, PCH_DPLSUNIT_CLOCK_GATE_DISABLE); | 4762 | I915_WRITE(SOUTH_DSPCLK_GATE_D, PCH_DPLSUNIT_CLOCK_GATE_DISABLE | |
| 4763 | PCH_DPLUNIT_CLOCK_GATE_DISABLE | | ||
| 4764 | PCH_CPUNIT_CLOCK_GATE_DISABLE); | ||
| 4765 | I915_WRITE(SOUTH_CHICKEN2, I915_READ(SOUTH_CHICKEN2) | | 4765 | I915_WRITE(SOUTH_CHICKEN2, I915_READ(SOUTH_CHICKEN2) | |
| 4766 | DPLS_EDP_PPS_FIX_DIS); | 4766 | DPLS_EDP_PPS_FIX_DIS); |
| 4767 | /* The below fixes the weird display corruption, a few pixels shifted | 4767 | /* The below fixes the weird display corruption, a few pixels shifted |
| @@ -4955,6 +4955,11 @@ static void haswell_init_clock_gating(struct drm_device *dev) | |||
| 4955 | I915_WRITE(GEN7_L3_CHICKEN_MODE_REGISTER, | 4955 | I915_WRITE(GEN7_L3_CHICKEN_MODE_REGISTER, |
| 4956 | GEN7_WA_L3_CHICKEN_MODE); | 4956 | GEN7_WA_L3_CHICKEN_MODE); |
| 4957 | 4957 | ||
| 4958 | /* L3 caching of data atomics doesn't work -- disable it. */ | ||
| 4959 | I915_WRITE(HSW_SCRATCH1, HSW_SCRATCH1_L3_DATA_ATOMICS_DISABLE); | ||
| 4960 | I915_WRITE(HSW_ROW_CHICKEN3, | ||
| 4961 | _MASKED_BIT_ENABLE(HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE)); | ||
| 4962 | |||
| 4958 | /* This is required by WaCatErrorRejectionIssue:hsw */ | 4963 | /* This is required by WaCatErrorRejectionIssue:hsw */ |
| 4959 | I915_WRITE(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG, | 4964 | I915_WRITE(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG, |
| 4960 | I915_READ(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG) | | 4965 | I915_READ(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG) | |
| @@ -5681,5 +5686,7 @@ void intel_pm_init(struct drm_device *dev) | |||
| 5681 | 5686 | ||
| 5682 | INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, | 5687 | INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, |
| 5683 | intel_gen6_powersave_work); | 5688 | intel_gen6_powersave_work); |
| 5689 | |||
| 5690 | INIT_DELAYED_WORK(&dev_priv->rps.vlv_work, vlv_rps_timer_work); | ||
| 5684 | } | 5691 | } |
| 5685 | 5692 | ||
diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c index 37712a6df923..e290cfa4acee 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c | |||
| @@ -113,7 +113,7 @@ nouveau_mc_create_(struct nouveau_object *parent, struct nouveau_object *engine, | |||
| 113 | pmc->use_msi = false; | 113 | pmc->use_msi = false; |
| 114 | break; | 114 | break; |
| 115 | default: | 115 | default: |
| 116 | pmc->use_msi = nouveau_boolopt(device->cfgopt, "NvMSI", true); | 116 | pmc->use_msi = nouveau_boolopt(device->cfgopt, "NvMSI", false); |
| 117 | if (pmc->use_msi) { | 117 | if (pmc->use_msi) { |
| 118 | pmc->use_msi = pci_enable_msi(device->pdev) == 0; | 118 | pmc->use_msi = pci_enable_msi(device->pdev) == 0; |
| 119 | if (pmc->use_msi) { | 119 | if (pmc->use_msi) { |
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c index dd7d2e182719..cfbeee607b3a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c | |||
| @@ -253,18 +253,15 @@ static struct vga_switcheroo_handler nouveau_dsm_handler = { | |||
| 253 | 253 | ||
| 254 | static int nouveau_dsm_pci_probe(struct pci_dev *pdev) | 254 | static int nouveau_dsm_pci_probe(struct pci_dev *pdev) |
| 255 | { | 255 | { |
| 256 | acpi_handle dhandle, nvidia_handle; | 256 | acpi_handle dhandle; |
| 257 | acpi_status status; | ||
| 258 | int retval = 0; | 257 | int retval = 0; |
| 259 | 258 | ||
| 260 | dhandle = DEVICE_ACPI_HANDLE(&pdev->dev); | 259 | dhandle = DEVICE_ACPI_HANDLE(&pdev->dev); |
| 261 | if (!dhandle) | 260 | if (!dhandle) |
| 262 | return false; | 261 | return false; |
| 263 | 262 | ||
| 264 | status = acpi_get_handle(dhandle, "_DSM", &nvidia_handle); | 263 | if (!acpi_has_method(dhandle, "_DSM")) |
| 265 | if (ACPI_FAILURE(status)) { | ||
| 266 | return false; | 264 | return false; |
| 267 | } | ||
| 268 | 265 | ||
| 269 | if (nouveau_test_dsm(dhandle, nouveau_dsm, NOUVEAU_DSM_POWER)) | 266 | if (nouveau_test_dsm(dhandle, nouveau_dsm, NOUVEAU_DSM_POWER)) |
| 270 | retval |= NOUVEAU_DSM_HAS_MUX; | 267 | retval |= NOUVEAU_DSM_HAS_MUX; |
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index 32923d2f6002..5e891b226acf 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c | |||
| @@ -707,24 +707,37 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) | |||
| 707 | switch (connector->connector_type) { | 707 | switch (connector->connector_type) { |
| 708 | case DRM_MODE_CONNECTOR_DVII: | 708 | case DRM_MODE_CONNECTOR_DVII: |
| 709 | case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */ | 709 | case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */ |
| 710 | if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) || | 710 | if (radeon_audio != 0) { |
| 711 | (drm_detect_hdmi_monitor(radeon_connector->edid) && | 711 | if (radeon_connector->use_digital && |
| 712 | (radeon_connector->audio == RADEON_AUDIO_AUTO))) | 712 | (radeon_connector->audio == RADEON_AUDIO_ENABLE)) |
| 713 | return ATOM_ENCODER_MODE_HDMI; | 713 | return ATOM_ENCODER_MODE_HDMI; |
| 714 | else if (radeon_connector->use_digital) | 714 | else if (drm_detect_hdmi_monitor(radeon_connector->edid) && |
| 715 | (radeon_connector->audio == RADEON_AUDIO_AUTO)) | ||
| 716 | return ATOM_ENCODER_MODE_HDMI; | ||
| 717 | else if (radeon_connector->use_digital) | ||
| 718 | return ATOM_ENCODER_MODE_DVI; | ||
| 719 | else | ||
| 720 | return ATOM_ENCODER_MODE_CRT; | ||
| 721 | } else if (radeon_connector->use_digital) { | ||
| 715 | return ATOM_ENCODER_MODE_DVI; | 722 | return ATOM_ENCODER_MODE_DVI; |
| 716 | else | 723 | } else { |
| 717 | return ATOM_ENCODER_MODE_CRT; | 724 | return ATOM_ENCODER_MODE_CRT; |
| 725 | } | ||
| 718 | break; | 726 | break; |
| 719 | case DRM_MODE_CONNECTOR_DVID: | 727 | case DRM_MODE_CONNECTOR_DVID: |
| 720 | case DRM_MODE_CONNECTOR_HDMIA: | 728 | case DRM_MODE_CONNECTOR_HDMIA: |
| 721 | default: | 729 | default: |
| 722 | if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) || | 730 | if (radeon_audio != 0) { |
| 723 | (drm_detect_hdmi_monitor(radeon_connector->edid) && | 731 | if (radeon_connector->audio == RADEON_AUDIO_ENABLE) |
| 724 | (radeon_connector->audio == RADEON_AUDIO_AUTO))) | 732 | return ATOM_ENCODER_MODE_HDMI; |
| 725 | return ATOM_ENCODER_MODE_HDMI; | 733 | else if (drm_detect_hdmi_monitor(radeon_connector->edid) && |
| 726 | else | 734 | (radeon_connector->audio == RADEON_AUDIO_AUTO)) |
| 735 | return ATOM_ENCODER_MODE_HDMI; | ||
| 736 | else | ||
| 737 | return ATOM_ENCODER_MODE_DVI; | ||
| 738 | } else { | ||
| 727 | return ATOM_ENCODER_MODE_DVI; | 739 | return ATOM_ENCODER_MODE_DVI; |
| 740 | } | ||
| 728 | break; | 741 | break; |
| 729 | case DRM_MODE_CONNECTOR_LVDS: | 742 | case DRM_MODE_CONNECTOR_LVDS: |
| 730 | return ATOM_ENCODER_MODE_LVDS; | 743 | return ATOM_ENCODER_MODE_LVDS; |
| @@ -732,14 +745,19 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) | |||
| 732 | case DRM_MODE_CONNECTOR_DisplayPort: | 745 | case DRM_MODE_CONNECTOR_DisplayPort: |
| 733 | dig_connector = radeon_connector->con_priv; | 746 | dig_connector = radeon_connector->con_priv; |
| 734 | if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) || | 747 | if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) || |
| 735 | (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) | 748 | (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) { |
| 736 | return ATOM_ENCODER_MODE_DP; | 749 | return ATOM_ENCODER_MODE_DP; |
| 737 | else if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) || | 750 | } else if (radeon_audio != 0) { |
| 738 | (drm_detect_hdmi_monitor(radeon_connector->edid) && | 751 | if (radeon_connector->audio == RADEON_AUDIO_ENABLE) |
| 739 | (radeon_connector->audio == RADEON_AUDIO_AUTO))) | 752 | return ATOM_ENCODER_MODE_HDMI; |
| 740 | return ATOM_ENCODER_MODE_HDMI; | 753 | else if (drm_detect_hdmi_monitor(radeon_connector->edid) && |
| 741 | else | 754 | (radeon_connector->audio == RADEON_AUDIO_AUTO)) |
| 755 | return ATOM_ENCODER_MODE_HDMI; | ||
| 756 | else | ||
| 757 | return ATOM_ENCODER_MODE_DVI; | ||
| 758 | } else { | ||
| 742 | return ATOM_ENCODER_MODE_DVI; | 759 | return ATOM_ENCODER_MODE_DVI; |
| 760 | } | ||
| 743 | break; | 761 | break; |
| 744 | case DRM_MODE_CONNECTOR_eDP: | 762 | case DRM_MODE_CONNECTOR_eDP: |
| 745 | return ATOM_ENCODER_MODE_DP; | 763 | return ATOM_ENCODER_MODE_DP; |
| @@ -1655,7 +1673,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode) | |||
| 1655 | * does the same thing and more. | 1673 | * does the same thing and more. |
| 1656 | */ | 1674 | */ |
| 1657 | if ((rdev->family != CHIP_RV710) && (rdev->family != CHIP_RV730) && | 1675 | if ((rdev->family != CHIP_RV710) && (rdev->family != CHIP_RV730) && |
| 1658 | (rdev->family != CHIP_RS880)) | 1676 | (rdev->family != CHIP_RS780) && (rdev->family != CHIP_RS880)) |
| 1659 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0); | 1677 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0); |
| 1660 | } | 1678 | } |
| 1661 | if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) && connector) { | 1679 | if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) && connector) { |
diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c index b162e98a2953..9b6950d9b3c0 100644 --- a/drivers/gpu/drm/radeon/btc_dpm.c +++ b/drivers/gpu/drm/radeon/btc_dpm.c | |||
| @@ -1930,7 +1930,7 @@ static int btc_set_mc_special_registers(struct radeon_device *rdev, | |||
| 1930 | } | 1930 | } |
| 1931 | j++; | 1931 | j++; |
| 1932 | 1932 | ||
| 1933 | if (j > SMC_EVERGREEN_MC_REGISTER_ARRAY_SIZE) | 1933 | if (j >= SMC_EVERGREEN_MC_REGISTER_ARRAY_SIZE) |
| 1934 | return -EINVAL; | 1934 | return -EINVAL; |
| 1935 | 1935 | ||
| 1936 | tmp = RREG32(MC_PMG_CMD_MRS); | 1936 | tmp = RREG32(MC_PMG_CMD_MRS); |
| @@ -1945,7 +1945,7 @@ static int btc_set_mc_special_registers(struct radeon_device *rdev, | |||
| 1945 | } | 1945 | } |
| 1946 | j++; | 1946 | j++; |
| 1947 | 1947 | ||
| 1948 | if (j > SMC_EVERGREEN_MC_REGISTER_ARRAY_SIZE) | 1948 | if (j >= SMC_EVERGREEN_MC_REGISTER_ARRAY_SIZE) |
| 1949 | return -EINVAL; | 1949 | return -EINVAL; |
| 1950 | break; | 1950 | break; |
| 1951 | case MC_SEQ_RESERVE_M >> 2: | 1951 | case MC_SEQ_RESERVE_M >> 2: |
| @@ -1959,7 +1959,7 @@ static int btc_set_mc_special_registers(struct radeon_device *rdev, | |||
| 1959 | } | 1959 | } |
| 1960 | j++; | 1960 | j++; |
| 1961 | 1961 | ||
| 1962 | if (j > SMC_EVERGREEN_MC_REGISTER_ARRAY_SIZE) | 1962 | if (j >= SMC_EVERGREEN_MC_REGISTER_ARRAY_SIZE) |
| 1963 | return -EINVAL; | 1963 | return -EINVAL; |
| 1964 | break; | 1964 | break; |
| 1965 | default: | 1965 | default: |
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index d02fd1c045d5..9cd2bc989ac7 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c | |||
| @@ -77,6 +77,8 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev); | |||
| 77 | static void cik_program_aspm(struct radeon_device *rdev); | 77 | static void cik_program_aspm(struct radeon_device *rdev); |
| 78 | static void cik_init_pg(struct radeon_device *rdev); | 78 | static void cik_init_pg(struct radeon_device *rdev); |
| 79 | static void cik_init_cg(struct radeon_device *rdev); | 79 | static void cik_init_cg(struct radeon_device *rdev); |
| 80 | static void cik_fini_pg(struct radeon_device *rdev); | ||
| 81 | static void cik_fini_cg(struct radeon_device *rdev); | ||
| 80 | static void cik_enable_gui_idle_interrupt(struct radeon_device *rdev, | 82 | static void cik_enable_gui_idle_interrupt(struct radeon_device *rdev, |
| 81 | bool enable); | 83 | bool enable); |
| 82 | 84 | ||
| @@ -1692,6 +1694,7 @@ static int cik_init_microcode(struct radeon_device *rdev) | |||
| 1692 | fw_name); | 1694 | fw_name); |
| 1693 | release_firmware(rdev->smc_fw); | 1695 | release_firmware(rdev->smc_fw); |
| 1694 | rdev->smc_fw = NULL; | 1696 | rdev->smc_fw = NULL; |
| 1697 | err = 0; | ||
| 1695 | } else if (rdev->smc_fw->size != smc_req_size) { | 1698 | } else if (rdev->smc_fw->size != smc_req_size) { |
| 1696 | printk(KERN_ERR | 1699 | printk(KERN_ERR |
| 1697 | "cik_smc: Bogus length %zu in firmware \"%s\"\n", | 1700 | "cik_smc: Bogus length %zu in firmware \"%s\"\n", |
| @@ -3180,6 +3183,7 @@ int cik_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) | |||
| 3180 | r = radeon_ib_get(rdev, ring->idx, &ib, NULL, 256); | 3183 | r = radeon_ib_get(rdev, ring->idx, &ib, NULL, 256); |
| 3181 | if (r) { | 3184 | if (r) { |
| 3182 | DRM_ERROR("radeon: failed to get ib (%d).\n", r); | 3185 | DRM_ERROR("radeon: failed to get ib (%d).\n", r); |
| 3186 | radeon_scratch_free(rdev, scratch); | ||
| 3183 | return r; | 3187 | return r; |
| 3184 | } | 3188 | } |
| 3185 | ib.ptr[0] = PACKET3(PACKET3_SET_UCONFIG_REG, 1); | 3189 | ib.ptr[0] = PACKET3(PACKET3_SET_UCONFIG_REG, 1); |
| @@ -3196,6 +3200,8 @@ int cik_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) | |||
| 3196 | r = radeon_fence_wait(ib.fence, false); | 3200 | r = radeon_fence_wait(ib.fence, false); |
| 3197 | if (r) { | 3201 | if (r) { |
| 3198 | DRM_ERROR("radeon: fence wait failed (%d).\n", r); | 3202 | DRM_ERROR("radeon: fence wait failed (%d).\n", r); |
| 3203 | radeon_scratch_free(rdev, scratch); | ||
| 3204 | radeon_ib_free(rdev, &ib); | ||
| 3199 | return r; | 3205 | return r; |
| 3200 | } | 3206 | } |
| 3201 | for (i = 0; i < rdev->usec_timeout; i++) { | 3207 | for (i = 0; i < rdev->usec_timeout; i++) { |
| @@ -4185,6 +4191,10 @@ static void cik_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) | |||
| 4185 | dev_info(rdev->dev, " VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n", | 4191 | dev_info(rdev->dev, " VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n", |
| 4186 | RREG32(VM_CONTEXT1_PROTECTION_FAULT_STATUS)); | 4192 | RREG32(VM_CONTEXT1_PROTECTION_FAULT_STATUS)); |
| 4187 | 4193 | ||
| 4194 | /* disable CG/PG */ | ||
| 4195 | cik_fini_pg(rdev); | ||
| 4196 | cik_fini_cg(rdev); | ||
| 4197 | |||
| 4188 | /* stop the rlc */ | 4198 | /* stop the rlc */ |
| 4189 | cik_rlc_stop(rdev); | 4199 | cik_rlc_stop(rdev); |
| 4190 | 4200 | ||
diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c index 85a69d2ea3d2..9fcd338c0fcf 100644 --- a/drivers/gpu/drm/radeon/dce6_afmt.c +++ b/drivers/gpu/drm/radeon/dce6_afmt.c | |||
| @@ -113,6 +113,9 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder) | |||
| 113 | u8 *sadb; | 113 | u8 *sadb; |
| 114 | int sad_count; | 114 | int sad_count; |
| 115 | 115 | ||
| 116 | /* XXX: setting this register causes hangs on some asics */ | ||
| 117 | return; | ||
| 118 | |||
| 116 | if (!dig->afmt->pin) | 119 | if (!dig->afmt->pin) |
| 117 | return; | 120 | return; |
| 118 | 121 | ||
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 555164e270a7..b5c67a99dda9 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
| @@ -3131,7 +3131,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev) | |||
| 3131 | rdev->config.evergreen.sx_max_export_size = 256; | 3131 | rdev->config.evergreen.sx_max_export_size = 256; |
| 3132 | rdev->config.evergreen.sx_max_export_pos_size = 64; | 3132 | rdev->config.evergreen.sx_max_export_pos_size = 64; |
| 3133 | rdev->config.evergreen.sx_max_export_smx_size = 192; | 3133 | rdev->config.evergreen.sx_max_export_smx_size = 192; |
| 3134 | rdev->config.evergreen.max_hw_contexts = 8; | 3134 | rdev->config.evergreen.max_hw_contexts = 4; |
| 3135 | rdev->config.evergreen.sq_num_cf_insts = 2; | 3135 | rdev->config.evergreen.sq_num_cf_insts = 2; |
| 3136 | 3136 | ||
| 3137 | rdev->config.evergreen.sc_prim_fifo_size = 0x40; | 3137 | rdev->config.evergreen.sc_prim_fifo_size = 0x40; |
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c index f71ce390aebe..fe1de855775e 100644 --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c | |||
| @@ -67,6 +67,9 @@ static void dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder) | |||
| 67 | u8 *sadb; | 67 | u8 *sadb; |
| 68 | int sad_count; | 68 | int sad_count; |
| 69 | 69 | ||
| 70 | /* XXX: setting this register causes hangs on some asics */ | ||
| 71 | return; | ||
| 72 | |||
| 70 | list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { | 73 | list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { |
| 71 | if (connector->encoder == encoder) | 74 | if (connector->encoder == encoder) |
| 72 | radeon_connector = to_radeon_connector(connector); | 75 | radeon_connector = to_radeon_connector(connector); |
| @@ -288,8 +291,7 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode | |||
| 288 | /* fglrx clears sth in AFMT_AUDIO_PACKET_CONTROL2 here */ | 291 | /* fglrx clears sth in AFMT_AUDIO_PACKET_CONTROL2 here */ |
| 289 | 292 | ||
| 290 | WREG32(HDMI_ACR_PACKET_CONTROL + offset, | 293 | WREG32(HDMI_ACR_PACKET_CONTROL + offset, |
| 291 | HDMI_ACR_AUTO_SEND | /* allow hw to sent ACR packets when required */ | 294 | HDMI_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */ |
| 292 | HDMI_ACR_SOURCE); /* select SW CTS value */ | ||
| 293 | 295 | ||
| 294 | evergreen_hdmi_update_ACR(encoder, mode->clock); | 296 | evergreen_hdmi_update_ACR(encoder, mode->clock); |
| 295 | 297 | ||
diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h index 8768fd6a1e27..4f6d2962767d 100644 --- a/drivers/gpu/drm/radeon/evergreend.h +++ b/drivers/gpu/drm/radeon/evergreend.h | |||
| @@ -1501,7 +1501,7 @@ | |||
| 1501 | * 6. COMMAND [29:22] | BYTE_COUNT [20:0] | 1501 | * 6. COMMAND [29:22] | BYTE_COUNT [20:0] |
| 1502 | */ | 1502 | */ |
| 1503 | # define PACKET3_CP_DMA_DST_SEL(x) ((x) << 20) | 1503 | # define PACKET3_CP_DMA_DST_SEL(x) ((x) << 20) |
| 1504 | /* 0 - SRC_ADDR | 1504 | /* 0 - DST_ADDR |
| 1505 | * 1 - GDS | 1505 | * 1 - GDS |
| 1506 | */ | 1506 | */ |
| 1507 | # define PACKET3_CP_DMA_ENGINE(x) ((x) << 27) | 1507 | # define PACKET3_CP_DMA_ENGINE(x) ((x) << 27) |
| @@ -1516,7 +1516,7 @@ | |||
| 1516 | # define PACKET3_CP_DMA_CP_SYNC (1 << 31) | 1516 | # define PACKET3_CP_DMA_CP_SYNC (1 << 31) |
| 1517 | /* COMMAND */ | 1517 | /* COMMAND */ |
| 1518 | # define PACKET3_CP_DMA_DIS_WC (1 << 21) | 1518 | # define PACKET3_CP_DMA_DIS_WC (1 << 21) |
| 1519 | # define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23) | 1519 | # define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 22) |
| 1520 | /* 0 - none | 1520 | /* 0 - none |
| 1521 | * 1 - 8 in 16 | 1521 | * 1 - 8 in 16 |
| 1522 | * 2 - 8 in 32 | 1522 | * 2 - 8 in 32 |
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 93c1f9ef5da9..cac2866d79da 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
| @@ -804,6 +804,7 @@ int ni_init_microcode(struct radeon_device *rdev) | |||
| 804 | fw_name); | 804 | fw_name); |
| 805 | release_firmware(rdev->smc_fw); | 805 | release_firmware(rdev->smc_fw); |
| 806 | rdev->smc_fw = NULL; | 806 | rdev->smc_fw = NULL; |
| 807 | err = 0; | ||
| 807 | } else if (rdev->smc_fw->size != smc_req_size) { | 808 | } else if (rdev->smc_fw->size != smc_req_size) { |
| 808 | printk(KERN_ERR | 809 | printk(KERN_ERR |
| 809 | "ni_mc: Bogus length %zu in firmware \"%s\"\n", | 810 | "ni_mc: Bogus length %zu in firmware \"%s\"\n", |
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 2a1b1876b431..f9be22062df1 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
| @@ -2302,6 +2302,7 @@ int r600_init_microcode(struct radeon_device *rdev) | |||
| 2302 | fw_name); | 2302 | fw_name); |
| 2303 | release_firmware(rdev->smc_fw); | 2303 | release_firmware(rdev->smc_fw); |
| 2304 | rdev->smc_fw = NULL; | 2304 | rdev->smc_fw = NULL; |
| 2305 | err = 0; | ||
| 2305 | } else if (rdev->smc_fw->size != smc_req_size) { | 2306 | } else if (rdev->smc_fw->size != smc_req_size) { |
| 2306 | printk(KERN_ERR | 2307 | printk(KERN_ERR |
| 2307 | "smc: Bogus length %zu in firmware \"%s\"\n", | 2308 | "smc: Bogus length %zu in firmware \"%s\"\n", |
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c index b0fa6002af3e..06022e3b9c3b 100644 --- a/drivers/gpu/drm/radeon/r600_hdmi.c +++ b/drivers/gpu/drm/radeon/r600_hdmi.c | |||
| @@ -57,15 +57,15 @@ enum r600_hdmi_iec_status_bits { | |||
| 57 | static const struct radeon_hdmi_acr r600_hdmi_predefined_acr[] = { | 57 | static const struct radeon_hdmi_acr r600_hdmi_predefined_acr[] = { |
| 58 | /* 32kHz 44.1kHz 48kHz */ | 58 | /* 32kHz 44.1kHz 48kHz */ |
| 59 | /* Clock N CTS N CTS N CTS */ | 59 | /* Clock N CTS N CTS N CTS */ |
| 60 | { 25174, 4576, 28125, 7007, 31250, 6864, 28125 }, /* 25,20/1.001 MHz */ | 60 | { 25175, 4576, 28125, 7007, 31250, 6864, 28125 }, /* 25,20/1.001 MHz */ |
| 61 | { 25200, 4096, 25200, 6272, 28000, 6144, 25200 }, /* 25.20 MHz */ | 61 | { 25200, 4096, 25200, 6272, 28000, 6144, 25200 }, /* 25.20 MHz */ |
| 62 | { 27000, 4096, 27000, 6272, 30000, 6144, 27000 }, /* 27.00 MHz */ | 62 | { 27000, 4096, 27000, 6272, 30000, 6144, 27000 }, /* 27.00 MHz */ |
| 63 | { 27027, 4096, 27027, 6272, 30030, 6144, 27027 }, /* 27.00*1.001 MHz */ | 63 | { 27027, 4096, 27027, 6272, 30030, 6144, 27027 }, /* 27.00*1.001 MHz */ |
| 64 | { 54000, 4096, 54000, 6272, 60000, 6144, 54000 }, /* 54.00 MHz */ | 64 | { 54000, 4096, 54000, 6272, 60000, 6144, 54000 }, /* 54.00 MHz */ |
| 65 | { 54054, 4096, 54054, 6272, 60060, 6144, 54054 }, /* 54.00*1.001 MHz */ | 65 | { 54054, 4096, 54054, 6272, 60060, 6144, 54054 }, /* 54.00*1.001 MHz */ |
| 66 | { 74175, 11648, 210937, 17836, 234375, 11648, 140625 }, /* 74.25/1.001 MHz */ | 66 | { 74176, 11648, 210937, 17836, 234375, 11648, 140625 }, /* 74.25/1.001 MHz */ |
| 67 | { 74250, 4096, 74250, 6272, 82500, 6144, 74250 }, /* 74.25 MHz */ | 67 | { 74250, 4096, 74250, 6272, 82500, 6144, 74250 }, /* 74.25 MHz */ |
| 68 | { 148351, 11648, 421875, 8918, 234375, 5824, 140625 }, /* 148.50/1.001 MHz */ | 68 | { 148352, 11648, 421875, 8918, 234375, 5824, 140625 }, /* 148.50/1.001 MHz */ |
| 69 | { 148500, 4096, 148500, 6272, 165000, 6144, 148500 }, /* 148.50 MHz */ | 69 | { 148500, 4096, 148500, 6272, 165000, 6144, 148500 }, /* 148.50 MHz */ |
| 70 | { 0, 4096, 0, 6272, 0, 6144, 0 } /* Other */ | 70 | { 0, 4096, 0, 6272, 0, 6144, 0 } /* Other */ |
| 71 | }; | 71 | }; |
| @@ -75,8 +75,15 @@ static const struct radeon_hdmi_acr r600_hdmi_predefined_acr[] = { | |||
| 75 | */ | 75 | */ |
| 76 | static void r600_hdmi_calc_cts(uint32_t clock, int *CTS, int N, int freq) | 76 | static void r600_hdmi_calc_cts(uint32_t clock, int *CTS, int N, int freq) |
| 77 | { | 77 | { |
| 78 | if (*CTS == 0) | 78 | u64 n; |
| 79 | *CTS = clock * N / (128 * freq) * 1000; | 79 | u32 d; |
| 80 | |||
| 81 | if (*CTS == 0) { | ||
| 82 | n = (u64)clock * (u64)N * 1000ULL; | ||
| 83 | d = 128 * freq; | ||
| 84 | do_div(n, d); | ||
| 85 | *CTS = n; | ||
| 86 | } | ||
| 80 | DRM_DEBUG("Using ACR timing N=%d CTS=%d for frequency %d\n", | 87 | DRM_DEBUG("Using ACR timing N=%d CTS=%d for frequency %d\n", |
| 81 | N, *CTS, freq); | 88 | N, *CTS, freq); |
| 82 | } | 89 | } |
| @@ -302,6 +309,9 @@ static void dce3_2_afmt_write_speaker_allocation(struct drm_encoder *encoder) | |||
| 302 | u8 *sadb; | 309 | u8 *sadb; |
| 303 | int sad_count; | 310 | int sad_count; |
| 304 | 311 | ||
| 312 | /* XXX: setting this register causes hangs on some asics */ | ||
| 313 | return; | ||
| 314 | |||
| 305 | list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { | 315 | list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { |
| 306 | if (connector->encoder == encoder) | 316 | if (connector->encoder == encoder) |
| 307 | radeon_connector = to_radeon_connector(connector); | 317 | radeon_connector = to_radeon_connector(connector); |
| @@ -444,8 +454,8 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod | |||
| 444 | } | 454 | } |
| 445 | 455 | ||
| 446 | WREG32(HDMI0_ACR_PACKET_CONTROL + offset, | 456 | WREG32(HDMI0_ACR_PACKET_CONTROL + offset, |
| 447 | HDMI0_ACR_AUTO_SEND | /* allow hw to sent ACR packets when required */ | 457 | HDMI0_ACR_SOURCE | /* select SW CTS value - XXX verify that hw CTS works on all families */ |
| 448 | HDMI0_ACR_SOURCE); /* select SW CTS value */ | 458 | HDMI0_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */ |
| 449 | 459 | ||
| 450 | WREG32(HDMI0_VBI_PACKET_CONTROL + offset, | 460 | WREG32(HDMI0_VBI_PACKET_CONTROL + offset, |
| 451 | HDMI0_NULL_SEND | /* send null packets when required */ | 461 | HDMI0_NULL_SEND | /* send null packets when required */ |
diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h index e673fe26ea84..7b3c7b5932c5 100644 --- a/drivers/gpu/drm/radeon/r600d.h +++ b/drivers/gpu/drm/radeon/r600d.h | |||
| @@ -1523,7 +1523,7 @@ | |||
| 1523 | */ | 1523 | */ |
| 1524 | # define PACKET3_CP_DMA_CP_SYNC (1 << 31) | 1524 | # define PACKET3_CP_DMA_CP_SYNC (1 << 31) |
| 1525 | /* COMMAND */ | 1525 | /* COMMAND */ |
| 1526 | # define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23) | 1526 | # define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 22) |
| 1527 | /* 0 - none | 1527 | /* 0 - none |
| 1528 | * 1 - 8 in 16 | 1528 | * 1 - 8 in 16 |
| 1529 | * 2 - 8 in 32 | 1529 | * 2 - 8 in 32 |
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 79159b5da05b..64565732cb98 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c | |||
| @@ -1658,9 +1658,12 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 1658 | drm_object_attach_property(&radeon_connector->base.base, | 1658 | drm_object_attach_property(&radeon_connector->base.base, |
| 1659 | rdev->mode_info.underscan_vborder_property, | 1659 | rdev->mode_info.underscan_vborder_property, |
| 1660 | 0); | 1660 | 0); |
| 1661 | drm_object_attach_property(&radeon_connector->base.base, | 1661 | if (radeon_audio != 0) |
| 1662 | rdev->mode_info.audio_property, | 1662 | drm_object_attach_property(&radeon_connector->base.base, |
| 1663 | RADEON_AUDIO_DISABLE); | 1663 | rdev->mode_info.audio_property, |
| 1664 | (radeon_audio == 1) ? | ||
| 1665 | RADEON_AUDIO_AUTO : | ||
| 1666 | RADEON_AUDIO_DISABLE); | ||
| 1664 | subpixel_order = SubPixelHorizontalRGB; | 1667 | subpixel_order = SubPixelHorizontalRGB; |
| 1665 | connector->interlace_allowed = true; | 1668 | connector->interlace_allowed = true; |
| 1666 | if (connector_type == DRM_MODE_CONNECTOR_HDMIB) | 1669 | if (connector_type == DRM_MODE_CONNECTOR_HDMIB) |
| @@ -1754,10 +1757,12 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 1754 | rdev->mode_info.underscan_vborder_property, | 1757 | rdev->mode_info.underscan_vborder_property, |
| 1755 | 0); | 1758 | 0); |
| 1756 | } | 1759 | } |
| 1757 | if (ASIC_IS_DCE2(rdev)) { | 1760 | if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) { |
| 1758 | drm_object_attach_property(&radeon_connector->base.base, | 1761 | drm_object_attach_property(&radeon_connector->base.base, |
| 1759 | rdev->mode_info.audio_property, | 1762 | rdev->mode_info.audio_property, |
| 1760 | RADEON_AUDIO_DISABLE); | 1763 | (radeon_audio == 1) ? |
| 1764 | RADEON_AUDIO_AUTO : | ||
| 1765 | RADEON_AUDIO_DISABLE); | ||
| 1761 | } | 1766 | } |
| 1762 | if (connector_type == DRM_MODE_CONNECTOR_DVII) { | 1767 | if (connector_type == DRM_MODE_CONNECTOR_DVII) { |
| 1763 | radeon_connector->dac_load_detect = true; | 1768 | radeon_connector->dac_load_detect = true; |
| @@ -1799,10 +1804,12 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 1799 | rdev->mode_info.underscan_vborder_property, | 1804 | rdev->mode_info.underscan_vborder_property, |
| 1800 | 0); | 1805 | 0); |
| 1801 | } | 1806 | } |
| 1802 | if (ASIC_IS_DCE2(rdev)) { | 1807 | if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) { |
| 1803 | drm_object_attach_property(&radeon_connector->base.base, | 1808 | drm_object_attach_property(&radeon_connector->base.base, |
| 1804 | rdev->mode_info.audio_property, | 1809 | rdev->mode_info.audio_property, |
| 1805 | RADEON_AUDIO_DISABLE); | 1810 | (radeon_audio == 1) ? |
| 1811 | RADEON_AUDIO_AUTO : | ||
| 1812 | RADEON_AUDIO_DISABLE); | ||
| 1806 | } | 1813 | } |
| 1807 | subpixel_order = SubPixelHorizontalRGB; | 1814 | subpixel_order = SubPixelHorizontalRGB; |
| 1808 | connector->interlace_allowed = true; | 1815 | connector->interlace_allowed = true; |
| @@ -1843,10 +1850,12 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 1843 | rdev->mode_info.underscan_vborder_property, | 1850 | rdev->mode_info.underscan_vborder_property, |
| 1844 | 0); | 1851 | 0); |
| 1845 | } | 1852 | } |
| 1846 | if (ASIC_IS_DCE2(rdev)) { | 1853 | if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) { |
| 1847 | drm_object_attach_property(&radeon_connector->base.base, | 1854 | drm_object_attach_property(&radeon_connector->base.base, |
| 1848 | rdev->mode_info.audio_property, | 1855 | rdev->mode_info.audio_property, |
| 1849 | RADEON_AUDIO_DISABLE); | 1856 | (radeon_audio == 1) ? |
| 1857 | RADEON_AUDIO_AUTO : | ||
| 1858 | RADEON_AUDIO_DISABLE); | ||
| 1850 | } | 1859 | } |
| 1851 | connector->interlace_allowed = true; | 1860 | connector->interlace_allowed = true; |
| 1852 | /* in theory with a DP to VGA converter... */ | 1861 | /* in theory with a DP to VGA converter... */ |
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 66c222836631..80285e35bc65 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c | |||
| @@ -85,9 +85,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) | |||
| 85 | VRAM, also but everything into VRAM on AGP cards to avoid | 85 | VRAM, also but everything into VRAM on AGP cards to avoid |
| 86 | image corruptions */ | 86 | image corruptions */ |
| 87 | if (p->ring == R600_RING_TYPE_UVD_INDEX && | 87 | if (p->ring == R600_RING_TYPE_UVD_INDEX && |
| 88 | p->rdev->family < CHIP_PALM && | ||
| 89 | (i == 0 || drm_pci_device_is_agp(p->rdev->ddev))) { | 88 | (i == 0 || drm_pci_device_is_agp(p->rdev->ddev))) { |
| 90 | 89 | /* TODO: is this still needed for NI+ ? */ | |
| 91 | p->relocs[i].lobj.domain = | 90 | p->relocs[i].lobj.domain = |
| 92 | RADEON_GEM_DOMAIN_VRAM; | 91 | RADEON_GEM_DOMAIN_VRAM; |
| 93 | 92 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index cdd12dcd988b..9c14a1ba1de4 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c | |||
| @@ -153,7 +153,7 @@ int radeon_benchmarking = 0; | |||
| 153 | int radeon_testing = 0; | 153 | int radeon_testing = 0; |
| 154 | int radeon_connector_table = 0; | 154 | int radeon_connector_table = 0; |
| 155 | int radeon_tv = 1; | 155 | int radeon_tv = 1; |
| 156 | int radeon_audio = 1; | 156 | int radeon_audio = -1; |
| 157 | int radeon_disp_priority = 0; | 157 | int radeon_disp_priority = 0; |
| 158 | int radeon_hw_i2c = 0; | 158 | int radeon_hw_i2c = 0; |
| 159 | int radeon_pcie_gen2 = -1; | 159 | int radeon_pcie_gen2 = -1; |
| @@ -196,7 +196,7 @@ module_param_named(connector_table, radeon_connector_table, int, 0444); | |||
| 196 | MODULE_PARM_DESC(tv, "TV enable (0 = disable)"); | 196 | MODULE_PARM_DESC(tv, "TV enable (0 = disable)"); |
| 197 | module_param_named(tv, radeon_tv, int, 0444); | 197 | module_param_named(tv, radeon_tv, int, 0444); |
| 198 | 198 | ||
| 199 | MODULE_PARM_DESC(audio, "Audio enable (1 = enable)"); | 199 | MODULE_PARM_DESC(audio, "Audio enable (-1 = auto, 0 = disable, 1 = enable)"); |
| 200 | module_param_named(audio, radeon_audio, int, 0444); | 200 | module_param_named(audio, radeon_audio, int, 0444); |
| 201 | 201 | ||
| 202 | MODULE_PARM_DESC(disp_priority, "Display Priority (0 = auto, 1 = normal, 2 = high)"); | 202 | MODULE_PARM_DESC(disp_priority, "Display Priority (0 = auto, 1 = normal, 2 = high)"); |
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index ac07ad1d4f8c..4f6b7fc7ad3c 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c | |||
| @@ -945,6 +945,8 @@ void radeon_dpm_enable_uvd(struct radeon_device *rdev, bool enable) | |||
| 945 | if (enable) { | 945 | if (enable) { |
| 946 | mutex_lock(&rdev->pm.mutex); | 946 | mutex_lock(&rdev->pm.mutex); |
| 947 | rdev->pm.dpm.uvd_active = true; | 947 | rdev->pm.dpm.uvd_active = true; |
| 948 | /* disable this for now */ | ||
| 949 | #if 0 | ||
| 948 | if ((rdev->pm.dpm.sd == 1) && (rdev->pm.dpm.hd == 0)) | 950 | if ((rdev->pm.dpm.sd == 1) && (rdev->pm.dpm.hd == 0)) |
| 949 | dpm_state = POWER_STATE_TYPE_INTERNAL_UVD_SD; | 951 | dpm_state = POWER_STATE_TYPE_INTERNAL_UVD_SD; |
| 950 | else if ((rdev->pm.dpm.sd == 2) && (rdev->pm.dpm.hd == 0)) | 952 | else if ((rdev->pm.dpm.sd == 2) && (rdev->pm.dpm.hd == 0)) |
| @@ -954,6 +956,7 @@ void radeon_dpm_enable_uvd(struct radeon_device *rdev, bool enable) | |||
| 954 | else if ((rdev->pm.dpm.sd == 0) && (rdev->pm.dpm.hd == 2)) | 956 | else if ((rdev->pm.dpm.sd == 0) && (rdev->pm.dpm.hd == 2)) |
| 955 | dpm_state = POWER_STATE_TYPE_INTERNAL_UVD_HD2; | 957 | dpm_state = POWER_STATE_TYPE_INTERNAL_UVD_HD2; |
| 956 | else | 958 | else |
| 959 | #endif | ||
| 957 | dpm_state = POWER_STATE_TYPE_INTERNAL_UVD; | 960 | dpm_state = POWER_STATE_TYPE_INTERNAL_UVD; |
| 958 | rdev->pm.dpm.state = dpm_state; | 961 | rdev->pm.dpm.state = dpm_state; |
| 959 | mutex_unlock(&rdev->pm.mutex); | 962 | mutex_unlock(&rdev->pm.mutex); |
diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c index f4d6bcee9006..12e8099a0823 100644 --- a/drivers/gpu/drm/radeon/radeon_test.c +++ b/drivers/gpu/drm/radeon/radeon_test.c | |||
| @@ -36,8 +36,8 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag) | |||
| 36 | struct radeon_bo *vram_obj = NULL; | 36 | struct radeon_bo *vram_obj = NULL; |
| 37 | struct radeon_bo **gtt_obj = NULL; | 37 | struct radeon_bo **gtt_obj = NULL; |
| 38 | uint64_t gtt_addr, vram_addr; | 38 | uint64_t gtt_addr, vram_addr; |
| 39 | unsigned i, n, size; | 39 | unsigned n, size; |
| 40 | int r, ring; | 40 | int i, r, ring; |
| 41 | 41 | ||
| 42 | switch (flag) { | 42 | switch (flag) { |
| 43 | case RADEON_TEST_COPY_DMA: | 43 | case RADEON_TEST_COPY_DMA: |
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c index a0f11856ddde..308eff5be1b4 100644 --- a/drivers/gpu/drm/radeon/radeon_uvd.c +++ b/drivers/gpu/drm/radeon/radeon_uvd.c | |||
| @@ -476,7 +476,8 @@ static int radeon_uvd_cs_reloc(struct radeon_cs_parser *p, | |||
| 476 | return -EINVAL; | 476 | return -EINVAL; |
| 477 | } | 477 | } |
| 478 | 478 | ||
| 479 | if (p->rdev->family < CHIP_PALM && (cmd == 0 || cmd == 0x3) && | 479 | /* TODO: is this still necessary on NI+ ? */ |
| 480 | if ((cmd == 0 || cmd == 0x3) && | ||
| 480 | (start >> 28) != (p->rdev->uvd.gpu_addr >> 28)) { | 481 | (start >> 28) != (p->rdev->uvd.gpu_addr >> 28)) { |
| 481 | DRM_ERROR("msg/fb buffer %LX-%LX out of 256MB segment!\n", | 482 | DRM_ERROR("msg/fb buffer %LX-%LX out of 256MB segment!\n", |
| 482 | start, end); | 483 | start, end); |
| @@ -798,7 +799,8 @@ void radeon_uvd_note_usage(struct radeon_device *rdev) | |||
| 798 | (rdev->pm.dpm.hd != hd)) { | 799 | (rdev->pm.dpm.hd != hd)) { |
| 799 | rdev->pm.dpm.sd = sd; | 800 | rdev->pm.dpm.sd = sd; |
| 800 | rdev->pm.dpm.hd = hd; | 801 | rdev->pm.dpm.hd = hd; |
| 801 | streams_changed = true; | 802 | /* disable this for now */ |
| 803 | /*streams_changed = true;*/ | ||
| 802 | } | 804 | } |
| 803 | } | 805 | } |
| 804 | 806 | ||
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index c354c1094967..d96f7cbca0a1 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
| @@ -85,6 +85,9 @@ extern void si_dma_vm_set_page(struct radeon_device *rdev, | |||
| 85 | uint32_t incr, uint32_t flags); | 85 | uint32_t incr, uint32_t flags); |
| 86 | static void si_enable_gui_idle_interrupt(struct radeon_device *rdev, | 86 | static void si_enable_gui_idle_interrupt(struct radeon_device *rdev, |
| 87 | bool enable); | 87 | bool enable); |
| 88 | static void si_fini_pg(struct radeon_device *rdev); | ||
| 89 | static void si_fini_cg(struct radeon_device *rdev); | ||
| 90 | static void si_rlc_stop(struct radeon_device *rdev); | ||
| 88 | 91 | ||
| 89 | static const u32 verde_rlc_save_restore_register_list[] = | 92 | static const u32 verde_rlc_save_restore_register_list[] = |
| 90 | { | 93 | { |
| @@ -1678,6 +1681,7 @@ static int si_init_microcode(struct radeon_device *rdev) | |||
| 1678 | fw_name); | 1681 | fw_name); |
| 1679 | release_firmware(rdev->smc_fw); | 1682 | release_firmware(rdev->smc_fw); |
| 1680 | rdev->smc_fw = NULL; | 1683 | rdev->smc_fw = NULL; |
| 1684 | err = 0; | ||
| 1681 | } else if (rdev->smc_fw->size != smc_req_size) { | 1685 | } else if (rdev->smc_fw->size != smc_req_size) { |
| 1682 | printk(KERN_ERR | 1686 | printk(KERN_ERR |
| 1683 | "si_smc: Bogus length %zu in firmware \"%s\"\n", | 1687 | "si_smc: Bogus length %zu in firmware \"%s\"\n", |
| @@ -3608,6 +3612,13 @@ static void si_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) | |||
| 3608 | dev_info(rdev->dev, " VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n", | 3612 | dev_info(rdev->dev, " VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n", |
| 3609 | RREG32(VM_CONTEXT1_PROTECTION_FAULT_STATUS)); | 3613 | RREG32(VM_CONTEXT1_PROTECTION_FAULT_STATUS)); |
| 3610 | 3614 | ||
| 3615 | /* disable PG/CG */ | ||
| 3616 | si_fini_pg(rdev); | ||
| 3617 | si_fini_cg(rdev); | ||
| 3618 | |||
| 3619 | /* stop the rlc */ | ||
| 3620 | si_rlc_stop(rdev); | ||
| 3621 | |||
| 3611 | /* Disable CP parsing/prefetching */ | 3622 | /* Disable CP parsing/prefetching */ |
| 3612 | WREG32(CP_ME_CNTL, CP_ME_HALT | CP_PFP_HALT | CP_CE_HALT); | 3623 | WREG32(CP_ME_CNTL, CP_ME_HALT | CP_PFP_HALT | CP_CE_HALT); |
| 3613 | 3624 | ||
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index 9ace28702c76..2332aa1bf93c 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c | |||
| @@ -5208,7 +5208,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev, | |||
| 5208 | table->mc_reg_table_entry[k].mc_data[j] |= 0x100; | 5208 | table->mc_reg_table_entry[k].mc_data[j] |= 0x100; |
| 5209 | } | 5209 | } |
| 5210 | j++; | 5210 | j++; |
| 5211 | if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE) | 5211 | if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE) |
| 5212 | return -EINVAL; | 5212 | return -EINVAL; |
| 5213 | 5213 | ||
| 5214 | if (!pi->mem_gddr5) { | 5214 | if (!pi->mem_gddr5) { |
| @@ -5218,7 +5218,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev, | |||
| 5218 | table->mc_reg_table_entry[k].mc_data[j] = | 5218 | table->mc_reg_table_entry[k].mc_data[j] = |
| 5219 | (table->mc_reg_table_entry[k].mc_data[i] & 0xffff0000) >> 16; | 5219 | (table->mc_reg_table_entry[k].mc_data[i] & 0xffff0000) >> 16; |
| 5220 | j++; | 5220 | j++; |
| 5221 | if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE) | 5221 | if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE) |
| 5222 | return -EINVAL; | 5222 | return -EINVAL; |
| 5223 | } | 5223 | } |
| 5224 | break; | 5224 | break; |
| @@ -5231,7 +5231,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev, | |||
| 5231 | (temp_reg & 0xffff0000) | | 5231 | (temp_reg & 0xffff0000) | |
| 5232 | (table->mc_reg_table_entry[k].mc_data[i] & 0x0000ffff); | 5232 | (table->mc_reg_table_entry[k].mc_data[i] & 0x0000ffff); |
| 5233 | j++; | 5233 | j++; |
| 5234 | if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE) | 5234 | if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE) |
| 5235 | return -EINVAL; | 5235 | return -EINVAL; |
| 5236 | break; | 5236 | break; |
| 5237 | default: | 5237 | default: |
diff --git a/drivers/gpu/drm/radeon/sid.h b/drivers/gpu/drm/radeon/sid.h index 52d2ab6b67a0..7e2e0ea66a00 100644 --- a/drivers/gpu/drm/radeon/sid.h +++ b/drivers/gpu/drm/radeon/sid.h | |||
| @@ -1553,7 +1553,7 @@ | |||
| 1553 | * 6. COMMAND [30:21] | BYTE_COUNT [20:0] | 1553 | * 6. COMMAND [30:21] | BYTE_COUNT [20:0] |
| 1554 | */ | 1554 | */ |
| 1555 | # define PACKET3_CP_DMA_DST_SEL(x) ((x) << 20) | 1555 | # define PACKET3_CP_DMA_DST_SEL(x) ((x) << 20) |
| 1556 | /* 0 - SRC_ADDR | 1556 | /* 0 - DST_ADDR |
| 1557 | * 1 - GDS | 1557 | * 1 - GDS |
| 1558 | */ | 1558 | */ |
| 1559 | # define PACKET3_CP_DMA_ENGINE(x) ((x) << 27) | 1559 | # define PACKET3_CP_DMA_ENGINE(x) ((x) << 27) |
| @@ -1568,7 +1568,7 @@ | |||
| 1568 | # define PACKET3_CP_DMA_CP_SYNC (1 << 31) | 1568 | # define PACKET3_CP_DMA_CP_SYNC (1 << 31) |
| 1569 | /* COMMAND */ | 1569 | /* COMMAND */ |
| 1570 | # define PACKET3_CP_DMA_DIS_WC (1 << 21) | 1570 | # define PACKET3_CP_DMA_DIS_WC (1 << 21) |
| 1571 | # define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23) | 1571 | # define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 22) |
| 1572 | /* 0 - none | 1572 | /* 0 - none |
| 1573 | * 1 - 8 in 16 | 1573 | * 1 - 8 in 16 |
| 1574 | * 2 - 8 in 32 | 1574 | * 2 - 8 in 32 |
diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c index 7f998bf1cc9d..9364129ba292 100644 --- a/drivers/gpu/drm/radeon/trinity_dpm.c +++ b/drivers/gpu/drm/radeon/trinity_dpm.c | |||
| @@ -1868,7 +1868,7 @@ int trinity_dpm_init(struct radeon_device *rdev) | |||
| 1868 | for (i = 0; i < SUMO_MAX_HARDWARE_POWERLEVELS; i++) | 1868 | for (i = 0; i < SUMO_MAX_HARDWARE_POWERLEVELS; i++) |
| 1869 | pi->at[i] = TRINITY_AT_DFLT; | 1869 | pi->at[i] = TRINITY_AT_DFLT; |
| 1870 | 1870 | ||
| 1871 | pi->enable_bapm = true; | 1871 | pi->enable_bapm = false; |
| 1872 | pi->enable_nbps_policy = true; | 1872 | pi->enable_nbps_policy = true; |
| 1873 | pi->enable_sclk_ds = true; | 1873 | pi->enable_sclk_ds = true; |
| 1874 | pi->enable_gfx_power_gating = true; | 1874 | pi->enable_gfx_power_gating = true; |
diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c b/drivers/gpu/drm/radeon/uvd_v1_0.c index 3100fa9cb52f..7266805d9786 100644 --- a/drivers/gpu/drm/radeon/uvd_v1_0.c +++ b/drivers/gpu/drm/radeon/uvd_v1_0.c | |||
| @@ -212,8 +212,8 @@ int uvd_v1_0_start(struct radeon_device *rdev) | |||
| 212 | /* enable VCPU clock */ | 212 | /* enable VCPU clock */ |
| 213 | WREG32(UVD_VCPU_CNTL, 1 << 9); | 213 | WREG32(UVD_VCPU_CNTL, 1 << 9); |
| 214 | 214 | ||
| 215 | /* enable UMC and NC0 */ | 215 | /* enable UMC */ |
| 216 | WREG32_P(UVD_LMI_CTRL2, 1 << 13, ~((1 << 8) | (1 << 13))); | 216 | WREG32_P(UVD_LMI_CTRL2, 0, ~(1 << 8)); |
| 217 | 217 | ||
| 218 | /* boot up the VCPU */ | 218 | /* boot up the VCPU */ |
| 219 | WREG32(UVD_SOFT_RESET, 0); | 219 | WREG32(UVD_SOFT_RESET, 0); |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 1a90f0a2f7e5..0508f93b9795 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
| @@ -740,9 +740,17 @@ static void vmw_postclose(struct drm_device *dev, | |||
| 740 | struct vmw_fpriv *vmw_fp; | 740 | struct vmw_fpriv *vmw_fp; |
| 741 | 741 | ||
| 742 | vmw_fp = vmw_fpriv(file_priv); | 742 | vmw_fp = vmw_fpriv(file_priv); |
| 743 | ttm_object_file_release(&vmw_fp->tfile); | 743 | |
| 744 | if (vmw_fp->locked_master) | 744 | if (vmw_fp->locked_master) { |
| 745 | struct vmw_master *vmaster = | ||
| 746 | vmw_master(vmw_fp->locked_master); | ||
| 747 | |||
| 748 | ttm_lock_set_kill(&vmaster->lock, true, SIGTERM); | ||
| 749 | ttm_vt_unlock(&vmaster->lock); | ||
| 745 | drm_master_put(&vmw_fp->locked_master); | 750 | drm_master_put(&vmw_fp->locked_master); |
| 751 | } | ||
| 752 | |||
| 753 | ttm_object_file_release(&vmw_fp->tfile); | ||
| 746 | kfree(vmw_fp); | 754 | kfree(vmw_fp); |
| 747 | } | 755 | } |
| 748 | 756 | ||
| @@ -925,14 +933,13 @@ static void vmw_master_drop(struct drm_device *dev, | |||
| 925 | 933 | ||
| 926 | vmw_fp->locked_master = drm_master_get(file_priv->master); | 934 | vmw_fp->locked_master = drm_master_get(file_priv->master); |
| 927 | ret = ttm_vt_lock(&vmaster->lock, false, vmw_fp->tfile); | 935 | ret = ttm_vt_lock(&vmaster->lock, false, vmw_fp->tfile); |
| 928 | vmw_execbuf_release_pinned_bo(dev_priv); | ||
| 929 | |||
| 930 | if (unlikely((ret != 0))) { | 936 | if (unlikely((ret != 0))) { |
| 931 | DRM_ERROR("Unable to lock TTM at VT switch.\n"); | 937 | DRM_ERROR("Unable to lock TTM at VT switch.\n"); |
| 932 | drm_master_put(&vmw_fp->locked_master); | 938 | drm_master_put(&vmw_fp->locked_master); |
| 933 | } | 939 | } |
| 934 | 940 | ||
| 935 | ttm_lock_set_kill(&vmaster->lock, true, SIGTERM); | 941 | ttm_lock_set_kill(&vmaster->lock, false, SIGTERM); |
| 942 | vmw_execbuf_release_pinned_bo(dev_priv); | ||
| 936 | 943 | ||
| 937 | if (!dev_priv->enable_fb) { | 944 | if (!dev_priv->enable_fb) { |
| 938 | ret = ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM); | 945 | ret = ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM); |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index 0e67cf41065d..37fb4befec82 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | |||
| @@ -970,7 +970,7 @@ void vmw_resource_unreserve(struct vmw_resource *res, | |||
| 970 | if (new_backup) | 970 | if (new_backup) |
| 971 | res->backup_offset = new_backup_offset; | 971 | res->backup_offset = new_backup_offset; |
| 972 | 972 | ||
| 973 | if (!res->func->may_evict) | 973 | if (!res->func->may_evict || res->id == -1) |
| 974 | return; | 974 | return; |
| 975 | 975 | ||
| 976 | write_lock(&dev_priv->resource_lock); | 976 | write_lock(&dev_priv->resource_lock); |
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 71b70e3a7a71..c91d547191dd 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
| @@ -241,6 +241,7 @@ config HID_HOLTEK | |||
| 241 | - Sharkoon Drakonia / Perixx MX-2000 gaming mice | 241 | - Sharkoon Drakonia / Perixx MX-2000 gaming mice |
| 242 | - Tracer Sniper TRM-503 / NOVA Gaming Slider X200 / | 242 | - Tracer Sniper TRM-503 / NOVA Gaming Slider X200 / |
| 243 | Zalman ZM-GM1 | 243 | Zalman ZM-GM1 |
| 244 | - SHARKOON DarkGlider Gaming mouse | ||
| 244 | 245 | ||
| 245 | config HOLTEK_FF | 246 | config HOLTEK_FF |
| 246 | bool "Holtek On Line Grip force feedback support" | 247 | bool "Holtek On Line Grip force feedback support" |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index b8470b1a10fe..e80da62363bc 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -319,7 +319,7 @@ static s32 item_sdata(struct hid_item *item) | |||
| 319 | 319 | ||
| 320 | static int hid_parser_global(struct hid_parser *parser, struct hid_item *item) | 320 | static int hid_parser_global(struct hid_parser *parser, struct hid_item *item) |
| 321 | { | 321 | { |
| 322 | __u32 raw_value; | 322 | __s32 raw_value; |
| 323 | switch (item->tag) { | 323 | switch (item->tag) { |
| 324 | case HID_GLOBAL_ITEM_TAG_PUSH: | 324 | case HID_GLOBAL_ITEM_TAG_PUSH: |
| 325 | 325 | ||
| @@ -370,10 +370,11 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item) | |||
| 370 | return 0; | 370 | return 0; |
| 371 | 371 | ||
| 372 | case HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT: | 372 | case HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT: |
| 373 | /* Units exponent negative numbers are given through a | 373 | /* Many devices provide unit exponent as a two's complement |
| 374 | * two's complement. | 374 | * nibble due to the common misunderstanding of HID |
| 375 | * See "6.2.2.7 Global Items" for more information. */ | 375 | * specification 1.11, 6.2.2.7 Global Items. Attempt to handle |
| 376 | raw_value = item_udata(item); | 376 | * both this and the standard encoding. */ |
| 377 | raw_value = item_sdata(item); | ||
| 377 | if (!(raw_value & 0xfffffff0)) | 378 | if (!(raw_value & 0xfffffff0)) |
| 378 | parser->global.unit_exponent = hid_snto32(raw_value, 4); | 379 | parser->global.unit_exponent = hid_snto32(raw_value, 4); |
| 379 | else | 380 | else |
| @@ -1715,6 +1716,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 1715 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) }, | 1716 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) }, |
| 1716 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) }, | 1717 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) }, |
| 1717 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) }, | 1718 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) }, |
| 1719 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) }, | ||
| 1718 | { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) }, | 1720 | { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) }, |
| 1719 | { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) }, | 1721 | { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) }, |
| 1720 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) }, | 1722 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) }, |
| @@ -1869,6 +1871,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 1869 | 1871 | ||
| 1870 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) }, | 1872 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) }, |
| 1871 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) }, | 1873 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) }, |
| 1874 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO2, USB_DEVICE_ID_NINTENDO_WIIMOTE) }, | ||
| 1872 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) }, | 1875 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) }, |
| 1873 | { } | 1876 | { } |
| 1874 | }; | 1877 | }; |
diff --git a/drivers/hid/hid-holtek-mouse.c b/drivers/hid/hid-holtek-mouse.c index 7e6db3cf46f9..e696566cde46 100644 --- a/drivers/hid/hid-holtek-mouse.c +++ b/drivers/hid/hid-holtek-mouse.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | * - USB ID 04d9:a067, sold as Sharkoon Drakonia and Perixx MX-2000 | 27 | * - USB ID 04d9:a067, sold as Sharkoon Drakonia and Perixx MX-2000 |
| 28 | * - USB ID 04d9:a04a, sold as Tracer Sniper TRM-503, NOVA Gaming Slider X200 | 28 | * - USB ID 04d9:a04a, sold as Tracer Sniper TRM-503, NOVA Gaming Slider X200 |
| 29 | * and Zalman ZM-GM1 | 29 | * and Zalman ZM-GM1 |
| 30 | * - USB ID 04d9:a081, sold as SHARKOON DarkGlider Gaming mouse | ||
| 30 | */ | 31 | */ |
| 31 | 32 | ||
| 32 | static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, | 33 | static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, |
| @@ -46,6 +47,7 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, | |||
| 46 | } | 47 | } |
| 47 | break; | 48 | break; |
| 48 | case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A: | 49 | case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A: |
| 50 | case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081: | ||
| 49 | if (*rsize >= 113 && rdesc[106] == 0xff && rdesc[107] == 0x7f | 51 | if (*rsize >= 113 && rdesc[106] == 0xff && rdesc[107] == 0x7f |
| 50 | && rdesc[111] == 0xff && rdesc[112] == 0x7f) { | 52 | && rdesc[111] == 0xff && rdesc[112] == 0x7f) { |
| 51 | hid_info(hdev, "Fixing up report descriptor\n"); | 53 | hid_info(hdev, "Fixing up report descriptor\n"); |
| @@ -63,6 +65,8 @@ static const struct hid_device_id holtek_mouse_devices[] = { | |||
| 63 | USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) }, | 65 | USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) }, |
| 64 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, | 66 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, |
| 65 | USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) }, | 67 | USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) }, |
| 68 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, | ||
| 69 | USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) }, | ||
| 66 | { } | 70 | { } |
| 67 | }; | 71 | }; |
| 68 | MODULE_DEVICE_TABLE(hid, holtek_mouse_devices); | 72 | MODULE_DEVICE_TABLE(hid, holtek_mouse_devices); |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index e60e8d530697..f0296a50be5f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -450,6 +450,7 @@ | |||
| 450 | #define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD 0xa055 | 450 | #define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD 0xa055 |
| 451 | #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067 0xa067 | 451 | #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067 0xa067 |
| 452 | #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A 0xa04a | 452 | #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A 0xa04a |
| 453 | #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081 0xa081 | ||
| 453 | 454 | ||
| 454 | #define USB_VENDOR_ID_IMATION 0x0718 | 455 | #define USB_VENDOR_ID_IMATION 0x0718 |
| 455 | #define USB_DEVICE_ID_DISC_STAKKA 0xd000 | 456 | #define USB_DEVICE_ID_DISC_STAKKA 0xd000 |
| @@ -632,6 +633,7 @@ | |||
| 632 | #define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN 0x0003 | 633 | #define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN 0x0003 |
| 633 | 634 | ||
| 634 | #define USB_VENDOR_ID_NINTENDO 0x057e | 635 | #define USB_VENDOR_ID_NINTENDO 0x057e |
| 636 | #define USB_VENDOR_ID_NINTENDO2 0x054c | ||
| 635 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE 0x0306 | 637 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE 0x0306 |
| 636 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE2 0x0330 | 638 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE2 0x0330 |
| 637 | 639 | ||
| @@ -791,6 +793,8 @@ | |||
| 791 | #define USB_DEVICE_ID_SYNAPTICS_COMP_TP 0x0009 | 793 | #define USB_DEVICE_ID_SYNAPTICS_COMP_TP 0x0009 |
| 792 | #define USB_DEVICE_ID_SYNAPTICS_WTP 0x0010 | 794 | #define USB_DEVICE_ID_SYNAPTICS_WTP 0x0010 |
| 793 | #define USB_DEVICE_ID_SYNAPTICS_DPAD 0x0013 | 795 | #define USB_DEVICE_ID_SYNAPTICS_DPAD 0x0013 |
| 796 | #define USB_DEVICE_ID_SYNAPTICS_LTS1 0x0af8 | ||
| 797 | #define USB_DEVICE_ID_SYNAPTICS_LTS2 0x1d10 | ||
| 794 | 798 | ||
| 795 | #define USB_VENDOR_ID_THINGM 0x27b8 | 799 | #define USB_VENDOR_ID_THINGM 0x27b8 |
| 796 | #define USB_DEVICE_ID_BLINK1 0x01ed | 800 | #define USB_DEVICE_ID_BLINK1 0x01ed |
| @@ -918,4 +922,7 @@ | |||
| 918 | #define USB_VENDOR_ID_PRIMAX 0x0461 | 922 | #define USB_VENDOR_ID_PRIMAX 0x0461 |
| 919 | #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 | 923 | #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 |
| 920 | 924 | ||
| 925 | #define USB_VENDOR_ID_SIS 0x0457 | ||
| 926 | #define USB_DEVICE_ID_SIS_TS 0x1013 | ||
| 927 | |||
| 921 | #endif | 928 | #endif |
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 8741d953dcc8..d97f2323af57 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c | |||
| @@ -192,6 +192,7 @@ static int hidinput_setkeycode(struct input_dev *dev, | |||
| 192 | return -EINVAL; | 192 | return -EINVAL; |
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | |||
| 195 | /** | 196 | /** |
| 196 | * hidinput_calc_abs_res - calculate an absolute axis resolution | 197 | * hidinput_calc_abs_res - calculate an absolute axis resolution |
| 197 | * @field: the HID report field to calculate resolution for | 198 | * @field: the HID report field to calculate resolution for |
| @@ -234,23 +235,17 @@ __s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code) | |||
| 234 | case ABS_MT_TOOL_Y: | 235 | case ABS_MT_TOOL_Y: |
| 235 | case ABS_MT_TOUCH_MAJOR: | 236 | case ABS_MT_TOUCH_MAJOR: |
| 236 | case ABS_MT_TOUCH_MINOR: | 237 | case ABS_MT_TOUCH_MINOR: |
| 237 | if (field->unit & 0xffffff00) /* Not a length */ | 238 | if (field->unit == 0x11) { /* If centimeters */ |
| 238 | return 0; | ||
| 239 | unit_exponent += hid_snto32(field->unit >> 4, 4) - 1; | ||
| 240 | switch (field->unit & 0xf) { | ||
| 241 | case 0x1: /* If centimeters */ | ||
| 242 | /* Convert to millimeters */ | 239 | /* Convert to millimeters */ |
| 243 | unit_exponent += 1; | 240 | unit_exponent += 1; |
| 244 | break; | 241 | } else if (field->unit == 0x13) { /* If inches */ |
| 245 | case 0x3: /* If inches */ | ||
| 246 | /* Convert to millimeters */ | 242 | /* Convert to millimeters */ |
| 247 | prev = physical_extents; | 243 | prev = physical_extents; |
| 248 | physical_extents *= 254; | 244 | physical_extents *= 254; |
| 249 | if (physical_extents < prev) | 245 | if (physical_extents < prev) |
| 250 | return 0; | 246 | return 0; |
| 251 | unit_exponent -= 1; | 247 | unit_exponent -= 1; |
| 252 | break; | 248 | } else { |
| 253 | default: | ||
| 254 | return 0; | 249 | return 0; |
| 255 | } | 250 | } |
| 256 | break; | 251 | break; |
diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c index 602c188e9d86..6101816a7ddd 100644 --- a/drivers/hid/hid-roccat-kone.c +++ b/drivers/hid/hid-roccat-kone.c | |||
| @@ -382,7 +382,7 @@ static ssize_t kone_sysfs_write_profilex(struct file *fp, | |||
| 382 | } | 382 | } |
| 383 | #define PROFILE_ATTR(number) \ | 383 | #define PROFILE_ATTR(number) \ |
| 384 | static struct bin_attribute bin_attr_profile##number = { \ | 384 | static struct bin_attribute bin_attr_profile##number = { \ |
| 385 | .attr = { .name = "profile##number", .mode = 0660 }, \ | 385 | .attr = { .name = "profile" #number, .mode = 0660 }, \ |
| 386 | .size = sizeof(struct kone_profile), \ | 386 | .size = sizeof(struct kone_profile), \ |
| 387 | .read = kone_sysfs_read_profilex, \ | 387 | .read = kone_sysfs_read_profilex, \ |
| 388 | .write = kone_sysfs_write_profilex, \ | 388 | .write = kone_sysfs_write_profilex, \ |
diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-koneplus.c index 5ddf605b6b89..5e99fcdc71b9 100644 --- a/drivers/hid/hid-roccat-koneplus.c +++ b/drivers/hid/hid-roccat-koneplus.c | |||
| @@ -229,13 +229,13 @@ static ssize_t koneplus_sysfs_read_profilex_buttons(struct file *fp, | |||
| 229 | 229 | ||
| 230 | #define PROFILE_ATTR(number) \ | 230 | #define PROFILE_ATTR(number) \ |
| 231 | static struct bin_attribute bin_attr_profile##number##_settings = { \ | 231 | static struct bin_attribute bin_attr_profile##number##_settings = { \ |
| 232 | .attr = { .name = "profile##number##_settings", .mode = 0440 }, \ | 232 | .attr = { .name = "profile" #number "_settings", .mode = 0440 }, \ |
| 233 | .size = KONEPLUS_SIZE_PROFILE_SETTINGS, \ | 233 | .size = KONEPLUS_SIZE_PROFILE_SETTINGS, \ |
| 234 | .read = koneplus_sysfs_read_profilex_settings, \ | 234 | .read = koneplus_sysfs_read_profilex_settings, \ |
| 235 | .private = &profile_numbers[number-1], \ | 235 | .private = &profile_numbers[number-1], \ |
| 236 | }; \ | 236 | }; \ |
| 237 | static struct bin_attribute bin_attr_profile##number##_buttons = { \ | 237 | static struct bin_attribute bin_attr_profile##number##_buttons = { \ |
| 238 | .attr = { .name = "profile##number##_buttons", .mode = 0440 }, \ | 238 | .attr = { .name = "profile" #number "_buttons", .mode = 0440 }, \ |
| 239 | .size = KONEPLUS_SIZE_PROFILE_BUTTONS, \ | 239 | .size = KONEPLUS_SIZE_PROFILE_BUTTONS, \ |
| 240 | .read = koneplus_sysfs_read_profilex_buttons, \ | 240 | .read = koneplus_sysfs_read_profilex_buttons, \ |
| 241 | .private = &profile_numbers[number-1], \ | 241 | .private = &profile_numbers[number-1], \ |
diff --git a/drivers/hid/hid-roccat-kovaplus.c b/drivers/hid/hid-roccat-kovaplus.c index 515bc03136c0..0c8e1ef0b67d 100644 --- a/drivers/hid/hid-roccat-kovaplus.c +++ b/drivers/hid/hid-roccat-kovaplus.c | |||
| @@ -257,13 +257,13 @@ static ssize_t kovaplus_sysfs_read_profilex_buttons(struct file *fp, | |||
| 257 | 257 | ||
| 258 | #define PROFILE_ATTR(number) \ | 258 | #define PROFILE_ATTR(number) \ |
| 259 | static struct bin_attribute bin_attr_profile##number##_settings = { \ | 259 | static struct bin_attribute bin_attr_profile##number##_settings = { \ |
| 260 | .attr = { .name = "profile##number##_settings", .mode = 0440 }, \ | 260 | .attr = { .name = "profile" #number "_settings", .mode = 0440 }, \ |
| 261 | .size = KOVAPLUS_SIZE_PROFILE_SETTINGS, \ | 261 | .size = KOVAPLUS_SIZE_PROFILE_SETTINGS, \ |
| 262 | .read = kovaplus_sysfs_read_profilex_settings, \ | 262 | .read = kovaplus_sysfs_read_profilex_settings, \ |
| 263 | .private = &profile_numbers[number-1], \ | 263 | .private = &profile_numbers[number-1], \ |
| 264 | }; \ | 264 | }; \ |
| 265 | static struct bin_attribute bin_attr_profile##number##_buttons = { \ | 265 | static struct bin_attribute bin_attr_profile##number##_buttons = { \ |
| 266 | .attr = { .name = "profile##number##_buttons", .mode = 0440 }, \ | 266 | .attr = { .name = "profile" #number "_buttons", .mode = 0440 }, \ |
| 267 | .size = KOVAPLUS_SIZE_PROFILE_BUTTONS, \ | 267 | .size = KOVAPLUS_SIZE_PROFILE_BUTTONS, \ |
| 268 | .read = kovaplus_sysfs_read_profilex_buttons, \ | 268 | .read = kovaplus_sysfs_read_profilex_buttons, \ |
| 269 | .private = &profile_numbers[number-1], \ | 269 | .private = &profile_numbers[number-1], \ |
diff --git a/drivers/hid/hid-roccat-pyra.c b/drivers/hid/hid-roccat-pyra.c index 5a6dbbeee790..1a07e07d99a0 100644 --- a/drivers/hid/hid-roccat-pyra.c +++ b/drivers/hid/hid-roccat-pyra.c | |||
| @@ -225,13 +225,13 @@ static ssize_t pyra_sysfs_read_profilex_buttons(struct file *fp, | |||
| 225 | 225 | ||
| 226 | #define PROFILE_ATTR(number) \ | 226 | #define PROFILE_ATTR(number) \ |
| 227 | static struct bin_attribute bin_attr_profile##number##_settings = { \ | 227 | static struct bin_attribute bin_attr_profile##number##_settings = { \ |
| 228 | .attr = { .name = "profile##number##_settings", .mode = 0440 }, \ | 228 | .attr = { .name = "profile" #number "_settings", .mode = 0440 }, \ |
| 229 | .size = PYRA_SIZE_PROFILE_SETTINGS, \ | 229 | .size = PYRA_SIZE_PROFILE_SETTINGS, \ |
| 230 | .read = pyra_sysfs_read_profilex_settings, \ | 230 | .read = pyra_sysfs_read_profilex_settings, \ |
| 231 | .private = &profile_numbers[number-1], \ | 231 | .private = &profile_numbers[number-1], \ |
| 232 | }; \ | 232 | }; \ |
| 233 | static struct bin_attribute bin_attr_profile##number##_buttons = { \ | 233 | static struct bin_attribute bin_attr_profile##number##_buttons = { \ |
| 234 | .attr = { .name = "profile##number##_buttons", .mode = 0440 }, \ | 234 | .attr = { .name = "profile" #number "_buttons", .mode = 0440 }, \ |
| 235 | .size = PYRA_SIZE_PROFILE_BUTTONS, \ | 235 | .size = PYRA_SIZE_PROFILE_BUTTONS, \ |
| 236 | .read = pyra_sysfs_read_profilex_buttons, \ | 236 | .read = pyra_sysfs_read_profilex_buttons, \ |
| 237 | .private = &profile_numbers[number-1], \ | 237 | .private = &profile_numbers[number-1], \ |
diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c index abb20db2b443..1446f526ee8b 100644 --- a/drivers/hid/hid-wiimote-core.c +++ b/drivers/hid/hid-wiimote-core.c | |||
| @@ -834,7 +834,8 @@ static void wiimote_init_set_type(struct wiimote_data *wdata, | |||
| 834 | goto done; | 834 | goto done; |
| 835 | } | 835 | } |
| 836 | 836 | ||
| 837 | if (vendor == USB_VENDOR_ID_NINTENDO) { | 837 | if (vendor == USB_VENDOR_ID_NINTENDO || |
| 838 | vendor == USB_VENDOR_ID_NINTENDO2) { | ||
| 838 | if (product == USB_DEVICE_ID_NINTENDO_WIIMOTE) { | 839 | if (product == USB_DEVICE_ID_NINTENDO_WIIMOTE) { |
| 839 | devtype = WIIMOTE_DEV_GEN10; | 840 | devtype = WIIMOTE_DEV_GEN10; |
| 840 | goto done; | 841 | goto done; |
| @@ -1855,6 +1856,8 @@ static void wiimote_hid_remove(struct hid_device *hdev) | |||
| 1855 | static const struct hid_device_id wiimote_hid_devices[] = { | 1856 | static const struct hid_device_id wiimote_hid_devices[] = { |
| 1856 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, | 1857 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, |
| 1857 | USB_DEVICE_ID_NINTENDO_WIIMOTE) }, | 1858 | USB_DEVICE_ID_NINTENDO_WIIMOTE) }, |
| 1859 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO2, | ||
| 1860 | USB_DEVICE_ID_NINTENDO_WIIMOTE) }, | ||
| 1858 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, | 1861 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, |
| 1859 | USB_DEVICE_ID_NINTENDO_WIIMOTE2) }, | 1862 | USB_DEVICE_ID_NINTENDO_WIIMOTE2) }, |
| 1860 | { } | 1863 | { } |
diff --git a/drivers/hid/hid-wiimote-modules.c b/drivers/hid/hid-wiimote-modules.c index 2e7d644dba18..71adf9e60b13 100644 --- a/drivers/hid/hid-wiimote-modules.c +++ b/drivers/hid/hid-wiimote-modules.c | |||
| @@ -119,12 +119,22 @@ static const struct wiimod_ops wiimod_keys = { | |||
| 119 | * the rumble motor, this flag shouldn't be set. | 119 | * the rumble motor, this flag shouldn't be set. |
| 120 | */ | 120 | */ |
| 121 | 121 | ||
| 122 | /* used by wiimod_rumble and wiipro_rumble */ | ||
| 123 | static void wiimod_rumble_worker(struct work_struct *work) | ||
| 124 | { | ||
| 125 | struct wiimote_data *wdata = container_of(work, struct wiimote_data, | ||
| 126 | rumble_worker); | ||
| 127 | |||
| 128 | spin_lock_irq(&wdata->state.lock); | ||
| 129 | wiiproto_req_rumble(wdata, wdata->state.cache_rumble); | ||
| 130 | spin_unlock_irq(&wdata->state.lock); | ||
| 131 | } | ||
| 132 | |||
| 122 | static int wiimod_rumble_play(struct input_dev *dev, void *data, | 133 | static int wiimod_rumble_play(struct input_dev *dev, void *data, |
| 123 | struct ff_effect *eff) | 134 | struct ff_effect *eff) |
| 124 | { | 135 | { |
| 125 | struct wiimote_data *wdata = input_get_drvdata(dev); | 136 | struct wiimote_data *wdata = input_get_drvdata(dev); |
| 126 | __u8 value; | 137 | __u8 value; |
| 127 | unsigned long flags; | ||
| 128 | 138 | ||
| 129 | /* | 139 | /* |
| 130 | * The wiimote supports only a single rumble motor so if any magnitude | 140 | * The wiimote supports only a single rumble motor so if any magnitude |
| @@ -137,9 +147,10 @@ static int wiimod_rumble_play(struct input_dev *dev, void *data, | |||
| 137 | else | 147 | else |
| 138 | value = 0; | 148 | value = 0; |
| 139 | 149 | ||
| 140 | spin_lock_irqsave(&wdata->state.lock, flags); | 150 | /* Locking state.lock here might deadlock with input_event() calls. |
| 141 | wiiproto_req_rumble(wdata, value); | 151 | * schedule_work acts as barrier. Merging multiple changes is fine. */ |
| 142 | spin_unlock_irqrestore(&wdata->state.lock, flags); | 152 | wdata->state.cache_rumble = value; |
| 153 | schedule_work(&wdata->rumble_worker); | ||
| 143 | 154 | ||
| 144 | return 0; | 155 | return 0; |
| 145 | } | 156 | } |
| @@ -147,6 +158,8 @@ static int wiimod_rumble_play(struct input_dev *dev, void *data, | |||
| 147 | static int wiimod_rumble_probe(const struct wiimod_ops *ops, | 158 | static int wiimod_rumble_probe(const struct wiimod_ops *ops, |
| 148 | struct wiimote_data *wdata) | 159 | struct wiimote_data *wdata) |
| 149 | { | 160 | { |
| 161 | INIT_WORK(&wdata->rumble_worker, wiimod_rumble_worker); | ||
| 162 | |||
| 150 | set_bit(FF_RUMBLE, wdata->input->ffbit); | 163 | set_bit(FF_RUMBLE, wdata->input->ffbit); |
| 151 | if (input_ff_create_memless(wdata->input, NULL, wiimod_rumble_play)) | 164 | if (input_ff_create_memless(wdata->input, NULL, wiimod_rumble_play)) |
| 152 | return -ENOMEM; | 165 | return -ENOMEM; |
| @@ -159,6 +172,8 @@ static void wiimod_rumble_remove(const struct wiimod_ops *ops, | |||
| 159 | { | 172 | { |
| 160 | unsigned long flags; | 173 | unsigned long flags; |
| 161 | 174 | ||
| 175 | cancel_work_sync(&wdata->rumble_worker); | ||
| 176 | |||
| 162 | spin_lock_irqsave(&wdata->state.lock, flags); | 177 | spin_lock_irqsave(&wdata->state.lock, flags); |
| 163 | wiiproto_req_rumble(wdata, 0); | 178 | wiiproto_req_rumble(wdata, 0); |
| 164 | spin_unlock_irqrestore(&wdata->state.lock, flags); | 179 | spin_unlock_irqrestore(&wdata->state.lock, flags); |
| @@ -1731,7 +1746,6 @@ static int wiimod_pro_play(struct input_dev *dev, void *data, | |||
| 1731 | { | 1746 | { |
| 1732 | struct wiimote_data *wdata = input_get_drvdata(dev); | 1747 | struct wiimote_data *wdata = input_get_drvdata(dev); |
| 1733 | __u8 value; | 1748 | __u8 value; |
| 1734 | unsigned long flags; | ||
| 1735 | 1749 | ||
| 1736 | /* | 1750 | /* |
| 1737 | * The wiimote supports only a single rumble motor so if any magnitude | 1751 | * The wiimote supports only a single rumble motor so if any magnitude |
| @@ -1744,9 +1758,10 @@ static int wiimod_pro_play(struct input_dev *dev, void *data, | |||
| 1744 | else | 1758 | else |
| 1745 | value = 0; | 1759 | value = 0; |
| 1746 | 1760 | ||
| 1747 | spin_lock_irqsave(&wdata->state.lock, flags); | 1761 | /* Locking state.lock here might deadlock with input_event() calls. |
| 1748 | wiiproto_req_rumble(wdata, value); | 1762 | * schedule_work acts as barrier. Merging multiple changes is fine. */ |
| 1749 | spin_unlock_irqrestore(&wdata->state.lock, flags); | 1763 | wdata->state.cache_rumble = value; |
| 1764 | schedule_work(&wdata->rumble_worker); | ||
| 1750 | 1765 | ||
| 1751 | return 0; | 1766 | return 0; |
| 1752 | } | 1767 | } |
| @@ -1756,6 +1771,8 @@ static int wiimod_pro_probe(const struct wiimod_ops *ops, | |||
| 1756 | { | 1771 | { |
| 1757 | int ret, i; | 1772 | int ret, i; |
| 1758 | 1773 | ||
| 1774 | INIT_WORK(&wdata->rumble_worker, wiimod_rumble_worker); | ||
| 1775 | |||
| 1759 | wdata->extension.input = input_allocate_device(); | 1776 | wdata->extension.input = input_allocate_device(); |
| 1760 | if (!wdata->extension.input) | 1777 | if (!wdata->extension.input) |
| 1761 | return -ENOMEM; | 1778 | return -ENOMEM; |
| @@ -1817,12 +1834,13 @@ static void wiimod_pro_remove(const struct wiimod_ops *ops, | |||
| 1817 | if (!wdata->extension.input) | 1834 | if (!wdata->extension.input) |
| 1818 | return; | 1835 | return; |
| 1819 | 1836 | ||
| 1837 | input_unregister_device(wdata->extension.input); | ||
| 1838 | wdata->extension.input = NULL; | ||
| 1839 | cancel_work_sync(&wdata->rumble_worker); | ||
| 1840 | |||
| 1820 | spin_lock_irqsave(&wdata->state.lock, flags); | 1841 | spin_lock_irqsave(&wdata->state.lock, flags); |
| 1821 | wiiproto_req_rumble(wdata, 0); | 1842 | wiiproto_req_rumble(wdata, 0); |
| 1822 | spin_unlock_irqrestore(&wdata->state.lock, flags); | 1843 | spin_unlock_irqrestore(&wdata->state.lock, flags); |
| 1823 | |||
| 1824 | input_unregister_device(wdata->extension.input); | ||
| 1825 | wdata->extension.input = NULL; | ||
| 1826 | } | 1844 | } |
| 1827 | 1845 | ||
| 1828 | static const struct wiimod_ops wiimod_pro = { | 1846 | static const struct wiimod_ops wiimod_pro = { |
diff --git a/drivers/hid/hid-wiimote.h b/drivers/hid/hid-wiimote.h index f1474f372c0b..75db0c400037 100644 --- a/drivers/hid/hid-wiimote.h +++ b/drivers/hid/hid-wiimote.h | |||
| @@ -133,13 +133,15 @@ struct wiimote_state { | |||
| 133 | __u8 *cmd_read_buf; | 133 | __u8 *cmd_read_buf; |
| 134 | __u8 cmd_read_size; | 134 | __u8 cmd_read_size; |
| 135 | 135 | ||
| 136 | /* calibration data */ | 136 | /* calibration/cache data */ |
| 137 | __u16 calib_bboard[4][3]; | 137 | __u16 calib_bboard[4][3]; |
| 138 | __u8 cache_rumble; | ||
| 138 | }; | 139 | }; |
| 139 | 140 | ||
| 140 | struct wiimote_data { | 141 | struct wiimote_data { |
| 141 | struct hid_device *hdev; | 142 | struct hid_device *hdev; |
| 142 | struct input_dev *input; | 143 | struct input_dev *input; |
| 144 | struct work_struct rumble_worker; | ||
| 143 | struct led_classdev *leds[4]; | 145 | struct led_classdev *leds[4]; |
| 144 | struct input_dev *accel; | 146 | struct input_dev *accel; |
| 145 | struct input_dev *ir; | 147 | struct input_dev *ir; |
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index 8918dd12bb69..6a6dd5cd7833 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c | |||
| @@ -308,18 +308,25 @@ static int hidraw_fasync(int fd, struct file *file, int on) | |||
| 308 | static void drop_ref(struct hidraw *hidraw, int exists_bit) | 308 | static void drop_ref(struct hidraw *hidraw, int exists_bit) |
| 309 | { | 309 | { |
| 310 | if (exists_bit) { | 310 | if (exists_bit) { |
| 311 | hid_hw_close(hidraw->hid); | ||
| 312 | hidraw->exist = 0; | 311 | hidraw->exist = 0; |
| 313 | if (hidraw->open) | 312 | if (hidraw->open) { |
| 313 | hid_hw_close(hidraw->hid); | ||
| 314 | wake_up_interruptible(&hidraw->wait); | 314 | wake_up_interruptible(&hidraw->wait); |
| 315 | } | ||
| 315 | } else { | 316 | } else { |
| 316 | --hidraw->open; | 317 | --hidraw->open; |
| 317 | } | 318 | } |
| 318 | 319 | if (!hidraw->open) { | |
| 319 | if (!hidraw->open && !hidraw->exist) { | 320 | if (!hidraw->exist) { |
| 320 | device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor)); | 321 | device_destroy(hidraw_class, |
| 321 | hidraw_table[hidraw->minor] = NULL; | 322 | MKDEV(hidraw_major, hidraw->minor)); |
| 322 | kfree(hidraw); | 323 | hidraw_table[hidraw->minor] = NULL; |
| 324 | kfree(hidraw); | ||
| 325 | } else { | ||
| 326 | /* close device for last reader */ | ||
| 327 | hid_hw_power(hidraw->hid, PM_HINT_NORMAL); | ||
| 328 | hid_hw_close(hidraw->hid); | ||
| 329 | } | ||
| 323 | } | 330 | } |
| 324 | } | 331 | } |
| 325 | 332 | ||
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index c1336193b04b..fd7ce374f812 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c | |||
| @@ -854,10 +854,10 @@ static int i2c_hid_acpi_pdata(struct i2c_client *client, | |||
| 854 | 0xF7, 0xF6, 0xDF, 0x3C, 0x67, 0x42, 0x55, 0x45, | 854 | 0xF7, 0xF6, 0xDF, 0x3C, 0x67, 0x42, 0x55, 0x45, |
| 855 | 0xAD, 0x05, 0xB3, 0x0A, 0x3D, 0x89, 0x38, 0xDE, | 855 | 0xAD, 0x05, 0xB3, 0x0A, 0x3D, 0x89, 0x38, 0xDE, |
| 856 | }; | 856 | }; |
| 857 | struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL }; | 857 | union acpi_object params[4]; |
| 858 | union acpi_object params[4], *obj; | ||
| 859 | struct acpi_object_list input; | 858 | struct acpi_object_list input; |
| 860 | struct acpi_device *adev; | 859 | struct acpi_device *adev; |
| 860 | unsigned long long value; | ||
| 861 | acpi_handle handle; | 861 | acpi_handle handle; |
| 862 | 862 | ||
| 863 | handle = ACPI_HANDLE(&client->dev); | 863 | handle = ACPI_HANDLE(&client->dev); |
| @@ -878,22 +878,14 @@ static int i2c_hid_acpi_pdata(struct i2c_client *client, | |||
| 878 | params[3].package.count = 0; | 878 | params[3].package.count = 0; |
| 879 | params[3].package.elements = NULL; | 879 | params[3].package.elements = NULL; |
| 880 | 880 | ||
| 881 | if (ACPI_FAILURE(acpi_evaluate_object(handle, "_DSM", &input, &buf))) { | 881 | if (ACPI_FAILURE(acpi_evaluate_integer(handle, "_DSM", &input, |
| 882 | &value))) { | ||
| 882 | dev_err(&client->dev, "device _DSM execution failed\n"); | 883 | dev_err(&client->dev, "device _DSM execution failed\n"); |
| 883 | return -ENODEV; | 884 | return -ENODEV; |
| 884 | } | 885 | } |
| 885 | 886 | ||
| 886 | obj = (union acpi_object *)buf.pointer; | 887 | pdata->hid_descriptor_address = value; |
| 887 | if (obj->type != ACPI_TYPE_INTEGER) { | ||
| 888 | dev_err(&client->dev, "device _DSM returned invalid type: %d\n", | ||
| 889 | obj->type); | ||
| 890 | kfree(buf.pointer); | ||
| 891 | return -EINVAL; | ||
| 892 | } | ||
| 893 | |||
| 894 | pdata->hid_descriptor_address = obj->integer.value; | ||
| 895 | 888 | ||
| 896 | kfree(buf.pointer); | ||
| 897 | return 0; | 889 | return 0; |
| 898 | } | 890 | } |
| 899 | 891 | ||
diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c index 5bf2fb785844..93b00d76374c 100644 --- a/drivers/hid/uhid.c +++ b/drivers/hid/uhid.c | |||
| @@ -615,7 +615,7 @@ static const struct file_operations uhid_fops = { | |||
| 615 | 615 | ||
| 616 | static struct miscdevice uhid_misc = { | 616 | static struct miscdevice uhid_misc = { |
| 617 | .fops = &uhid_fops, | 617 | .fops = &uhid_fops, |
| 618 | .minor = MISC_DYNAMIC_MINOR, | 618 | .minor = UHID_MINOR, |
| 619 | .name = UHID_NAME, | 619 | .name = UHID_NAME, |
| 620 | }; | 620 | }; |
| 621 | 621 | ||
| @@ -634,4 +634,5 @@ module_exit(uhid_exit); | |||
| 634 | MODULE_LICENSE("GPL"); | 634 | MODULE_LICENSE("GPL"); |
| 635 | MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>"); | 635 | MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>"); |
| 636 | MODULE_DESCRIPTION("User-space I/O driver support for HID subsystem"); | 636 | MODULE_DESCRIPTION("User-space I/O driver support for HID subsystem"); |
| 637 | MODULE_ALIAS_MISCDEV(UHID_MINOR); | ||
| 637 | MODULE_ALIAS("devname:" UHID_NAME); | 638 | MODULE_ALIAS("devname:" UHID_NAME); |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 07345521f421..3fca3be08337 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
| @@ -110,6 +110,9 @@ static const struct hid_blacklist { | |||
| 110 | { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X, HID_QUIRK_MULTI_INPUT }, | 110 | { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X, HID_QUIRK_MULTI_INPUT }, |
| 111 | { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X, HID_QUIRK_MULTI_INPUT }, | 111 | { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X, HID_QUIRK_MULTI_INPUT }, |
| 112 | { USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS }, | 112 | { USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS }, |
| 113 | { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS1, HID_QUIRK_NO_INIT_REPORTS }, | ||
| 114 | { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS2, HID_QUIRK_NO_INIT_REPORTS }, | ||
| 115 | { USB_VENDOR_ID_SIS, USB_DEVICE_ID_SIS_TS, HID_QUIRK_NO_INIT_REPORTS }, | ||
| 113 | 116 | ||
| 114 | { 0, 0 } | 117 | { 0, 0 } |
| 115 | }; | 118 | }; |
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index 98814d12a604..3288f13d2d87 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
| @@ -230,6 +230,7 @@ static int send_argument(const char *key) | |||
| 230 | 230 | ||
| 231 | static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) | 231 | static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) |
| 232 | { | 232 | { |
| 233 | u8 status, data = 0; | ||
| 233 | int i; | 234 | int i; |
| 234 | 235 | ||
| 235 | if (send_command(cmd) || send_argument(key)) { | 236 | if (send_command(cmd) || send_argument(key)) { |
| @@ -237,6 +238,7 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) | |||
| 237 | return -EIO; | 238 | return -EIO; |
| 238 | } | 239 | } |
| 239 | 240 | ||
| 241 | /* This has no effect on newer (2012) SMCs */ | ||
| 240 | if (send_byte(len, APPLESMC_DATA_PORT)) { | 242 | if (send_byte(len, APPLESMC_DATA_PORT)) { |
| 241 | pr_warn("%.4s: read len fail\n", key); | 243 | pr_warn("%.4s: read len fail\n", key); |
| 242 | return -EIO; | 244 | return -EIO; |
| @@ -250,6 +252,17 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) | |||
| 250 | buffer[i] = inb(APPLESMC_DATA_PORT); | 252 | buffer[i] = inb(APPLESMC_DATA_PORT); |
| 251 | } | 253 | } |
| 252 | 254 | ||
| 255 | /* Read the data port until bit0 is cleared */ | ||
| 256 | for (i = 0; i < 16; i++) { | ||
| 257 | udelay(APPLESMC_MIN_WAIT); | ||
| 258 | status = inb(APPLESMC_CMD_PORT); | ||
| 259 | if (!(status & 0x01)) | ||
| 260 | break; | ||
| 261 | data = inb(APPLESMC_DATA_PORT); | ||
| 262 | } | ||
| 263 | if (i) | ||
| 264 | pr_warn("flushed %d bytes, last value is: %d\n", i, data); | ||
| 265 | |||
| 253 | return 0; | 266 | return 0; |
| 254 | } | 267 | } |
| 255 | 268 | ||
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 4c1b60539a25..0aa01136f8d9 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c | |||
| @@ -270,7 +270,8 @@ static SIMPLE_DEV_PM_OPS(dw_i2c_dev_pm_ops, dw_i2c_suspend, dw_i2c_resume); | |||
| 270 | MODULE_ALIAS("platform:i2c_designware"); | 270 | MODULE_ALIAS("platform:i2c_designware"); |
| 271 | 271 | ||
| 272 | static struct platform_driver dw_i2c_driver = { | 272 | static struct platform_driver dw_i2c_driver = { |
| 273 | .remove = dw_i2c_remove, | 273 | .probe = dw_i2c_probe, |
| 274 | .remove = dw_i2c_remove, | ||
| 274 | .driver = { | 275 | .driver = { |
| 275 | .name = "i2c_designware", | 276 | .name = "i2c_designware", |
| 276 | .owner = THIS_MODULE, | 277 | .owner = THIS_MODULE, |
| @@ -282,7 +283,7 @@ static struct platform_driver dw_i2c_driver = { | |||
| 282 | 283 | ||
| 283 | static int __init dw_i2c_init_driver(void) | 284 | static int __init dw_i2c_init_driver(void) |
| 284 | { | 285 | { |
| 285 | return platform_driver_probe(&dw_i2c_driver, dw_i2c_probe); | 286 | return platform_driver_register(&dw_i2c_driver); |
| 286 | } | 287 | } |
| 287 | subsys_initcall(dw_i2c_init_driver); | 288 | subsys_initcall(dw_i2c_init_driver); |
| 288 | 289 | ||
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index ccf46656bdad..1d7efa3169cd 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c | |||
| @@ -365,7 +365,7 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx) | |||
| 365 | clk_disable_unprepare(i2c_imx->clk); | 365 | clk_disable_unprepare(i2c_imx->clk); |
| 366 | } | 366 | } |
| 367 | 367 | ||
| 368 | static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx, | 368 | static void i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx, |
| 369 | unsigned int rate) | 369 | unsigned int rate) |
| 370 | { | 370 | { |
| 371 | struct imx_i2c_clk_pair *i2c_clk_div = i2c_imx->hwdata->clk_div; | 371 | struct imx_i2c_clk_pair *i2c_clk_div = i2c_imx->hwdata->clk_div; |
| @@ -589,7 +589,7 @@ static struct i2c_algorithm i2c_imx_algo = { | |||
| 589 | .functionality = i2c_imx_func, | 589 | .functionality = i2c_imx_func, |
| 590 | }; | 590 | }; |
| 591 | 591 | ||
| 592 | static int __init i2c_imx_probe(struct platform_device *pdev) | 592 | static int i2c_imx_probe(struct platform_device *pdev) |
| 593 | { | 593 | { |
| 594 | const struct of_device_id *of_id = of_match_device(i2c_imx_dt_ids, | 594 | const struct of_device_id *of_id = of_match_device(i2c_imx_dt_ids, |
| 595 | &pdev->dev); | 595 | &pdev->dev); |
| @@ -697,7 +697,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev) | |||
| 697 | return 0; /* Return OK */ | 697 | return 0; /* Return OK */ |
| 698 | } | 698 | } |
| 699 | 699 | ||
| 700 | static int __exit i2c_imx_remove(struct platform_device *pdev) | 700 | static int i2c_imx_remove(struct platform_device *pdev) |
| 701 | { | 701 | { |
| 702 | struct imx_i2c_struct *i2c_imx = platform_get_drvdata(pdev); | 702 | struct imx_i2c_struct *i2c_imx = platform_get_drvdata(pdev); |
| 703 | 703 | ||
| @@ -715,7 +715,8 @@ static int __exit i2c_imx_remove(struct platform_device *pdev) | |||
| 715 | } | 715 | } |
| 716 | 716 | ||
| 717 | static struct platform_driver i2c_imx_driver = { | 717 | static struct platform_driver i2c_imx_driver = { |
| 718 | .remove = __exit_p(i2c_imx_remove), | 718 | .probe = i2c_imx_probe, |
| 719 | .remove = i2c_imx_remove, | ||
| 719 | .driver = { | 720 | .driver = { |
| 720 | .name = DRIVER_NAME, | 721 | .name = DRIVER_NAME, |
| 721 | .owner = THIS_MODULE, | 722 | .owner = THIS_MODULE, |
| @@ -726,7 +727,7 @@ static struct platform_driver i2c_imx_driver = { | |||
| 726 | 727 | ||
| 727 | static int __init i2c_adap_imx_init(void) | 728 | static int __init i2c_adap_imx_init(void) |
| 728 | { | 729 | { |
| 729 | return platform_driver_probe(&i2c_imx_driver, i2c_imx_probe); | 730 | return platform_driver_register(&i2c_imx_driver); |
| 730 | } | 731 | } |
| 731 | subsys_initcall(i2c_adap_imx_init); | 732 | subsys_initcall(i2c_adap_imx_init); |
| 732 | 733 | ||
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c index f4a01675fa71..b7c857774708 100644 --- a/drivers/i2c/busses/i2c-mxs.c +++ b/drivers/i2c/busses/i2c-mxs.c | |||
| @@ -780,12 +780,13 @@ static struct platform_driver mxs_i2c_driver = { | |||
| 780 | .owner = THIS_MODULE, | 780 | .owner = THIS_MODULE, |
| 781 | .of_match_table = mxs_i2c_dt_ids, | 781 | .of_match_table = mxs_i2c_dt_ids, |
| 782 | }, | 782 | }, |
| 783 | .probe = mxs_i2c_probe, | ||
| 783 | .remove = mxs_i2c_remove, | 784 | .remove = mxs_i2c_remove, |
| 784 | }; | 785 | }; |
| 785 | 786 | ||
| 786 | static int __init mxs_i2c_init(void) | 787 | static int __init mxs_i2c_init(void) |
| 787 | { | 788 | { |
| 788 | return platform_driver_probe(&mxs_i2c_driver, mxs_i2c_probe); | 789 | return platform_driver_register(&mxs_i2c_driver); |
| 789 | } | 790 | } |
| 790 | subsys_initcall(mxs_i2c_init); | 791 | subsys_initcall(mxs_i2c_init); |
| 791 | 792 | ||
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 6d8308d5dc4e..9967a6f9c2ff 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
| @@ -939,6 +939,9 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) | |||
| 939 | /* | 939 | /* |
| 940 | * ProDB0017052: Clear ARDY bit twice | 940 | * ProDB0017052: Clear ARDY bit twice |
| 941 | */ | 941 | */ |
| 942 | if (stat & OMAP_I2C_STAT_ARDY) | ||
| 943 | omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ARDY); | ||
| 944 | |||
| 942 | if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK | | 945 | if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK | |
| 943 | OMAP_I2C_STAT_AL)) { | 946 | OMAP_I2C_STAT_AL)) { |
| 944 | omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY | | 947 | omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY | |
diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c index f8f6f2e552db..04a17b9b38bb 100644 --- a/drivers/i2c/busses/i2c-stu300.c +++ b/drivers/i2c/busses/i2c-stu300.c | |||
| @@ -859,8 +859,7 @@ static const struct i2c_algorithm stu300_algo = { | |||
| 859 | .functionality = stu300_func, | 859 | .functionality = stu300_func, |
| 860 | }; | 860 | }; |
| 861 | 861 | ||
| 862 | static int __init | 862 | static int stu300_probe(struct platform_device *pdev) |
| 863 | stu300_probe(struct platform_device *pdev) | ||
| 864 | { | 863 | { |
| 865 | struct stu300_dev *dev; | 864 | struct stu300_dev *dev; |
| 866 | struct i2c_adapter *adap; | 865 | struct i2c_adapter *adap; |
| @@ -966,8 +965,7 @@ static SIMPLE_DEV_PM_OPS(stu300_pm, stu300_suspend, stu300_resume); | |||
| 966 | #define STU300_I2C_PM NULL | 965 | #define STU300_I2C_PM NULL |
| 967 | #endif | 966 | #endif |
| 968 | 967 | ||
| 969 | static int __exit | 968 | static int stu300_remove(struct platform_device *pdev) |
| 970 | stu300_remove(struct platform_device *pdev) | ||
| 971 | { | 969 | { |
| 972 | struct stu300_dev *dev = platform_get_drvdata(pdev); | 970 | struct stu300_dev *dev = platform_get_drvdata(pdev); |
| 973 | 971 | ||
| @@ -989,13 +987,14 @@ static struct platform_driver stu300_i2c_driver = { | |||
| 989 | .pm = STU300_I2C_PM, | 987 | .pm = STU300_I2C_PM, |
| 990 | .of_match_table = stu300_dt_match, | 988 | .of_match_table = stu300_dt_match, |
| 991 | }, | 989 | }, |
| 992 | .remove = __exit_p(stu300_remove), | 990 | .probe = stu300_probe, |
| 991 | .remove = stu300_remove, | ||
| 993 | 992 | ||
| 994 | }; | 993 | }; |
| 995 | 994 | ||
| 996 | static int __init stu300_init(void) | 995 | static int __init stu300_init(void) |
| 997 | { | 996 | { |
| 998 | return platform_driver_probe(&stu300_i2c_driver, stu300_probe); | 997 | return platform_driver_register(&stu300_i2c_driver); |
| 999 | } | 998 | } |
| 1000 | 999 | ||
| 1001 | static void __exit stu300_exit(void) | 1000 | static void __exit stu300_exit(void) |
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 29d3f045a2bf..75ba8608383e 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
| @@ -254,10 +254,12 @@ static int i2c_device_probe(struct device *dev) | |||
| 254 | client->flags & I2C_CLIENT_WAKE); | 254 | client->flags & I2C_CLIENT_WAKE); |
| 255 | dev_dbg(dev, "probe\n"); | 255 | dev_dbg(dev, "probe\n"); |
| 256 | 256 | ||
| 257 | acpi_dev_pm_attach(&client->dev, true); | ||
| 257 | status = driver->probe(client, i2c_match_id(driver->id_table, client)); | 258 | status = driver->probe(client, i2c_match_id(driver->id_table, client)); |
| 258 | if (status) { | 259 | if (status) { |
| 259 | client->driver = NULL; | 260 | client->driver = NULL; |
| 260 | i2c_set_clientdata(client, NULL); | 261 | i2c_set_clientdata(client, NULL); |
| 262 | acpi_dev_pm_detach(&client->dev, true); | ||
| 261 | } | 263 | } |
| 262 | return status; | 264 | return status; |
| 263 | } | 265 | } |
| @@ -283,6 +285,7 @@ static int i2c_device_remove(struct device *dev) | |||
| 283 | client->driver = NULL; | 285 | client->driver = NULL; |
| 284 | i2c_set_clientdata(client, NULL); | 286 | i2c_set_clientdata(client, NULL); |
| 285 | } | 287 | } |
| 288 | acpi_dev_pm_detach(&client->dev, true); | ||
| 286 | return status; | 289 | return status; |
| 287 | } | 290 | } |
| 288 | 291 | ||
| @@ -1111,8 +1114,10 @@ static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level, | |||
| 1111 | if (ret < 0 || !info.addr) | 1114 | if (ret < 0 || !info.addr) |
| 1112 | return AE_OK; | 1115 | return AE_OK; |
| 1113 | 1116 | ||
| 1117 | adev->power.flags.ignore_parent = true; | ||
| 1114 | strlcpy(info.type, dev_name(&adev->dev), sizeof(info.type)); | 1118 | strlcpy(info.type, dev_name(&adev->dev), sizeof(info.type)); |
| 1115 | if (!i2c_new_device(adapter, &info)) { | 1119 | if (!i2c_new_device(adapter, &info)) { |
| 1120 | adev->power.flags.ignore_parent = false; | ||
| 1116 | dev_err(&adapter->dev, | 1121 | dev_err(&adapter->dev, |
| 1117 | "failed to add I2C device %s from ACPI\n", | 1122 | "failed to add I2C device %s from ACPI\n", |
| 1118 | dev_name(&adev->dev)); | 1123 | dev_name(&adev->dev)); |
| @@ -1134,6 +1139,9 @@ static void acpi_i2c_register_devices(struct i2c_adapter *adap) | |||
| 1134 | acpi_handle handle; | 1139 | acpi_handle handle; |
| 1135 | acpi_status status; | 1140 | acpi_status status; |
| 1136 | 1141 | ||
| 1142 | if (!adap->dev.parent) | ||
| 1143 | return; | ||
| 1144 | |||
| 1137 | handle = ACPI_HANDLE(adap->dev.parent); | 1145 | handle = ACPI_HANDLE(adap->dev.parent); |
| 1138 | if (!handle) | 1146 | if (!handle) |
| 1139 | return; | 1147 | return; |
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c index 74b41ae690f3..928656e241dd 100644 --- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c +++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c | |||
| @@ -200,7 +200,7 @@ static int i2c_arbitrator_probe(struct platform_device *pdev) | |||
| 200 | arb->parent = of_find_i2c_adapter_by_node(parent_np); | 200 | arb->parent = of_find_i2c_adapter_by_node(parent_np); |
| 201 | if (!arb->parent) { | 201 | if (!arb->parent) { |
| 202 | dev_err(dev, "Cannot find parent bus\n"); | 202 | dev_err(dev, "Cannot find parent bus\n"); |
| 203 | return -EINVAL; | 203 | return -EPROBE_DEFER; |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | /* Actually add the mux adapter */ | 206 | /* Actually add the mux adapter */ |
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c index 5d4a99ba743e..a764da777f08 100644 --- a/drivers/i2c/muxes/i2c-mux-gpio.c +++ b/drivers/i2c/muxes/i2c-mux-gpio.c | |||
| @@ -66,7 +66,7 @@ static int i2c_mux_gpio_probe_dt(struct gpiomux *mux, | |||
| 66 | struct device_node *adapter_np, *child; | 66 | struct device_node *adapter_np, *child; |
| 67 | struct i2c_adapter *adapter; | 67 | struct i2c_adapter *adapter; |
| 68 | unsigned *values, *gpios; | 68 | unsigned *values, *gpios; |
| 69 | int i = 0; | 69 | int i = 0, ret; |
| 70 | 70 | ||
| 71 | if (!np) | 71 | if (!np) |
| 72 | return -ENODEV; | 72 | return -ENODEV; |
| @@ -79,7 +79,7 @@ static int i2c_mux_gpio_probe_dt(struct gpiomux *mux, | |||
| 79 | adapter = of_find_i2c_adapter_by_node(adapter_np); | 79 | adapter = of_find_i2c_adapter_by_node(adapter_np); |
| 80 | if (!adapter) { | 80 | if (!adapter) { |
| 81 | dev_err(&pdev->dev, "Cannot find parent bus\n"); | 81 | dev_err(&pdev->dev, "Cannot find parent bus\n"); |
| 82 | return -ENODEV; | 82 | return -EPROBE_DEFER; |
| 83 | } | 83 | } |
| 84 | mux->data.parent = i2c_adapter_id(adapter); | 84 | mux->data.parent = i2c_adapter_id(adapter); |
| 85 | put_device(&adapter->dev); | 85 | put_device(&adapter->dev); |
| @@ -116,8 +116,12 @@ static int i2c_mux_gpio_probe_dt(struct gpiomux *mux, | |||
| 116 | return -ENOMEM; | 116 | return -ENOMEM; |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | for (i = 0; i < mux->data.n_gpios; i++) | 119 | for (i = 0; i < mux->data.n_gpios; i++) { |
| 120 | gpios[i] = of_get_named_gpio(np, "mux-gpios", i); | 120 | ret = of_get_named_gpio(np, "mux-gpios", i); |
| 121 | if (ret < 0) | ||
| 122 | return ret; | ||
| 123 | gpios[i] = ret; | ||
| 124 | } | ||
| 121 | 125 | ||
| 122 | mux->data.gpios = gpios; | 126 | mux->data.gpios = gpios; |
| 123 | 127 | ||
| @@ -177,7 +181,7 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev) | |||
| 177 | if (!parent) { | 181 | if (!parent) { |
| 178 | dev_err(&pdev->dev, "Parent adapter (%d) not found\n", | 182 | dev_err(&pdev->dev, "Parent adapter (%d) not found\n", |
| 179 | mux->data.parent); | 183 | mux->data.parent); |
| 180 | return -ENODEV; | 184 | return -EPROBE_DEFER; |
| 181 | } | 185 | } |
| 182 | 186 | ||
| 183 | mux->parent = parent; | 187 | mux->parent = parent; |
diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c index 69a91732ae65..68a37157377d 100644 --- a/drivers/i2c/muxes/i2c-mux-pinctrl.c +++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c | |||
| @@ -113,7 +113,7 @@ static int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux, | |||
| 113 | adapter = of_find_i2c_adapter_by_node(adapter_np); | 113 | adapter = of_find_i2c_adapter_by_node(adapter_np); |
| 114 | if (!adapter) { | 114 | if (!adapter) { |
| 115 | dev_err(mux->dev, "Cannot find parent bus\n"); | 115 | dev_err(mux->dev, "Cannot find parent bus\n"); |
| 116 | return -ENODEV; | 116 | return -EPROBE_DEFER; |
| 117 | } | 117 | } |
| 118 | mux->pdata->parent_bus_num = i2c_adapter_id(adapter); | 118 | mux->pdata->parent_bus_num = i2c_adapter_id(adapter); |
| 119 | put_device(&adapter->dev); | 119 | put_device(&adapter->dev); |
| @@ -211,7 +211,7 @@ static int i2c_mux_pinctrl_probe(struct platform_device *pdev) | |||
| 211 | if (!mux->parent) { | 211 | if (!mux->parent) { |
| 212 | dev_err(&pdev->dev, "Parent adapter (%d) not found\n", | 212 | dev_err(&pdev->dev, "Parent adapter (%d) not found\n", |
| 213 | mux->pdata->parent_bus_num); | 213 | mux->pdata->parent_bus_num); |
| 214 | ret = -ENODEV; | 214 | ret = -EPROBE_DEFER; |
| 215 | goto err; | 215 | goto err; |
| 216 | } | 216 | } |
| 217 | 217 | ||
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index fa6964d8681a..33e599ebbe96 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c | |||
| @@ -123,7 +123,7 @@ static struct cpuidle_state *cpuidle_state_table; | |||
| 123 | * which is also the index into the MWAIT hint array. | 123 | * which is also the index into the MWAIT hint array. |
| 124 | * Thus C0 is a dummy. | 124 | * Thus C0 is a dummy. |
| 125 | */ | 125 | */ |
| 126 | static struct cpuidle_state nehalem_cstates[CPUIDLE_STATE_MAX] = { | 126 | static struct cpuidle_state nehalem_cstates[] __initdata = { |
| 127 | { | 127 | { |
| 128 | .name = "C1-NHM", | 128 | .name = "C1-NHM", |
| 129 | .desc = "MWAIT 0x00", | 129 | .desc = "MWAIT 0x00", |
| @@ -156,7 +156,7 @@ static struct cpuidle_state nehalem_cstates[CPUIDLE_STATE_MAX] = { | |||
| 156 | .enter = NULL } | 156 | .enter = NULL } |
| 157 | }; | 157 | }; |
| 158 | 158 | ||
| 159 | static struct cpuidle_state snb_cstates[CPUIDLE_STATE_MAX] = { | 159 | static struct cpuidle_state snb_cstates[] __initdata = { |
| 160 | { | 160 | { |
| 161 | .name = "C1-SNB", | 161 | .name = "C1-SNB", |
| 162 | .desc = "MWAIT 0x00", | 162 | .desc = "MWAIT 0x00", |
| @@ -196,7 +196,7 @@ static struct cpuidle_state snb_cstates[CPUIDLE_STATE_MAX] = { | |||
| 196 | .enter = NULL } | 196 | .enter = NULL } |
| 197 | }; | 197 | }; |
| 198 | 198 | ||
| 199 | static struct cpuidle_state ivb_cstates[CPUIDLE_STATE_MAX] = { | 199 | static struct cpuidle_state ivb_cstates[] __initdata = { |
| 200 | { | 200 | { |
| 201 | .name = "C1-IVB", | 201 | .name = "C1-IVB", |
| 202 | .desc = "MWAIT 0x00", | 202 | .desc = "MWAIT 0x00", |
| @@ -236,7 +236,7 @@ static struct cpuidle_state ivb_cstates[CPUIDLE_STATE_MAX] = { | |||
| 236 | .enter = NULL } | 236 | .enter = NULL } |
| 237 | }; | 237 | }; |
| 238 | 238 | ||
| 239 | static struct cpuidle_state hsw_cstates[CPUIDLE_STATE_MAX] = { | 239 | static struct cpuidle_state hsw_cstates[] __initdata = { |
| 240 | { | 240 | { |
| 241 | .name = "C1-HSW", | 241 | .name = "C1-HSW", |
| 242 | .desc = "MWAIT 0x00", | 242 | .desc = "MWAIT 0x00", |
| @@ -297,7 +297,7 @@ static struct cpuidle_state hsw_cstates[CPUIDLE_STATE_MAX] = { | |||
| 297 | .enter = NULL } | 297 | .enter = NULL } |
| 298 | }; | 298 | }; |
| 299 | 299 | ||
| 300 | static struct cpuidle_state atom_cstates[CPUIDLE_STATE_MAX] = { | 300 | static struct cpuidle_state atom_cstates[] __initdata = { |
| 301 | { | 301 | { |
| 302 | .name = "C1E-ATM", | 302 | .name = "C1E-ATM", |
| 303 | .desc = "MWAIT 0x00", | 303 | .desc = "MWAIT 0x00", |
| @@ -490,7 +490,7 @@ MODULE_DEVICE_TABLE(x86cpu, intel_idle_ids); | |||
| 490 | /* | 490 | /* |
| 491 | * intel_idle_probe() | 491 | * intel_idle_probe() |
| 492 | */ | 492 | */ |
| 493 | static int intel_idle_probe(void) | 493 | static int __init intel_idle_probe(void) |
| 494 | { | 494 | { |
| 495 | unsigned int eax, ebx, ecx; | 495 | unsigned int eax, ebx, ecx; |
| 496 | const struct x86_cpu_id *id; | 496 | const struct x86_cpu_id *id; |
| @@ -558,7 +558,7 @@ static void intel_idle_cpuidle_devices_uninit(void) | |||
| 558 | * intel_idle_cpuidle_driver_init() | 558 | * intel_idle_cpuidle_driver_init() |
| 559 | * allocate, initialize cpuidle_states | 559 | * allocate, initialize cpuidle_states |
| 560 | */ | 560 | */ |
| 561 | static int intel_idle_cpuidle_driver_init(void) | 561 | static int __init intel_idle_cpuidle_driver_init(void) |
| 562 | { | 562 | { |
| 563 | int cstate; | 563 | int cstate; |
| 564 | struct cpuidle_driver *drv = &intel_idle_driver; | 564 | struct cpuidle_driver *drv = &intel_idle_driver; |
| @@ -628,7 +628,7 @@ static int intel_idle_cpu_init(int cpu) | |||
| 628 | int num_substates, mwait_hint, mwait_cstate, mwait_substate; | 628 | int num_substates, mwait_hint, mwait_cstate, mwait_substate; |
| 629 | 629 | ||
| 630 | if (cpuidle_state_table[cstate].enter == NULL) | 630 | if (cpuidle_state_table[cstate].enter == NULL) |
| 631 | continue; | 631 | break; |
| 632 | 632 | ||
| 633 | if (cstate + 1 > max_cstate) { | 633 | if (cstate + 1 > max_cstate) { |
| 634 | printk(PREFIX "max_cstate %d reached\n", max_cstate); | 634 | printk(PREFIX "max_cstate %d reached\n", max_cstate); |
diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c index a7b30be86ae0..52605c0ea3a6 100644 --- a/drivers/iio/frequency/adf4350.c +++ b/drivers/iio/frequency/adf4350.c | |||
| @@ -525,8 +525,10 @@ static int adf4350_probe(struct spi_device *spi) | |||
| 525 | } | 525 | } |
| 526 | 526 | ||
| 527 | indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); | 527 | indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); |
| 528 | if (indio_dev == NULL) | 528 | if (indio_dev == NULL) { |
| 529 | return -ENOMEM; | 529 | ret = -ENOMEM; |
| 530 | goto error_disable_clk; | ||
| 531 | } | ||
| 530 | 532 | ||
| 531 | st = iio_priv(indio_dev); | 533 | st = iio_priv(indio_dev); |
| 532 | 534 | ||
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 2710f7245c3b..2db7dcd826b9 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c | |||
| @@ -477,6 +477,9 @@ void iio_disable_all_buffers(struct iio_dev *indio_dev) | |||
| 477 | indio_dev->currentmode = INDIO_DIRECT_MODE; | 477 | indio_dev->currentmode = INDIO_DIRECT_MODE; |
| 478 | if (indio_dev->setup_ops->postdisable) | 478 | if (indio_dev->setup_ops->postdisable) |
| 479 | indio_dev->setup_ops->postdisable(indio_dev); | 479 | indio_dev->setup_ops->postdisable(indio_dev); |
| 480 | |||
| 481 | if (indio_dev->available_scan_masks == NULL) | ||
| 482 | kfree(indio_dev->active_scan_mask); | ||
| 480 | } | 483 | } |
| 481 | 484 | ||
| 482 | int iio_update_buffers(struct iio_dev *indio_dev, | 485 | int iio_update_buffers(struct iio_dev *indio_dev, |
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index 5ceda710f516..b84791f03a27 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig | |||
| @@ -31,6 +31,17 @@ config INFINIBAND_USER_ACCESS | |||
| 31 | libibverbs, libibcm and a hardware driver library from | 31 | libibverbs, libibcm and a hardware driver library from |
| 32 | <http://www.openfabrics.org/git/>. | 32 | <http://www.openfabrics.org/git/>. |
| 33 | 33 | ||
| 34 | config INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 35 | bool "Experimental and unstable ABI for userspace access to flow steering verbs" | ||
| 36 | depends on INFINIBAND_USER_ACCESS | ||
| 37 | depends on STAGING | ||
| 38 | ---help--- | ||
| 39 | The final ABI for userspace access to flow steering verbs | ||
| 40 | has not been defined. To use the current ABI, *WHICH WILL | ||
| 41 | CHANGE IN THE FUTURE*, say Y here. | ||
| 42 | |||
| 43 | If unsure, say N. | ||
| 44 | |||
| 34 | config INFINIBAND_USER_MEM | 45 | config INFINIBAND_USER_MEM |
| 35 | bool | 46 | bool |
| 36 | depends on INFINIBAND_USER_ACCESS != n | 47 | depends on INFINIBAND_USER_ACCESS != n |
diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h index d040b877475f..d8f9c6c272d7 100644 --- a/drivers/infiniband/core/uverbs.h +++ b/drivers/infiniband/core/uverbs.h | |||
| @@ -217,7 +217,9 @@ IB_UVERBS_DECLARE_CMD(destroy_srq); | |||
| 217 | IB_UVERBS_DECLARE_CMD(create_xsrq); | 217 | IB_UVERBS_DECLARE_CMD(create_xsrq); |
| 218 | IB_UVERBS_DECLARE_CMD(open_xrcd); | 218 | IB_UVERBS_DECLARE_CMD(open_xrcd); |
| 219 | IB_UVERBS_DECLARE_CMD(close_xrcd); | 219 | IB_UVERBS_DECLARE_CMD(close_xrcd); |
| 220 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 220 | IB_UVERBS_DECLARE_CMD(create_flow); | 221 | IB_UVERBS_DECLARE_CMD(create_flow); |
| 221 | IB_UVERBS_DECLARE_CMD(destroy_flow); | 222 | IB_UVERBS_DECLARE_CMD(destroy_flow); |
| 223 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 222 | 224 | ||
| 223 | #endif /* UVERBS_H */ | 225 | #endif /* UVERBS_H */ |
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index f2b81b9ee0d6..2f0f01b70e3b 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c | |||
| @@ -54,7 +54,9 @@ static struct uverbs_lock_class qp_lock_class = { .name = "QP-uobj" }; | |||
| 54 | static struct uverbs_lock_class ah_lock_class = { .name = "AH-uobj" }; | 54 | static struct uverbs_lock_class ah_lock_class = { .name = "AH-uobj" }; |
| 55 | static struct uverbs_lock_class srq_lock_class = { .name = "SRQ-uobj" }; | 55 | static struct uverbs_lock_class srq_lock_class = { .name = "SRQ-uobj" }; |
| 56 | static struct uverbs_lock_class xrcd_lock_class = { .name = "XRCD-uobj" }; | 56 | static struct uverbs_lock_class xrcd_lock_class = { .name = "XRCD-uobj" }; |
| 57 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 57 | static struct uverbs_lock_class rule_lock_class = { .name = "RULE-uobj" }; | 58 | static struct uverbs_lock_class rule_lock_class = { .name = "RULE-uobj" }; |
| 59 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 58 | 60 | ||
| 59 | #define INIT_UDATA(udata, ibuf, obuf, ilen, olen) \ | 61 | #define INIT_UDATA(udata, ibuf, obuf, ilen, olen) \ |
| 60 | do { \ | 62 | do { \ |
| @@ -2599,6 +2601,7 @@ out_put: | |||
| 2599 | return ret ? ret : in_len; | 2601 | return ret ? ret : in_len; |
| 2600 | } | 2602 | } |
| 2601 | 2603 | ||
| 2604 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 2602 | static int kern_spec_to_ib_spec(struct ib_kern_spec *kern_spec, | 2605 | static int kern_spec_to_ib_spec(struct ib_kern_spec *kern_spec, |
| 2603 | union ib_flow_spec *ib_spec) | 2606 | union ib_flow_spec *ib_spec) |
| 2604 | { | 2607 | { |
| @@ -2824,6 +2827,7 @@ ssize_t ib_uverbs_destroy_flow(struct ib_uverbs_file *file, | |||
| 2824 | 2827 | ||
| 2825 | return ret ? ret : in_len; | 2828 | return ret ? ret : in_len; |
| 2826 | } | 2829 | } |
| 2830 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 2827 | 2831 | ||
| 2828 | static int __uverbs_create_xsrq(struct ib_uverbs_file *file, | 2832 | static int __uverbs_create_xsrq(struct ib_uverbs_file *file, |
| 2829 | struct ib_uverbs_create_xsrq *cmd, | 2833 | struct ib_uverbs_create_xsrq *cmd, |
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index 75ad86c4abf8..2df31f68ea09 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c | |||
| @@ -115,8 +115,10 @@ static ssize_t (*uverbs_cmd_table[])(struct ib_uverbs_file *file, | |||
| 115 | [IB_USER_VERBS_CMD_CLOSE_XRCD] = ib_uverbs_close_xrcd, | 115 | [IB_USER_VERBS_CMD_CLOSE_XRCD] = ib_uverbs_close_xrcd, |
| 116 | [IB_USER_VERBS_CMD_CREATE_XSRQ] = ib_uverbs_create_xsrq, | 116 | [IB_USER_VERBS_CMD_CREATE_XSRQ] = ib_uverbs_create_xsrq, |
| 117 | [IB_USER_VERBS_CMD_OPEN_QP] = ib_uverbs_open_qp, | 117 | [IB_USER_VERBS_CMD_OPEN_QP] = ib_uverbs_open_qp, |
| 118 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 118 | [IB_USER_VERBS_CMD_CREATE_FLOW] = ib_uverbs_create_flow, | 119 | [IB_USER_VERBS_CMD_CREATE_FLOW] = ib_uverbs_create_flow, |
| 119 | [IB_USER_VERBS_CMD_DESTROY_FLOW] = ib_uverbs_destroy_flow | 120 | [IB_USER_VERBS_CMD_DESTROY_FLOW] = ib_uverbs_destroy_flow |
| 121 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 120 | }; | 122 | }; |
| 121 | 123 | ||
| 122 | static void ib_uverbs_add_one(struct ib_device *device); | 124 | static void ib_uverbs_add_one(struct ib_device *device); |
| @@ -605,6 +607,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, | |||
| 605 | if (!(file->device->ib_dev->uverbs_cmd_mask & (1ull << hdr.command))) | 607 | if (!(file->device->ib_dev->uverbs_cmd_mask & (1ull << hdr.command))) |
| 606 | return -ENOSYS; | 608 | return -ENOSYS; |
| 607 | 609 | ||
| 610 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 608 | if (hdr.command >= IB_USER_VERBS_CMD_THRESHOLD) { | 611 | if (hdr.command >= IB_USER_VERBS_CMD_THRESHOLD) { |
| 609 | struct ib_uverbs_cmd_hdr_ex hdr_ex; | 612 | struct ib_uverbs_cmd_hdr_ex hdr_ex; |
| 610 | 613 | ||
| @@ -621,6 +624,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, | |||
| 621 | (hdr_ex.out_words + | 624 | (hdr_ex.out_words + |
| 622 | hdr_ex.provider_out_words) * 4); | 625 | hdr_ex.provider_out_words) * 4); |
| 623 | } else { | 626 | } else { |
| 627 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 624 | if (hdr.in_words * 4 != count) | 628 | if (hdr.in_words * 4 != count) |
| 625 | return -EINVAL; | 629 | return -EINVAL; |
| 626 | 630 | ||
| @@ -628,7 +632,9 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, | |||
| 628 | buf + sizeof(hdr), | 632 | buf + sizeof(hdr), |
| 629 | hdr.in_words * 4, | 633 | hdr.in_words * 4, |
| 630 | hdr.out_words * 4); | 634 | hdr.out_words * 4); |
| 635 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 631 | } | 636 | } |
| 637 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 632 | } | 638 | } |
| 633 | 639 | ||
| 634 | static int ib_uverbs_mmap(struct file *filp, struct vm_area_struct *vma) | 640 | static int ib_uverbs_mmap(struct file *filp, struct vm_area_struct *vma) |
diff --git a/drivers/infiniband/hw/amso1100/c2_ae.c b/drivers/infiniband/hw/amso1100/c2_ae.c index d5d1929753e4..cedda25232be 100644 --- a/drivers/infiniband/hw/amso1100/c2_ae.c +++ b/drivers/infiniband/hw/amso1100/c2_ae.c | |||
| @@ -141,7 +141,7 @@ static const char *to_qp_state_str(int state) | |||
| 141 | return "C2_QP_STATE_ERROR"; | 141 | return "C2_QP_STATE_ERROR"; |
| 142 | default: | 142 | default: |
| 143 | return "<invalid QP state>"; | 143 | return "<invalid QP state>"; |
| 144 | }; | 144 | } |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | void c2_ae_event(struct c2_dev *c2dev, u32 mq_index) | 147 | void c2_ae_event(struct c2_dev *c2dev, u32 mq_index) |
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index d6c5a73becf4..f0612645de99 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c | |||
| @@ -1691,9 +1691,11 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) | |||
| 1691 | ibdev->ib_dev.create_flow = mlx4_ib_create_flow; | 1691 | ibdev->ib_dev.create_flow = mlx4_ib_create_flow; |
| 1692 | ibdev->ib_dev.destroy_flow = mlx4_ib_destroy_flow; | 1692 | ibdev->ib_dev.destroy_flow = mlx4_ib_destroy_flow; |
| 1693 | 1693 | ||
| 1694 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 1694 | ibdev->ib_dev.uverbs_cmd_mask |= | 1695 | ibdev->ib_dev.uverbs_cmd_mask |= |
| 1695 | (1ull << IB_USER_VERBS_CMD_CREATE_FLOW) | | 1696 | (1ull << IB_USER_VERBS_CMD_CREATE_FLOW) | |
| 1696 | (1ull << IB_USER_VERBS_CMD_DESTROY_FLOW); | 1697 | (1ull << IB_USER_VERBS_CMD_DESTROY_FLOW); |
| 1698 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 1697 | } | 1699 | } |
| 1698 | 1700 | ||
| 1699 | mlx4_ib_alloc_eqs(dev, ibdev); | 1701 | mlx4_ib_alloc_eqs(dev, ibdev); |
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 3f831de9a4d8..b1a6cb3a2809 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c | |||
| @@ -164,6 +164,7 @@ int mlx5_vector2eqn(struct mlx5_ib_dev *dev, int vector, int *eqn, int *irqn) | |||
| 164 | static int alloc_comp_eqs(struct mlx5_ib_dev *dev) | 164 | static int alloc_comp_eqs(struct mlx5_ib_dev *dev) |
| 165 | { | 165 | { |
| 166 | struct mlx5_eq_table *table = &dev->mdev.priv.eq_table; | 166 | struct mlx5_eq_table *table = &dev->mdev.priv.eq_table; |
| 167 | char name[MLX5_MAX_EQ_NAME]; | ||
| 167 | struct mlx5_eq *eq, *n; | 168 | struct mlx5_eq *eq, *n; |
| 168 | int ncomp_vec; | 169 | int ncomp_vec; |
| 169 | int nent; | 170 | int nent; |
| @@ -180,11 +181,10 @@ static int alloc_comp_eqs(struct mlx5_ib_dev *dev) | |||
| 180 | goto clean; | 181 | goto clean; |
| 181 | } | 182 | } |
| 182 | 183 | ||
| 183 | snprintf(eq->name, MLX5_MAX_EQ_NAME, "mlx5_comp%d", i); | 184 | snprintf(name, MLX5_MAX_EQ_NAME, "mlx5_comp%d", i); |
| 184 | err = mlx5_create_map_eq(&dev->mdev, eq, | 185 | err = mlx5_create_map_eq(&dev->mdev, eq, |
| 185 | i + MLX5_EQ_VEC_COMP_BASE, nent, 0, | 186 | i + MLX5_EQ_VEC_COMP_BASE, nent, 0, |
| 186 | eq->name, | 187 | name, &dev->mdev.priv.uuari.uars[0]); |
| 187 | &dev->mdev.priv.uuari.uars[0]); | ||
| 188 | if (err) { | 188 | if (err) { |
| 189 | kfree(eq); | 189 | kfree(eq); |
| 190 | goto clean; | 190 | goto clean; |
| @@ -301,9 +301,8 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, | |||
| 301 | props->max_srq_sge = max_rq_sg - 1; | 301 | props->max_srq_sge = max_rq_sg - 1; |
| 302 | props->max_fast_reg_page_list_len = (unsigned int)-1; | 302 | props->max_fast_reg_page_list_len = (unsigned int)-1; |
| 303 | props->local_ca_ack_delay = dev->mdev.caps.local_ca_ack_delay; | 303 | props->local_ca_ack_delay = dev->mdev.caps.local_ca_ack_delay; |
| 304 | props->atomic_cap = dev->mdev.caps.flags & MLX5_DEV_CAP_FLAG_ATOMIC ? | 304 | props->atomic_cap = IB_ATOMIC_NONE; |
| 305 | IB_ATOMIC_HCA : IB_ATOMIC_NONE; | 305 | props->masked_atomic_cap = IB_ATOMIC_NONE; |
| 306 | props->masked_atomic_cap = IB_ATOMIC_HCA; | ||
| 307 | props->max_pkeys = be16_to_cpup((__be16 *)(out_mad->data + 28)); | 306 | props->max_pkeys = be16_to_cpup((__be16 *)(out_mad->data + 28)); |
| 308 | props->max_mcast_grp = 1 << dev->mdev.caps.log_max_mcg; | 307 | props->max_mcast_grp = 1 << dev->mdev.caps.log_max_mcg; |
| 309 | props->max_mcast_qp_attach = dev->mdev.caps.max_qp_mcg; | 308 | props->max_mcast_qp_attach = dev->mdev.caps.max_qp_mcg; |
| @@ -1006,6 +1005,11 @@ static void mlx5_ib_event(struct mlx5_core_dev *dev, enum mlx5_dev_event event, | |||
| 1006 | ibev.device = &ibdev->ib_dev; | 1005 | ibev.device = &ibdev->ib_dev; |
| 1007 | ibev.element.port_num = port; | 1006 | ibev.element.port_num = port; |
| 1008 | 1007 | ||
| 1008 | if (port < 1 || port > ibdev->num_ports) { | ||
| 1009 | mlx5_ib_warn(ibdev, "warning: event on port %d\n", port); | ||
| 1010 | return; | ||
| 1011 | } | ||
| 1012 | |||
| 1009 | if (ibdev->ib_active) | 1013 | if (ibdev->ib_active) |
| 1010 | ib_dispatch_event(&ibev); | 1014 | ib_dispatch_event(&ibev); |
| 1011 | } | 1015 | } |
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index bd41df95b6f0..3453580b1eb2 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c | |||
| @@ -42,6 +42,10 @@ enum { | |||
| 42 | DEF_CACHE_SIZE = 10, | 42 | DEF_CACHE_SIZE = 10, |
| 43 | }; | 43 | }; |
| 44 | 44 | ||
| 45 | enum { | ||
| 46 | MLX5_UMR_ALIGN = 2048 | ||
| 47 | }; | ||
| 48 | |||
| 45 | static __be64 *mr_align(__be64 *ptr, int align) | 49 | static __be64 *mr_align(__be64 *ptr, int align) |
| 46 | { | 50 | { |
| 47 | unsigned long mask = align - 1; | 51 | unsigned long mask = align - 1; |
| @@ -61,13 +65,11 @@ static int order2idx(struct mlx5_ib_dev *dev, int order) | |||
| 61 | 65 | ||
| 62 | static int add_keys(struct mlx5_ib_dev *dev, int c, int num) | 66 | static int add_keys(struct mlx5_ib_dev *dev, int c, int num) |
| 63 | { | 67 | { |
| 64 | struct device *ddev = dev->ib_dev.dma_device; | ||
| 65 | struct mlx5_mr_cache *cache = &dev->cache; | 68 | struct mlx5_mr_cache *cache = &dev->cache; |
| 66 | struct mlx5_cache_ent *ent = &cache->ent[c]; | 69 | struct mlx5_cache_ent *ent = &cache->ent[c]; |
| 67 | struct mlx5_create_mkey_mbox_in *in; | 70 | struct mlx5_create_mkey_mbox_in *in; |
| 68 | struct mlx5_ib_mr *mr; | 71 | struct mlx5_ib_mr *mr; |
| 69 | int npages = 1 << ent->order; | 72 | int npages = 1 << ent->order; |
| 70 | int size = sizeof(u64) * npages; | ||
| 71 | int err = 0; | 73 | int err = 0; |
| 72 | int i; | 74 | int i; |
| 73 | 75 | ||
| @@ -83,21 +85,6 @@ static int add_keys(struct mlx5_ib_dev *dev, int c, int num) | |||
| 83 | } | 85 | } |
| 84 | mr->order = ent->order; | 86 | mr->order = ent->order; |
| 85 | mr->umred = 1; | 87 | mr->umred = 1; |
| 86 | mr->pas = kmalloc(size + 0x3f, GFP_KERNEL); | ||
| 87 | if (!mr->pas) { | ||
| 88 | kfree(mr); | ||
| 89 | err = -ENOMEM; | ||
| 90 | goto out; | ||
| 91 | } | ||
| 92 | mr->dma = dma_map_single(ddev, mr_align(mr->pas, 0x40), size, | ||
| 93 | DMA_TO_DEVICE); | ||
| 94 | if (dma_mapping_error(ddev, mr->dma)) { | ||
| 95 | kfree(mr->pas); | ||
| 96 | kfree(mr); | ||
| 97 | err = -ENOMEM; | ||
| 98 | goto out; | ||
| 99 | } | ||
| 100 | |||
| 101 | in->seg.status = 1 << 6; | 88 | in->seg.status = 1 << 6; |
| 102 | in->seg.xlt_oct_size = cpu_to_be32((npages + 1) / 2); | 89 | in->seg.xlt_oct_size = cpu_to_be32((npages + 1) / 2); |
| 103 | in->seg.qpn_mkey7_0 = cpu_to_be32(0xffffff << 8); | 90 | in->seg.qpn_mkey7_0 = cpu_to_be32(0xffffff << 8); |
| @@ -108,8 +95,6 @@ static int add_keys(struct mlx5_ib_dev *dev, int c, int num) | |||
| 108 | sizeof(*in)); | 95 | sizeof(*in)); |
| 109 | if (err) { | 96 | if (err) { |
| 110 | mlx5_ib_warn(dev, "create mkey failed %d\n", err); | 97 | mlx5_ib_warn(dev, "create mkey failed %d\n", err); |
| 111 | dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE); | ||
| 112 | kfree(mr->pas); | ||
| 113 | kfree(mr); | 98 | kfree(mr); |
| 114 | goto out; | 99 | goto out; |
| 115 | } | 100 | } |
| @@ -129,11 +114,9 @@ out: | |||
| 129 | 114 | ||
| 130 | static void remove_keys(struct mlx5_ib_dev *dev, int c, int num) | 115 | static void remove_keys(struct mlx5_ib_dev *dev, int c, int num) |
| 131 | { | 116 | { |
| 132 | struct device *ddev = dev->ib_dev.dma_device; | ||
| 133 | struct mlx5_mr_cache *cache = &dev->cache; | 117 | struct mlx5_mr_cache *cache = &dev->cache; |
| 134 | struct mlx5_cache_ent *ent = &cache->ent[c]; | 118 | struct mlx5_cache_ent *ent = &cache->ent[c]; |
| 135 | struct mlx5_ib_mr *mr; | 119 | struct mlx5_ib_mr *mr; |
| 136 | int size; | ||
| 137 | int err; | 120 | int err; |
| 138 | int i; | 121 | int i; |
| 139 | 122 | ||
| @@ -149,14 +132,10 @@ static void remove_keys(struct mlx5_ib_dev *dev, int c, int num) | |||
| 149 | ent->size--; | 132 | ent->size--; |
| 150 | spin_unlock(&ent->lock); | 133 | spin_unlock(&ent->lock); |
| 151 | err = mlx5_core_destroy_mkey(&dev->mdev, &mr->mmr); | 134 | err = mlx5_core_destroy_mkey(&dev->mdev, &mr->mmr); |
| 152 | if (err) { | 135 | if (err) |
| 153 | mlx5_ib_warn(dev, "failed destroy mkey\n"); | 136 | mlx5_ib_warn(dev, "failed destroy mkey\n"); |
| 154 | } else { | 137 | else |
| 155 | size = ALIGN(sizeof(u64) * (1 << mr->order), 0x40); | ||
| 156 | dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE); | ||
| 157 | kfree(mr->pas); | ||
| 158 | kfree(mr); | 138 | kfree(mr); |
| 159 | } | ||
| 160 | } | 139 | } |
| 161 | } | 140 | } |
| 162 | 141 | ||
| @@ -408,13 +387,12 @@ static void free_cached_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr) | |||
| 408 | 387 | ||
| 409 | static void clean_keys(struct mlx5_ib_dev *dev, int c) | 388 | static void clean_keys(struct mlx5_ib_dev *dev, int c) |
| 410 | { | 389 | { |
| 411 | struct device *ddev = dev->ib_dev.dma_device; | ||
| 412 | struct mlx5_mr_cache *cache = &dev->cache; | 390 | struct mlx5_mr_cache *cache = &dev->cache; |
| 413 | struct mlx5_cache_ent *ent = &cache->ent[c]; | 391 | struct mlx5_cache_ent *ent = &cache->ent[c]; |
| 414 | struct mlx5_ib_mr *mr; | 392 | struct mlx5_ib_mr *mr; |
| 415 | int size; | ||
| 416 | int err; | 393 | int err; |
| 417 | 394 | ||
| 395 | cancel_delayed_work(&ent->dwork); | ||
| 418 | while (1) { | 396 | while (1) { |
| 419 | spin_lock(&ent->lock); | 397 | spin_lock(&ent->lock); |
| 420 | if (list_empty(&ent->head)) { | 398 | if (list_empty(&ent->head)) { |
| @@ -427,14 +405,10 @@ static void clean_keys(struct mlx5_ib_dev *dev, int c) | |||
| 427 | ent->size--; | 405 | ent->size--; |
| 428 | spin_unlock(&ent->lock); | 406 | spin_unlock(&ent->lock); |
| 429 | err = mlx5_core_destroy_mkey(&dev->mdev, &mr->mmr); | 407 | err = mlx5_core_destroy_mkey(&dev->mdev, &mr->mmr); |
| 430 | if (err) { | 408 | if (err) |
| 431 | mlx5_ib_warn(dev, "failed destroy mkey\n"); | 409 | mlx5_ib_warn(dev, "failed destroy mkey\n"); |
| 432 | } else { | 410 | else |
| 433 | size = ALIGN(sizeof(u64) * (1 << mr->order), 0x40); | ||
| 434 | dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE); | ||
| 435 | kfree(mr->pas); | ||
| 436 | kfree(mr); | 411 | kfree(mr); |
| 437 | } | ||
| 438 | } | 412 | } |
| 439 | } | 413 | } |
| 440 | 414 | ||
| @@ -540,13 +514,15 @@ int mlx5_mr_cache_cleanup(struct mlx5_ib_dev *dev) | |||
| 540 | int i; | 514 | int i; |
| 541 | 515 | ||
| 542 | dev->cache.stopped = 1; | 516 | dev->cache.stopped = 1; |
| 543 | destroy_workqueue(dev->cache.wq); | 517 | flush_workqueue(dev->cache.wq); |
| 544 | 518 | ||
| 545 | mlx5_mr_cache_debugfs_cleanup(dev); | 519 | mlx5_mr_cache_debugfs_cleanup(dev); |
| 546 | 520 | ||
| 547 | for (i = 0; i < MAX_MR_CACHE_ENTRIES; i++) | 521 | for (i = 0; i < MAX_MR_CACHE_ENTRIES; i++) |
| 548 | clean_keys(dev, i); | 522 | clean_keys(dev, i); |
| 549 | 523 | ||
| 524 | destroy_workqueue(dev->cache.wq); | ||
| 525 | |||
| 550 | return 0; | 526 | return 0; |
| 551 | } | 527 | } |
| 552 | 528 | ||
| @@ -675,10 +651,12 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem, | |||
| 675 | int page_shift, int order, int access_flags) | 651 | int page_shift, int order, int access_flags) |
| 676 | { | 652 | { |
| 677 | struct mlx5_ib_dev *dev = to_mdev(pd->device); | 653 | struct mlx5_ib_dev *dev = to_mdev(pd->device); |
| 654 | struct device *ddev = dev->ib_dev.dma_device; | ||
| 678 | struct umr_common *umrc = &dev->umrc; | 655 | struct umr_common *umrc = &dev->umrc; |
| 679 | struct ib_send_wr wr, *bad; | 656 | struct ib_send_wr wr, *bad; |
| 680 | struct mlx5_ib_mr *mr; | 657 | struct mlx5_ib_mr *mr; |
| 681 | struct ib_sge sg; | 658 | struct ib_sge sg; |
| 659 | int size = sizeof(u64) * npages; | ||
| 682 | int err; | 660 | int err; |
| 683 | int i; | 661 | int i; |
| 684 | 662 | ||
| @@ -697,7 +675,22 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem, | |||
| 697 | if (!mr) | 675 | if (!mr) |
| 698 | return ERR_PTR(-EAGAIN); | 676 | return ERR_PTR(-EAGAIN); |
| 699 | 677 | ||
| 700 | mlx5_ib_populate_pas(dev, umem, page_shift, mr_align(mr->pas, 0x40), 1); | 678 | mr->pas = kmalloc(size + MLX5_UMR_ALIGN - 1, GFP_KERNEL); |
| 679 | if (!mr->pas) { | ||
| 680 | err = -ENOMEM; | ||
| 681 | goto error; | ||
| 682 | } | ||
| 683 | |||
| 684 | mlx5_ib_populate_pas(dev, umem, page_shift, | ||
| 685 | mr_align(mr->pas, MLX5_UMR_ALIGN), 1); | ||
| 686 | |||
| 687 | mr->dma = dma_map_single(ddev, mr_align(mr->pas, MLX5_UMR_ALIGN), size, | ||
| 688 | DMA_TO_DEVICE); | ||
| 689 | if (dma_mapping_error(ddev, mr->dma)) { | ||
| 690 | kfree(mr->pas); | ||
| 691 | err = -ENOMEM; | ||
| 692 | goto error; | ||
| 693 | } | ||
| 701 | 694 | ||
| 702 | memset(&wr, 0, sizeof(wr)); | 695 | memset(&wr, 0, sizeof(wr)); |
| 703 | wr.wr_id = (u64)(unsigned long)mr; | 696 | wr.wr_id = (u64)(unsigned long)mr; |
| @@ -718,6 +711,9 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem, | |||
| 718 | wait_for_completion(&mr->done); | 711 | wait_for_completion(&mr->done); |
| 719 | up(&umrc->sem); | 712 | up(&umrc->sem); |
| 720 | 713 | ||
| 714 | dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE); | ||
| 715 | kfree(mr->pas); | ||
| 716 | |||
| 721 | if (mr->status != IB_WC_SUCCESS) { | 717 | if (mr->status != IB_WC_SUCCESS) { |
| 722 | mlx5_ib_warn(dev, "reg umr failed\n"); | 718 | mlx5_ib_warn(dev, "reg umr failed\n"); |
| 723 | err = -EFAULT; | 719 | err = -EFAULT; |
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index 045f8cdbd303..5659ea880741 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c | |||
| @@ -203,7 +203,7 @@ static int sq_overhead(enum ib_qp_type qp_type) | |||
| 203 | 203 | ||
| 204 | switch (qp_type) { | 204 | switch (qp_type) { |
| 205 | case IB_QPT_XRC_INI: | 205 | case IB_QPT_XRC_INI: |
| 206 | size = sizeof(struct mlx5_wqe_xrc_seg); | 206 | size += sizeof(struct mlx5_wqe_xrc_seg); |
| 207 | /* fall through */ | 207 | /* fall through */ |
| 208 | case IB_QPT_RC: | 208 | case IB_QPT_RC: |
| 209 | size += sizeof(struct mlx5_wqe_ctrl_seg) + | 209 | size += sizeof(struct mlx5_wqe_ctrl_seg) + |
| @@ -211,20 +211,23 @@ static int sq_overhead(enum ib_qp_type qp_type) | |||
| 211 | sizeof(struct mlx5_wqe_raddr_seg); | 211 | sizeof(struct mlx5_wqe_raddr_seg); |
| 212 | break; | 212 | break; |
| 213 | 213 | ||
| 214 | case IB_QPT_XRC_TGT: | ||
| 215 | return 0; | ||
| 216 | |||
| 214 | case IB_QPT_UC: | 217 | case IB_QPT_UC: |
| 215 | size = sizeof(struct mlx5_wqe_ctrl_seg) + | 218 | size += sizeof(struct mlx5_wqe_ctrl_seg) + |
| 216 | sizeof(struct mlx5_wqe_raddr_seg); | 219 | sizeof(struct mlx5_wqe_raddr_seg); |
| 217 | break; | 220 | break; |
| 218 | 221 | ||
| 219 | case IB_QPT_UD: | 222 | case IB_QPT_UD: |
| 220 | case IB_QPT_SMI: | 223 | case IB_QPT_SMI: |
| 221 | case IB_QPT_GSI: | 224 | case IB_QPT_GSI: |
| 222 | size = sizeof(struct mlx5_wqe_ctrl_seg) + | 225 | size += sizeof(struct mlx5_wqe_ctrl_seg) + |
| 223 | sizeof(struct mlx5_wqe_datagram_seg); | 226 | sizeof(struct mlx5_wqe_datagram_seg); |
| 224 | break; | 227 | break; |
| 225 | 228 | ||
| 226 | case MLX5_IB_QPT_REG_UMR: | 229 | case MLX5_IB_QPT_REG_UMR: |
| 227 | size = sizeof(struct mlx5_wqe_ctrl_seg) + | 230 | size += sizeof(struct mlx5_wqe_ctrl_seg) + |
| 228 | sizeof(struct mlx5_wqe_umr_ctrl_seg) + | 231 | sizeof(struct mlx5_wqe_umr_ctrl_seg) + |
| 229 | sizeof(struct mlx5_mkey_seg); | 232 | sizeof(struct mlx5_mkey_seg); |
| 230 | break; | 233 | break; |
| @@ -270,7 +273,8 @@ static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr, | |||
| 270 | return wqe_size; | 273 | return wqe_size; |
| 271 | 274 | ||
| 272 | if (wqe_size > dev->mdev.caps.max_sq_desc_sz) { | 275 | if (wqe_size > dev->mdev.caps.max_sq_desc_sz) { |
| 273 | mlx5_ib_dbg(dev, "\n"); | 276 | mlx5_ib_dbg(dev, "wqe_size(%d) > max_sq_desc_sz(%d)\n", |
| 277 | wqe_size, dev->mdev.caps.max_sq_desc_sz); | ||
| 274 | return -EINVAL; | 278 | return -EINVAL; |
| 275 | } | 279 | } |
| 276 | 280 | ||
| @@ -280,9 +284,15 @@ static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr, | |||
| 280 | 284 | ||
| 281 | wq_size = roundup_pow_of_two(attr->cap.max_send_wr * wqe_size); | 285 | wq_size = roundup_pow_of_two(attr->cap.max_send_wr * wqe_size); |
| 282 | qp->sq.wqe_cnt = wq_size / MLX5_SEND_WQE_BB; | 286 | qp->sq.wqe_cnt = wq_size / MLX5_SEND_WQE_BB; |
| 287 | if (qp->sq.wqe_cnt > dev->mdev.caps.max_wqes) { | ||
| 288 | mlx5_ib_dbg(dev, "wqe count(%d) exceeds limits(%d)\n", | ||
| 289 | qp->sq.wqe_cnt, dev->mdev.caps.max_wqes); | ||
| 290 | return -ENOMEM; | ||
| 291 | } | ||
| 283 | qp->sq.wqe_shift = ilog2(MLX5_SEND_WQE_BB); | 292 | qp->sq.wqe_shift = ilog2(MLX5_SEND_WQE_BB); |
| 284 | qp->sq.max_gs = attr->cap.max_send_sge; | 293 | qp->sq.max_gs = attr->cap.max_send_sge; |
| 285 | qp->sq.max_post = 1 << ilog2(wq_size / wqe_size); | 294 | qp->sq.max_post = wq_size / wqe_size; |
| 295 | attr->cap.max_send_wr = qp->sq.max_post; | ||
| 286 | 296 | ||
| 287 | return wq_size; | 297 | return wq_size; |
| 288 | } | 298 | } |
| @@ -1280,6 +1290,11 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q | |||
| 1280 | MLX5_QP_OPTPAR_Q_KEY, | 1290 | MLX5_QP_OPTPAR_Q_KEY, |
| 1281 | [MLX5_QP_ST_MLX] = MLX5_QP_OPTPAR_PKEY_INDEX | | 1291 | [MLX5_QP_ST_MLX] = MLX5_QP_OPTPAR_PKEY_INDEX | |
| 1282 | MLX5_QP_OPTPAR_Q_KEY, | 1292 | MLX5_QP_OPTPAR_Q_KEY, |
| 1293 | [MLX5_QP_ST_XRC] = MLX5_QP_OPTPAR_ALT_ADDR_PATH | | ||
| 1294 | MLX5_QP_OPTPAR_RRE | | ||
| 1295 | MLX5_QP_OPTPAR_RAE | | ||
| 1296 | MLX5_QP_OPTPAR_RWE | | ||
| 1297 | MLX5_QP_OPTPAR_PKEY_INDEX, | ||
| 1283 | }, | 1298 | }, |
| 1284 | }, | 1299 | }, |
| 1285 | [MLX5_QP_STATE_RTR] = { | 1300 | [MLX5_QP_STATE_RTR] = { |
| @@ -1314,6 +1329,11 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q | |||
| 1314 | [MLX5_QP_STATE_RTS] = { | 1329 | [MLX5_QP_STATE_RTS] = { |
| 1315 | [MLX5_QP_ST_UD] = MLX5_QP_OPTPAR_Q_KEY, | 1330 | [MLX5_QP_ST_UD] = MLX5_QP_OPTPAR_Q_KEY, |
| 1316 | [MLX5_QP_ST_MLX] = MLX5_QP_OPTPAR_Q_KEY, | 1331 | [MLX5_QP_ST_MLX] = MLX5_QP_OPTPAR_Q_KEY, |
| 1332 | [MLX5_QP_ST_UC] = MLX5_QP_OPTPAR_RWE, | ||
| 1333 | [MLX5_QP_ST_RC] = MLX5_QP_OPTPAR_RNR_TIMEOUT | | ||
| 1334 | MLX5_QP_OPTPAR_RWE | | ||
| 1335 | MLX5_QP_OPTPAR_RAE | | ||
| 1336 | MLX5_QP_OPTPAR_RRE, | ||
| 1317 | }, | 1337 | }, |
| 1318 | }, | 1338 | }, |
| 1319 | }; | 1339 | }; |
| @@ -1651,29 +1671,6 @@ static __always_inline void set_raddr_seg(struct mlx5_wqe_raddr_seg *rseg, | |||
| 1651 | rseg->reserved = 0; | 1671 | rseg->reserved = 0; |
| 1652 | } | 1672 | } |
| 1653 | 1673 | ||
| 1654 | static void set_atomic_seg(struct mlx5_wqe_atomic_seg *aseg, struct ib_send_wr *wr) | ||
| 1655 | { | ||
| 1656 | if (wr->opcode == IB_WR_ATOMIC_CMP_AND_SWP) { | ||
| 1657 | aseg->swap_add = cpu_to_be64(wr->wr.atomic.swap); | ||
| 1658 | aseg->compare = cpu_to_be64(wr->wr.atomic.compare_add); | ||
| 1659 | } else if (wr->opcode == IB_WR_MASKED_ATOMIC_FETCH_AND_ADD) { | ||
| 1660 | aseg->swap_add = cpu_to_be64(wr->wr.atomic.compare_add); | ||
| 1661 | aseg->compare = cpu_to_be64(wr->wr.atomic.compare_add_mask); | ||
| 1662 | } else { | ||
| 1663 | aseg->swap_add = cpu_to_be64(wr->wr.atomic.compare_add); | ||
| 1664 | aseg->compare = 0; | ||
| 1665 | } | ||
| 1666 | } | ||
| 1667 | |||
| 1668 | static void set_masked_atomic_seg(struct mlx5_wqe_masked_atomic_seg *aseg, | ||
| 1669 | struct ib_send_wr *wr) | ||
| 1670 | { | ||
| 1671 | aseg->swap_add = cpu_to_be64(wr->wr.atomic.swap); | ||
| 1672 | aseg->swap_add_mask = cpu_to_be64(wr->wr.atomic.swap_mask); | ||
| 1673 | aseg->compare = cpu_to_be64(wr->wr.atomic.compare_add); | ||
| 1674 | aseg->compare_mask = cpu_to_be64(wr->wr.atomic.compare_add_mask); | ||
| 1675 | } | ||
| 1676 | |||
| 1677 | static void set_datagram_seg(struct mlx5_wqe_datagram_seg *dseg, | 1674 | static void set_datagram_seg(struct mlx5_wqe_datagram_seg *dseg, |
| 1678 | struct ib_send_wr *wr) | 1675 | struct ib_send_wr *wr) |
| 1679 | { | 1676 | { |
| @@ -2063,28 +2060,11 @@ int mlx5_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, | |||
| 2063 | 2060 | ||
| 2064 | case IB_WR_ATOMIC_CMP_AND_SWP: | 2061 | case IB_WR_ATOMIC_CMP_AND_SWP: |
| 2065 | case IB_WR_ATOMIC_FETCH_AND_ADD: | 2062 | case IB_WR_ATOMIC_FETCH_AND_ADD: |
| 2066 | set_raddr_seg(seg, wr->wr.atomic.remote_addr, | ||
| 2067 | wr->wr.atomic.rkey); | ||
| 2068 | seg += sizeof(struct mlx5_wqe_raddr_seg); | ||
| 2069 | |||
| 2070 | set_atomic_seg(seg, wr); | ||
| 2071 | seg += sizeof(struct mlx5_wqe_atomic_seg); | ||
| 2072 | |||
| 2073 | size += (sizeof(struct mlx5_wqe_raddr_seg) + | ||
| 2074 | sizeof(struct mlx5_wqe_atomic_seg)) / 16; | ||
| 2075 | break; | ||
| 2076 | |||
| 2077 | case IB_WR_MASKED_ATOMIC_CMP_AND_SWP: | 2063 | case IB_WR_MASKED_ATOMIC_CMP_AND_SWP: |
| 2078 | set_raddr_seg(seg, wr->wr.atomic.remote_addr, | 2064 | mlx5_ib_warn(dev, "Atomic operations are not supported yet\n"); |
| 2079 | wr->wr.atomic.rkey); | 2065 | err = -ENOSYS; |
| 2080 | seg += sizeof(struct mlx5_wqe_raddr_seg); | 2066 | *bad_wr = wr; |
| 2081 | 2067 | goto out; | |
| 2082 | set_masked_atomic_seg(seg, wr); | ||
| 2083 | seg += sizeof(struct mlx5_wqe_masked_atomic_seg); | ||
| 2084 | |||
| 2085 | size += (sizeof(struct mlx5_wqe_raddr_seg) + | ||
| 2086 | sizeof(struct mlx5_wqe_masked_atomic_seg)) / 16; | ||
| 2087 | break; | ||
| 2088 | 2068 | ||
| 2089 | case IB_WR_LOCAL_INV: | 2069 | case IB_WR_LOCAL_INV: |
| 2090 | next_fence = MLX5_FENCE_MODE_INITIATOR_SMALL; | 2070 | next_fence = MLX5_FENCE_MODE_INITIATOR_SMALL; |
diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c index 84d297afd6a9..0aa478bc291a 100644 --- a/drivers/infiniband/hw/mlx5/srq.c +++ b/drivers/infiniband/hw/mlx5/srq.c | |||
| @@ -295,7 +295,7 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd, | |||
| 295 | mlx5_vfree(in); | 295 | mlx5_vfree(in); |
| 296 | if (err) { | 296 | if (err) { |
| 297 | mlx5_ib_dbg(dev, "create SRQ failed, err %d\n", err); | 297 | mlx5_ib_dbg(dev, "create SRQ failed, err %d\n", err); |
| 298 | goto err_srq; | 298 | goto err_usr_kern_srq; |
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | mlx5_ib_dbg(dev, "create SRQ with srqn 0x%x\n", srq->msrq.srqn); | 301 | mlx5_ib_dbg(dev, "create SRQ with srqn 0x%x\n", srq->msrq.srqn); |
| @@ -316,6 +316,8 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd, | |||
| 316 | 316 | ||
| 317 | err_core: | 317 | err_core: |
| 318 | mlx5_core_destroy_srq(&dev->mdev, &srq->msrq); | 318 | mlx5_core_destroy_srq(&dev->mdev, &srq->msrq); |
| 319 | |||
| 320 | err_usr_kern_srq: | ||
| 319 | if (pd->uobject) | 321 | if (pd->uobject) |
| 320 | destroy_srq_user(pd, srq); | 322 | destroy_srq_user(pd, srq); |
| 321 | else | 323 | else |
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c index 7c9d35f39d75..690201738993 100644 --- a/drivers/infiniband/hw/mthca/mthca_eq.c +++ b/drivers/infiniband/hw/mthca/mthca_eq.c | |||
| @@ -357,7 +357,7 @@ static int mthca_eq_int(struct mthca_dev *dev, struct mthca_eq *eq) | |||
| 357 | mthca_warn(dev, "Unhandled event %02x(%02x) on EQ %d\n", | 357 | mthca_warn(dev, "Unhandled event %02x(%02x) on EQ %d\n", |
| 358 | eqe->type, eqe->subtype, eq->eqn); | 358 | eqe->type, eqe->subtype, eq->eqn); |
| 359 | break; | 359 | break; |
| 360 | }; | 360 | } |
| 361 | 361 | ||
| 362 | set_eqe_hw(eqe); | 362 | set_eqe_hw(eqe); |
| 363 | ++eq->cons_index; | 363 | ++eq->cons_index; |
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c index 4ed8235d2d36..50219ab2279d 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c | |||
| @@ -150,7 +150,7 @@ enum ib_qp_state get_ibqp_state(enum ocrdma_qp_state qps) | |||
| 150 | return IB_QPS_SQE; | 150 | return IB_QPS_SQE; |
| 151 | case OCRDMA_QPS_ERR: | 151 | case OCRDMA_QPS_ERR: |
| 152 | return IB_QPS_ERR; | 152 | return IB_QPS_ERR; |
| 153 | }; | 153 | } |
| 154 | return IB_QPS_ERR; | 154 | return IB_QPS_ERR; |
| 155 | } | 155 | } |
| 156 | 156 | ||
| @@ -171,7 +171,7 @@ static enum ocrdma_qp_state get_ocrdma_qp_state(enum ib_qp_state qps) | |||
| 171 | return OCRDMA_QPS_SQE; | 171 | return OCRDMA_QPS_SQE; |
| 172 | case IB_QPS_ERR: | 172 | case IB_QPS_ERR: |
| 173 | return OCRDMA_QPS_ERR; | 173 | return OCRDMA_QPS_ERR; |
| 174 | }; | 174 | } |
| 175 | return OCRDMA_QPS_ERR; | 175 | return OCRDMA_QPS_ERR; |
| 176 | } | 176 | } |
| 177 | 177 | ||
| @@ -1982,7 +1982,7 @@ int ocrdma_mbx_create_qp(struct ocrdma_qp *qp, struct ib_qp_init_attr *attrs, | |||
| 1982 | break; | 1982 | break; |
| 1983 | default: | 1983 | default: |
| 1984 | return -EINVAL; | 1984 | return -EINVAL; |
| 1985 | }; | 1985 | } |
| 1986 | 1986 | ||
| 1987 | cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_CREATE_QP, sizeof(*cmd)); | 1987 | cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_CREATE_QP, sizeof(*cmd)); |
| 1988 | if (!cmd) | 1988 | if (!cmd) |
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c index 56e004940f18..0ce7674621ea 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c | |||
| @@ -531,7 +531,7 @@ static void ocrdma_event_handler(struct ocrdma_dev *dev, u32 event) | |||
| 531 | case BE_DEV_DOWN: | 531 | case BE_DEV_DOWN: |
| 532 | ocrdma_close(dev); | 532 | ocrdma_close(dev); |
| 533 | break; | 533 | break; |
| 534 | }; | 534 | } |
| 535 | } | 535 | } |
| 536 | 536 | ||
| 537 | static struct ocrdma_driver ocrdma_drv = { | 537 | static struct ocrdma_driver ocrdma_drv = { |
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index 6e982bb43c31..69f1d1221a6b 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | |||
| @@ -141,7 +141,7 @@ static inline void get_link_speed_and_width(struct ocrdma_dev *dev, | |||
| 141 | /* Unsupported */ | 141 | /* Unsupported */ |
| 142 | *ib_speed = IB_SPEED_SDR; | 142 | *ib_speed = IB_SPEED_SDR; |
| 143 | *ib_width = IB_WIDTH_1X; | 143 | *ib_width = IB_WIDTH_1X; |
| 144 | }; | 144 | } |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | 147 | ||
| @@ -2331,7 +2331,7 @@ static enum ib_wc_status ocrdma_to_ibwc_err(u16 status) | |||
| 2331 | default: | 2331 | default: |
| 2332 | ibwc_status = IB_WC_GENERAL_ERR; | 2332 | ibwc_status = IB_WC_GENERAL_ERR; |
| 2333 | break; | 2333 | break; |
| 2334 | }; | 2334 | } |
| 2335 | return ibwc_status; | 2335 | return ibwc_status; |
| 2336 | } | 2336 | } |
| 2337 | 2337 | ||
| @@ -2370,7 +2370,7 @@ static void ocrdma_update_wc(struct ocrdma_qp *qp, struct ib_wc *ibwc, | |||
| 2370 | pr_err("%s() invalid opcode received = 0x%x\n", | 2370 | pr_err("%s() invalid opcode received = 0x%x\n", |
| 2371 | __func__, hdr->cw & OCRDMA_WQE_OPCODE_MASK); | 2371 | __func__, hdr->cw & OCRDMA_WQE_OPCODE_MASK); |
| 2372 | break; | 2372 | break; |
| 2373 | }; | 2373 | } |
| 2374 | } | 2374 | } |
| 2375 | 2375 | ||
| 2376 | static void ocrdma_set_cqe_status_flushed(struct ocrdma_qp *qp, | 2376 | static void ocrdma_set_cqe_status_flushed(struct ocrdma_qp *qp, |
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c index 3591855cc5b5..6df23502059a 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.c +++ b/drivers/infiniband/ulp/isert/ib_isert.c | |||
| @@ -594,7 +594,7 @@ isert_connect_release(struct isert_conn *isert_conn) | |||
| 594 | 594 | ||
| 595 | pr_debug("Entering isert_connect_release(): >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"); | 595 | pr_debug("Entering isert_connect_release(): >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"); |
| 596 | 596 | ||
| 597 | if (device->use_frwr) | 597 | if (device && device->use_frwr) |
| 598 | isert_conn_free_frwr_pool(isert_conn); | 598 | isert_conn_free_frwr_pool(isert_conn); |
| 599 | 599 | ||
| 600 | if (isert_conn->conn_qp) { | 600 | if (isert_conn->conn_qp) { |
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index fe302e33f72e..c880ebaf1553 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig | |||
| @@ -52,7 +52,7 @@ config AMD_IOMMU | |||
| 52 | select PCI_PRI | 52 | select PCI_PRI |
| 53 | select PCI_PASID | 53 | select PCI_PASID |
| 54 | select IOMMU_API | 54 | select IOMMU_API |
| 55 | depends on X86_64 && PCI && ACPI && X86_IO_APIC | 55 | depends on X86_64 && PCI && ACPI |
| 56 | ---help--- | 56 | ---help--- |
| 57 | With this option you can enable support for AMD IOMMU hardware in | 57 | With this option you can enable support for AMD IOMMU hardware in |
| 58 | your system. An IOMMU is a hardware component which provides | 58 | your system. An IOMMU is a hardware component which provides |
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 71eb233b9ace..2a7f0dd6abab 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c | |||
| @@ -996,10 +996,11 @@ static void request_write(struct cached_dev *dc, struct search *s) | |||
| 996 | closure_bio_submit(bio, cl, s->d); | 996 | closure_bio_submit(bio, cl, s->d); |
| 997 | } else { | 997 | } else { |
| 998 | bch_writeback_add(dc); | 998 | bch_writeback_add(dc); |
| 999 | s->op.cache_bio = bio; | ||
| 999 | 1000 | ||
| 1000 | if (bio->bi_rw & REQ_FLUSH) { | 1001 | if (bio->bi_rw & REQ_FLUSH) { |
| 1001 | /* Also need to send a flush to the backing device */ | 1002 | /* Also need to send a flush to the backing device */ |
| 1002 | struct bio *flush = bio_alloc_bioset(0, GFP_NOIO, | 1003 | struct bio *flush = bio_alloc_bioset(GFP_NOIO, 0, |
| 1003 | dc->disk.bio_split); | 1004 | dc->disk.bio_split); |
| 1004 | 1005 | ||
| 1005 | flush->bi_rw = WRITE_FLUSH; | 1006 | flush->bi_rw = WRITE_FLUSH; |
| @@ -1008,8 +1009,6 @@ static void request_write(struct cached_dev *dc, struct search *s) | |||
| 1008 | flush->bi_private = cl; | 1009 | flush->bi_private = cl; |
| 1009 | 1010 | ||
| 1010 | closure_bio_submit(flush, cl, s->d); | 1011 | closure_bio_submit(flush, cl, s->d); |
| 1011 | } else { | ||
| 1012 | s->op.cache_bio = bio; | ||
| 1013 | } | 1012 | } |
| 1014 | } | 1013 | } |
| 1015 | out: | 1014 | out: |
diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c index 4caa8e6d59d7..2d2b1b7588d7 100644 --- a/drivers/md/dm-snap-persistent.c +++ b/drivers/md/dm-snap-persistent.c | |||
| @@ -269,6 +269,14 @@ static chunk_t area_location(struct pstore *ps, chunk_t area) | |||
| 269 | return NUM_SNAPSHOT_HDR_CHUNKS + ((ps->exceptions_per_area + 1) * area); | 269 | return NUM_SNAPSHOT_HDR_CHUNKS + ((ps->exceptions_per_area + 1) * area); |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | static void skip_metadata(struct pstore *ps) | ||
| 273 | { | ||
| 274 | uint32_t stride = ps->exceptions_per_area + 1; | ||
| 275 | chunk_t next_free = ps->next_free; | ||
| 276 | if (sector_div(next_free, stride) == NUM_SNAPSHOT_HDR_CHUNKS) | ||
| 277 | ps->next_free++; | ||
| 278 | } | ||
| 279 | |||
| 272 | /* | 280 | /* |
| 273 | * Read or write a metadata area. Remembering to skip the first | 281 | * Read or write a metadata area. Remembering to skip the first |
| 274 | * chunk which holds the header. | 282 | * chunk which holds the header. |
| @@ -502,6 +510,8 @@ static int read_exceptions(struct pstore *ps, | |||
| 502 | 510 | ||
| 503 | ps->current_area--; | 511 | ps->current_area--; |
| 504 | 512 | ||
| 513 | skip_metadata(ps); | ||
| 514 | |||
| 505 | return 0; | 515 | return 0; |
| 506 | } | 516 | } |
| 507 | 517 | ||
| @@ -616,8 +626,6 @@ static int persistent_prepare_exception(struct dm_exception_store *store, | |||
| 616 | struct dm_exception *e) | 626 | struct dm_exception *e) |
| 617 | { | 627 | { |
| 618 | struct pstore *ps = get_info(store); | 628 | struct pstore *ps = get_info(store); |
| 619 | uint32_t stride; | ||
| 620 | chunk_t next_free; | ||
| 621 | sector_t size = get_dev_size(dm_snap_cow(store->snap)->bdev); | 629 | sector_t size = get_dev_size(dm_snap_cow(store->snap)->bdev); |
| 622 | 630 | ||
| 623 | /* Is there enough room ? */ | 631 | /* Is there enough room ? */ |
| @@ -630,10 +638,8 @@ static int persistent_prepare_exception(struct dm_exception_store *store, | |||
| 630 | * Move onto the next free pending, making sure to take | 638 | * Move onto the next free pending, making sure to take |
| 631 | * into account the location of the metadata chunks. | 639 | * into account the location of the metadata chunks. |
| 632 | */ | 640 | */ |
| 633 | stride = (ps->exceptions_per_area + 1); | 641 | ps->next_free++; |
| 634 | next_free = ++ps->next_free; | 642 | skip_metadata(ps); |
| 635 | if (sector_div(next_free, stride) == 1) | ||
| 636 | ps->next_free++; | ||
| 637 | 643 | ||
| 638 | atomic_inc(&ps->pending_count); | 644 | atomic_inc(&ps->pending_count); |
| 639 | return 0; | 645 | return 0; |
diff --git a/drivers/md/md.c b/drivers/md/md.c index adf4d7e1d5e1..561a65f82e26 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -8111,6 +8111,7 @@ static int md_set_badblocks(struct badblocks *bb, sector_t s, int sectors, | |||
| 8111 | u64 *p; | 8111 | u64 *p; |
| 8112 | int lo, hi; | 8112 | int lo, hi; |
| 8113 | int rv = 1; | 8113 | int rv = 1; |
| 8114 | unsigned long flags; | ||
| 8114 | 8115 | ||
| 8115 | if (bb->shift < 0) | 8116 | if (bb->shift < 0) |
| 8116 | /* badblocks are disabled */ | 8117 | /* badblocks are disabled */ |
| @@ -8125,7 +8126,7 @@ static int md_set_badblocks(struct badblocks *bb, sector_t s, int sectors, | |||
| 8125 | sectors = next - s; | 8126 | sectors = next - s; |
| 8126 | } | 8127 | } |
| 8127 | 8128 | ||
| 8128 | write_seqlock_irq(&bb->lock); | 8129 | write_seqlock_irqsave(&bb->lock, flags); |
| 8129 | 8130 | ||
| 8130 | p = bb->page; | 8131 | p = bb->page; |
| 8131 | lo = 0; | 8132 | lo = 0; |
| @@ -8241,7 +8242,7 @@ static int md_set_badblocks(struct badblocks *bb, sector_t s, int sectors, | |||
| 8241 | bb->changed = 1; | 8242 | bb->changed = 1; |
| 8242 | if (!acknowledged) | 8243 | if (!acknowledged) |
| 8243 | bb->unacked_exist = 1; | 8244 | bb->unacked_exist = 1; |
| 8244 | write_sequnlock_irq(&bb->lock); | 8245 | write_sequnlock_irqrestore(&bb->lock, flags); |
| 8245 | 8246 | ||
| 8246 | return rv; | 8247 | return rv; |
| 8247 | } | 8248 | } |
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index d60412c7f995..aacf6bf352d8 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
| @@ -1479,6 +1479,7 @@ static int raid1_spare_active(struct mddev *mddev) | |||
| 1479 | } | 1479 | } |
| 1480 | } | 1480 | } |
| 1481 | if (rdev | 1481 | if (rdev |
| 1482 | && rdev->recovery_offset == MaxSector | ||
| 1482 | && !test_bit(Faulty, &rdev->flags) | 1483 | && !test_bit(Faulty, &rdev->flags) |
| 1483 | && !test_and_set_bit(In_sync, &rdev->flags)) { | 1484 | && !test_and_set_bit(In_sync, &rdev->flags)) { |
| 1484 | count++; | 1485 | count++; |
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index df7b0a06b0ea..73dc8a377522 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -1782,6 +1782,7 @@ static int raid10_spare_active(struct mddev *mddev) | |||
| 1782 | } | 1782 | } |
| 1783 | sysfs_notify_dirent_safe(tmp->replacement->sysfs_state); | 1783 | sysfs_notify_dirent_safe(tmp->replacement->sysfs_state); |
| 1784 | } else if (tmp->rdev | 1784 | } else if (tmp->rdev |
| 1785 | && tmp->rdev->recovery_offset == MaxSector | ||
| 1785 | && !test_bit(Faulty, &tmp->rdev->flags) | 1786 | && !test_bit(Faulty, &tmp->rdev->flags) |
| 1786 | && !test_and_set_bit(In_sync, &tmp->rdev->flags)) { | 1787 | && !test_and_set_bit(In_sync, &tmp->rdev->flags)) { |
| 1787 | count++; | 1788 | count++; |
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 7ff4f252ca1a..f8b906843926 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
| @@ -778,6 +778,12 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s) | |||
| 778 | bi->bi_io_vec[0].bv_len = STRIPE_SIZE; | 778 | bi->bi_io_vec[0].bv_len = STRIPE_SIZE; |
| 779 | bi->bi_io_vec[0].bv_offset = 0; | 779 | bi->bi_io_vec[0].bv_offset = 0; |
| 780 | bi->bi_size = STRIPE_SIZE; | 780 | bi->bi_size = STRIPE_SIZE; |
| 781 | /* | ||
| 782 | * If this is discard request, set bi_vcnt 0. We don't | ||
| 783 | * want to confuse SCSI because SCSI will replace payload | ||
| 784 | */ | ||
| 785 | if (rw & REQ_DISCARD) | ||
| 786 | bi->bi_vcnt = 0; | ||
| 781 | if (rrdev) | 787 | if (rrdev) |
| 782 | set_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags); | 788 | set_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags); |
| 783 | 789 | ||
| @@ -816,6 +822,12 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s) | |||
| 816 | rbi->bi_io_vec[0].bv_len = STRIPE_SIZE; | 822 | rbi->bi_io_vec[0].bv_len = STRIPE_SIZE; |
| 817 | rbi->bi_io_vec[0].bv_offset = 0; | 823 | rbi->bi_io_vec[0].bv_offset = 0; |
| 818 | rbi->bi_size = STRIPE_SIZE; | 824 | rbi->bi_size = STRIPE_SIZE; |
| 825 | /* | ||
| 826 | * If this is discard request, set bi_vcnt 0. We don't | ||
| 827 | * want to confuse SCSI because SCSI will replace payload | ||
| 828 | */ | ||
| 829 | if (rw & REQ_DISCARD) | ||
| 830 | rbi->bi_vcnt = 0; | ||
| 819 | if (conf->mddev->gendisk) | 831 | if (conf->mddev->gendisk) |
| 820 | trace_block_bio_remap(bdev_get_queue(rbi->bi_bdev), | 832 | trace_block_bio_remap(bdev_get_queue(rbi->bi_bdev), |
| 821 | rbi, disk_devt(conf->mddev->gendisk), | 833 | rbi, disk_devt(conf->mddev->gendisk), |
| @@ -2910,6 +2922,14 @@ static void handle_stripe_clean_event(struct r5conf *conf, | |||
| 2910 | } | 2922 | } |
| 2911 | /* now that discard is done we can proceed with any sync */ | 2923 | /* now that discard is done we can proceed with any sync */ |
| 2912 | clear_bit(STRIPE_DISCARD, &sh->state); | 2924 | clear_bit(STRIPE_DISCARD, &sh->state); |
| 2925 | /* | ||
| 2926 | * SCSI discard will change some bio fields and the stripe has | ||
| 2927 | * no updated data, so remove it from hash list and the stripe | ||
| 2928 | * will be reinitialized | ||
| 2929 | */ | ||
| 2930 | spin_lock_irq(&conf->device_lock); | ||
| 2931 | remove_hash(sh); | ||
| 2932 | spin_unlock_irq(&conf->device_lock); | ||
| 2913 | if (test_bit(STRIPE_SYNC_REQUESTED, &sh->state)) | 2933 | if (test_bit(STRIPE_SYNC_REQUESTED, &sh->state)) |
| 2914 | set_bit(STRIPE_HANDLE, &sh->state); | 2934 | set_bit(STRIPE_HANDLE, &sh->state); |
| 2915 | 2935 | ||
diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c index 2521f7e23018..e79749cfec81 100644 --- a/drivers/media/dvb-frontends/tda10071.c +++ b/drivers/media/dvb-frontends/tda10071.c | |||
| @@ -912,14 +912,8 @@ static int tda10071_init(struct dvb_frontend *fe) | |||
| 912 | { 0xd5, 0x03, 0x03 }, | 912 | { 0xd5, 0x03, 0x03 }, |
| 913 | }; | 913 | }; |
| 914 | 914 | ||
| 915 | /* firmware status */ | 915 | if (priv->warm) { |
| 916 | ret = tda10071_rd_reg(priv, 0x51, &tmp); | ||
| 917 | if (ret) | ||
| 918 | goto error; | ||
| 919 | |||
| 920 | if (!tmp) { | ||
| 921 | /* warm state - wake up device from sleep */ | 916 | /* warm state - wake up device from sleep */ |
| 922 | priv->warm = 1; | ||
| 923 | 917 | ||
| 924 | for (i = 0; i < ARRAY_SIZE(tab); i++) { | 918 | for (i = 0; i < ARRAY_SIZE(tab); i++) { |
| 925 | ret = tda10071_wr_reg_mask(priv, tab[i].reg, | 919 | ret = tda10071_wr_reg_mask(priv, tab[i].reg, |
| @@ -937,7 +931,6 @@ static int tda10071_init(struct dvb_frontend *fe) | |||
| 937 | goto error; | 931 | goto error; |
| 938 | } else { | 932 | } else { |
| 939 | /* cold state - try to download firmware */ | 933 | /* cold state - try to download firmware */ |
| 940 | priv->warm = 0; | ||
| 941 | 934 | ||
| 942 | /* request the firmware, this will block and timeout */ | 935 | /* request the firmware, this will block and timeout */ |
| 943 | ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent); | 936 | ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent); |
diff --git a/drivers/media/i2c/ad9389b.c b/drivers/media/i2c/ad9389b.c index bb0c99d7a4f1..b06a7e54ee0d 100644 --- a/drivers/media/i2c/ad9389b.c +++ b/drivers/media/i2c/ad9389b.c | |||
| @@ -628,16 +628,13 @@ static int ad9389b_s_stream(struct v4l2_subdev *sd, int enable) | |||
| 628 | 628 | ||
| 629 | static const struct v4l2_dv_timings_cap ad9389b_timings_cap = { | 629 | static const struct v4l2_dv_timings_cap ad9389b_timings_cap = { |
| 630 | .type = V4L2_DV_BT_656_1120, | 630 | .type = V4L2_DV_BT_656_1120, |
| 631 | .bt = { | 631 | /* keep this initialization for compatibility with GCC < 4.4.6 */ |
| 632 | .max_width = 1920, | 632 | .reserved = { 0 }, |
| 633 | .max_height = 1200, | 633 | V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, |
| 634 | .min_pixelclock = 25000000, | 634 | V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | |
| 635 | .max_pixelclock = 170000000, | ||
| 636 | .standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | | ||
| 637 | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, | 635 | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, |
| 638 | .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE | | 636 | V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | |
| 639 | V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM, | 637 | V4L2_DV_BT_CAP_CUSTOM) |
| 640 | }, | ||
| 641 | }; | 638 | }; |
| 642 | 639 | ||
| 643 | static int ad9389b_s_dv_timings(struct v4l2_subdev *sd, | 640 | static int ad9389b_s_dv_timings(struct v4l2_subdev *sd, |
diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c index 7a576097471f..7c8d971f1f61 100644 --- a/drivers/media/i2c/adv7511.c +++ b/drivers/media/i2c/adv7511.c | |||
| @@ -119,16 +119,14 @@ static int adv7511_s_clock_freq(struct v4l2_subdev *sd, u32 freq); | |||
| 119 | 119 | ||
| 120 | static const struct v4l2_dv_timings_cap adv7511_timings_cap = { | 120 | static const struct v4l2_dv_timings_cap adv7511_timings_cap = { |
| 121 | .type = V4L2_DV_BT_656_1120, | 121 | .type = V4L2_DV_BT_656_1120, |
| 122 | .bt = { | 122 | /* keep this initialization for compatibility with GCC < 4.4.6 */ |
| 123 | .max_width = ADV7511_MAX_WIDTH, | 123 | .reserved = { 0 }, |
| 124 | .max_height = ADV7511_MAX_HEIGHT, | 124 | V4L2_INIT_BT_TIMINGS(0, ADV7511_MAX_WIDTH, 0, ADV7511_MAX_HEIGHT, |
| 125 | .min_pixelclock = ADV7511_MIN_PIXELCLOCK, | 125 | ADV7511_MIN_PIXELCLOCK, ADV7511_MAX_PIXELCLOCK, |
| 126 | .max_pixelclock = ADV7511_MAX_PIXELCLOCK, | 126 | V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | |
| 127 | .standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | | ||
| 128 | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, | 127 | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, |
| 129 | .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE | | 128 | V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | |
| 130 | V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM, | 129 | V4L2_DV_BT_CAP_CUSTOM) |
| 131 | }, | ||
| 132 | }; | 130 | }; |
| 133 | 131 | ||
| 134 | static inline struct adv7511_state *get_adv7511_state(struct v4l2_subdev *sd) | 132 | static inline struct adv7511_state *get_adv7511_state(struct v4l2_subdev *sd) |
| @@ -1126,6 +1124,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id * | |||
| 1126 | state->i2c_edid = i2c_new_dummy(client->adapter, state->i2c_edid_addr >> 1); | 1124 | state->i2c_edid = i2c_new_dummy(client->adapter, state->i2c_edid_addr >> 1); |
| 1127 | if (state->i2c_edid == NULL) { | 1125 | if (state->i2c_edid == NULL) { |
| 1128 | v4l2_err(sd, "failed to register edid i2c client\n"); | 1126 | v4l2_err(sd, "failed to register edid i2c client\n"); |
| 1127 | err = -ENOMEM; | ||
| 1129 | goto err_entity; | 1128 | goto err_entity; |
| 1130 | } | 1129 | } |
| 1131 | 1130 | ||
| @@ -1133,6 +1132,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id * | |||
| 1133 | state->work_queue = create_singlethread_workqueue(sd->name); | 1132 | state->work_queue = create_singlethread_workqueue(sd->name); |
| 1134 | if (state->work_queue == NULL) { | 1133 | if (state->work_queue == NULL) { |
| 1135 | v4l2_err(sd, "could not create workqueue\n"); | 1134 | v4l2_err(sd, "could not create workqueue\n"); |
| 1135 | err = -ENOMEM; | ||
| 1136 | goto err_unreg_cec; | 1136 | goto err_unreg_cec; |
| 1137 | } | 1137 | } |
| 1138 | 1138 | ||
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index d1748901337c..22f729d66a96 100644 --- a/drivers/media/i2c/adv7842.c +++ b/drivers/media/i2c/adv7842.c | |||
| @@ -546,30 +546,24 @@ static inline bool is_digital_input(struct v4l2_subdev *sd) | |||
| 546 | 546 | ||
| 547 | static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = { | 547 | static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = { |
| 548 | .type = V4L2_DV_BT_656_1120, | 548 | .type = V4L2_DV_BT_656_1120, |
| 549 | .bt = { | 549 | /* keep this initialization for compatibility with GCC < 4.4.6 */ |
| 550 | .max_width = 1920, | 550 | .reserved = { 0 }, |
| 551 | .max_height = 1200, | 551 | V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, |
| 552 | .min_pixelclock = 25000000, | 552 | V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | |
| 553 | .max_pixelclock = 170000000, | ||
| 554 | .standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | | ||
| 555 | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, | 553 | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, |
| 556 | .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE | | 554 | V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | |
| 557 | V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM, | 555 | V4L2_DV_BT_CAP_CUSTOM) |
| 558 | }, | ||
| 559 | }; | 556 | }; |
| 560 | 557 | ||
| 561 | static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = { | 558 | static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = { |
| 562 | .type = V4L2_DV_BT_656_1120, | 559 | .type = V4L2_DV_BT_656_1120, |
| 563 | .bt = { | 560 | /* keep this initialization for compatibility with GCC < 4.4.6 */ |
| 564 | .max_width = 1920, | 561 | .reserved = { 0 }, |
| 565 | .max_height = 1200, | 562 | V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, |
| 566 | .min_pixelclock = 25000000, | 563 | V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | |
| 567 | .max_pixelclock = 225000000, | ||
| 568 | .standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | | ||
| 569 | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, | 564 | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, |
| 570 | .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE | | 565 | V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | |
| 571 | V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM, | 566 | V4L2_DV_BT_CAP_CUSTOM) |
| 572 | }, | ||
| 573 | }; | 567 | }; |
| 574 | 568 | ||
| 575 | static inline const struct v4l2_dv_timings_cap * | 569 | static inline const struct v4l2_dv_timings_cap * |
diff --git a/drivers/media/i2c/ths8200.c b/drivers/media/i2c/ths8200.c index a58a8f663ffb..d9f65d7e3e58 100644 --- a/drivers/media/i2c/ths8200.c +++ b/drivers/media/i2c/ths8200.c | |||
| @@ -46,14 +46,10 @@ struct ths8200_state { | |||
| 46 | 46 | ||
| 47 | static const struct v4l2_dv_timings_cap ths8200_timings_cap = { | 47 | static const struct v4l2_dv_timings_cap ths8200_timings_cap = { |
| 48 | .type = V4L2_DV_BT_656_1120, | 48 | .type = V4L2_DV_BT_656_1120, |
| 49 | .bt = { | 49 | /* keep this initialization for compatibility with GCC < 4.4.6 */ |
| 50 | .max_width = 1920, | 50 | .reserved = { 0 }, |
| 51 | .max_height = 1080, | 51 | V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1080, 25000000, 148500000, |
| 52 | .min_pixelclock = 25000000, | 52 | V4L2_DV_BT_STD_CEA861, V4L2_DV_BT_CAP_PROGRESSIVE) |
| 53 | .max_pixelclock = 148500000, | ||
| 54 | .standards = V4L2_DV_BT_STD_CEA861, | ||
| 55 | .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE, | ||
| 56 | }, | ||
| 57 | }; | 53 | }; |
| 58 | 54 | ||
| 59 | static inline struct ths8200_state *to_state(struct v4l2_subdev *sd) | 55 | static inline struct ths8200_state *to_state(struct v4l2_subdev *sd) |
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c index e12bbd8c3f0b..fb60da85bc2c 100644 --- a/drivers/media/pci/saa7134/saa7134-video.c +++ b/drivers/media/pci/saa7134/saa7134-video.c | |||
| @@ -1455,6 +1455,7 @@ static int video_release(struct file *file) | |||
| 1455 | 1455 | ||
| 1456 | /* stop video capture */ | 1456 | /* stop video capture */ |
| 1457 | if (res_check(fh, RESOURCE_VIDEO)) { | 1457 | if (res_check(fh, RESOURCE_VIDEO)) { |
| 1458 | pm_qos_remove_request(&dev->qos_request); | ||
| 1458 | videobuf_streamoff(&fh->cap); | 1459 | videobuf_streamoff(&fh->cap); |
| 1459 | res_free(dev,fh,RESOURCE_VIDEO); | 1460 | res_free(dev,fh,RESOURCE_VIDEO); |
| 1460 | } | 1461 | } |
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 15d23968d1de..9b88a4601007 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c | |||
| @@ -1423,6 +1423,7 @@ static int s5p_jpeg_probe(struct platform_device *pdev) | |||
| 1423 | jpeg->vfd_decoder->release = video_device_release; | 1423 | jpeg->vfd_decoder->release = video_device_release; |
| 1424 | jpeg->vfd_decoder->lock = &jpeg->lock; | 1424 | jpeg->vfd_decoder->lock = &jpeg->lock; |
| 1425 | jpeg->vfd_decoder->v4l2_dev = &jpeg->v4l2_dev; | 1425 | jpeg->vfd_decoder->v4l2_dev = &jpeg->v4l2_dev; |
| 1426 | jpeg->vfd_decoder->vfl_dir = VFL_DIR_M2M; | ||
| 1426 | 1427 | ||
| 1427 | ret = video_register_device(jpeg->vfd_decoder, VFL_TYPE_GRABBER, -1); | 1428 | ret = video_register_device(jpeg->vfd_decoder, VFL_TYPE_GRABBER, -1); |
| 1428 | if (ret) { | 1429 | if (ret) { |
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c index 7a9c5e9329f2..4f30341dc2ab 100644 --- a/drivers/media/platform/sh_vou.c +++ b/drivers/media/platform/sh_vou.c | |||
| @@ -776,7 +776,7 @@ static int sh_vou_try_fmt_vid_out(struct file *file, void *priv, | |||
| 776 | v4l_bound_align_image(&pix->width, 0, VOU_MAX_IMAGE_WIDTH, 1, | 776 | v4l_bound_align_image(&pix->width, 0, VOU_MAX_IMAGE_WIDTH, 1, |
| 777 | &pix->height, 0, VOU_MAX_IMAGE_HEIGHT, 1, 0); | 777 | &pix->height, 0, VOU_MAX_IMAGE_HEIGHT, 1, 0); |
| 778 | 778 | ||
| 779 | for (i = 0; ARRAY_SIZE(vou_fmt); i++) | 779 | for (i = 0; i < ARRAY_SIZE(vou_fmt); i++) |
| 780 | if (vou_fmt[i].pfmt == pix->pixelformat) | 780 | if (vou_fmt[i].pfmt == pix->pixelformat) |
| 781 | return 0; | 781 | return 0; |
| 782 | 782 | ||
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c index 8f9f6211c52e..f975b7008692 100644 --- a/drivers/media/platform/soc_camera/mx3_camera.c +++ b/drivers/media/platform/soc_camera/mx3_camera.c | |||
| @@ -266,7 +266,6 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb) | |||
| 266 | struct idmac_channel *ichan = mx3_cam->idmac_channel[0]; | 266 | struct idmac_channel *ichan = mx3_cam->idmac_channel[0]; |
| 267 | struct idmac_video_param *video = &ichan->params.video; | 267 | struct idmac_video_param *video = &ichan->params.video; |
| 268 | const struct soc_mbus_pixelfmt *host_fmt = icd->current_fmt->host_fmt; | 268 | const struct soc_mbus_pixelfmt *host_fmt = icd->current_fmt->host_fmt; |
| 269 | unsigned long flags; | ||
| 270 | dma_cookie_t cookie; | 269 | dma_cookie_t cookie; |
| 271 | size_t new_size; | 270 | size_t new_size; |
| 272 | 271 | ||
| @@ -328,7 +327,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb) | |||
| 328 | memset(vb2_plane_vaddr(vb, 0), 0xaa, vb2_get_plane_payload(vb, 0)); | 327 | memset(vb2_plane_vaddr(vb, 0), 0xaa, vb2_get_plane_payload(vb, 0)); |
| 329 | #endif | 328 | #endif |
| 330 | 329 | ||
| 331 | spin_lock_irqsave(&mx3_cam->lock, flags); | 330 | spin_lock_irq(&mx3_cam->lock); |
| 332 | list_add_tail(&buf->queue, &mx3_cam->capture); | 331 | list_add_tail(&buf->queue, &mx3_cam->capture); |
| 333 | 332 | ||
| 334 | if (!mx3_cam->active) | 333 | if (!mx3_cam->active) |
| @@ -351,7 +350,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb) | |||
| 351 | if (mx3_cam->active == buf) | 350 | if (mx3_cam->active == buf) |
| 352 | mx3_cam->active = NULL; | 351 | mx3_cam->active = NULL; |
| 353 | 352 | ||
| 354 | spin_unlock_irqrestore(&mx3_cam->lock, flags); | 353 | spin_unlock_irq(&mx3_cam->lock); |
| 355 | error: | 354 | error: |
| 356 | vb2_buffer_done(vb, VB2_BUF_STATE_ERROR); | 355 | vb2_buffer_done(vb, VB2_BUF_STATE_ERROR); |
| 357 | } | 356 | } |
diff --git a/drivers/media/tuners/e4000.c b/drivers/media/tuners/e4000.c index ad9309da4a91..6c96e4898777 100644 --- a/drivers/media/tuners/e4000.c +++ b/drivers/media/tuners/e4000.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "e4000_priv.h" | 21 | #include "e4000_priv.h" |
| 22 | #include <linux/math64.h> | ||
| 22 | 23 | ||
| 23 | /* write multiple registers */ | 24 | /* write multiple registers */ |
| 24 | static int e4000_wr_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len) | 25 | static int e4000_wr_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len) |
| @@ -233,7 +234,7 @@ static int e4000_set_params(struct dvb_frontend *fe) | |||
| 233 | * or more. | 234 | * or more. |
| 234 | */ | 235 | */ |
| 235 | f_vco = c->frequency * e4000_pll_lut[i].mul; | 236 | f_vco = c->frequency * e4000_pll_lut[i].mul; |
| 236 | sigma_delta = 0x10000UL * (f_vco % priv->cfg->clock) / priv->cfg->clock; | 237 | sigma_delta = div_u64(0x10000ULL * (f_vco % priv->cfg->clock), priv->cfg->clock); |
| 237 | buf[0] = f_vco / priv->cfg->clock; | 238 | buf[0] = f_vco / priv->cfg->clock; |
| 238 | buf[1] = (sigma_delta >> 0) & 0xff; | 239 | buf[1] = (sigma_delta >> 0) & 0xff; |
| 239 | buf[2] = (sigma_delta >> 8) & 0xff; | 240 | buf[2] = (sigma_delta >> 8) & 0xff; |
diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c index c43c8d32be40..be77482c3070 100644 --- a/drivers/media/usb/stkwebcam/stk-webcam.c +++ b/drivers/media/usb/stkwebcam/stk-webcam.c | |||
| @@ -111,6 +111,13 @@ static const struct dmi_system_id stk_upside_down_dmi_table[] = { | |||
| 111 | DMI_MATCH(DMI_PRODUCT_NAME, "F3JC") | 111 | DMI_MATCH(DMI_PRODUCT_NAME, "F3JC") |
| 112 | } | 112 | } |
| 113 | }, | 113 | }, |
| 114 | { | ||
| 115 | .ident = "T12Rg-H", | ||
| 116 | .matches = { | ||
| 117 | DMI_MATCH(DMI_SYS_VENDOR, "HCL Infosystems Limited"), | ||
| 118 | DMI_MATCH(DMI_PRODUCT_NAME, "T12Rg-H") | ||
| 119 | } | ||
| 120 | }, | ||
| 114 | {} | 121 | {} |
| 115 | }; | 122 | }; |
| 116 | 123 | ||
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 81695d48c13e..c3bb2502225b 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c | |||
| @@ -2090,6 +2090,15 @@ static struct usb_device_id uvc_ids[] = { | |||
| 2090 | .bInterfaceSubClass = 1, | 2090 | .bInterfaceSubClass = 1, |
| 2091 | .bInterfaceProtocol = 0, | 2091 | .bInterfaceProtocol = 0, |
| 2092 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | 2092 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, |
| 2093 | /* Microsoft Lifecam NX-3000 */ | ||
| 2094 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 2095 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 2096 | .idVendor = 0x045e, | ||
| 2097 | .idProduct = 0x0721, | ||
| 2098 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 2099 | .bInterfaceSubClass = 1, | ||
| 2100 | .bInterfaceProtocol = 0, | ||
| 2101 | .driver_info = UVC_QUIRK_PROBE_DEF }, | ||
| 2093 | /* Microsoft Lifecam VX-7000 */ | 2102 | /* Microsoft Lifecam VX-7000 */ |
| 2094 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | 2103 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
| 2095 | | USB_DEVICE_ID_MATCH_INT_INFO, | 2104 | | USB_DEVICE_ID_MATCH_INT_INFO, |
| @@ -2174,6 +2183,15 @@ static struct usb_device_id uvc_ids[] = { | |||
| 2174 | .bInterfaceSubClass = 1, | 2183 | .bInterfaceSubClass = 1, |
| 2175 | .bInterfaceProtocol = 0, | 2184 | .bInterfaceProtocol = 0, |
| 2176 | .driver_info = UVC_QUIRK_PROBE_DEF }, | 2185 | .driver_info = UVC_QUIRK_PROBE_DEF }, |
| 2186 | /* Dell SP2008WFP Monitor */ | ||
| 2187 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 2188 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 2189 | .idVendor = 0x05a9, | ||
| 2190 | .idProduct = 0x2641, | ||
| 2191 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 2192 | .bInterfaceSubClass = 1, | ||
| 2193 | .bInterfaceProtocol = 0, | ||
| 2194 | .driver_info = UVC_QUIRK_PROBE_DEF }, | ||
| 2177 | /* Dell Alienware X51 */ | 2195 | /* Dell Alienware X51 */ |
| 2178 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | 2196 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
| 2179 | | USB_DEVICE_ID_MATCH_INT_INFO, | 2197 | | USB_DEVICE_ID_MATCH_INT_INFO, |
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 594c75eab5a5..de0e87f0b2c3 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c | |||
| @@ -353,7 +353,9 @@ static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b) | |||
| 353 | 353 | ||
| 354 | if (b->m.planes[plane].bytesused > length) | 354 | if (b->m.planes[plane].bytesused > length) |
| 355 | return -EINVAL; | 355 | return -EINVAL; |
| 356 | if (b->m.planes[plane].data_offset >= | 356 | |
| 357 | if (b->m.planes[plane].data_offset > 0 && | ||
| 358 | b->m.planes[plane].data_offset >= | ||
| 357 | b->m.planes[plane].bytesused) | 359 | b->m.planes[plane].bytesused) |
| 358 | return -EINVAL; | 360 | return -EINVAL; |
| 359 | } | 361 | } |
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c index fd56f2563201..646f08f4f504 100644 --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c | |||
| @@ -423,6 +423,39 @@ static inline int vma_is_io(struct vm_area_struct *vma) | |||
| 423 | return !!(vma->vm_flags & (VM_IO | VM_PFNMAP)); | 423 | return !!(vma->vm_flags & (VM_IO | VM_PFNMAP)); |
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | static int vb2_dc_get_user_pfn(unsigned long start, int n_pages, | ||
| 427 | struct vm_area_struct *vma, unsigned long *res) | ||
| 428 | { | ||
| 429 | unsigned long pfn, start_pfn, prev_pfn; | ||
| 430 | unsigned int i; | ||
| 431 | int ret; | ||
| 432 | |||
| 433 | if (!vma_is_io(vma)) | ||
| 434 | return -EFAULT; | ||
| 435 | |||
| 436 | ret = follow_pfn(vma, start, &pfn); | ||
| 437 | if (ret) | ||
| 438 | return ret; | ||
| 439 | |||
| 440 | start_pfn = pfn; | ||
| 441 | start += PAGE_SIZE; | ||
| 442 | |||
| 443 | for (i = 1; i < n_pages; ++i, start += PAGE_SIZE) { | ||
| 444 | prev_pfn = pfn; | ||
| 445 | ret = follow_pfn(vma, start, &pfn); | ||
| 446 | |||
| 447 | if (ret) { | ||
| 448 | pr_err("no page for address %lu\n", start); | ||
| 449 | return ret; | ||
| 450 | } | ||
| 451 | if (pfn != prev_pfn + 1) | ||
| 452 | return -EINVAL; | ||
| 453 | } | ||
| 454 | |||
| 455 | *res = start_pfn; | ||
| 456 | return 0; | ||
| 457 | } | ||
| 458 | |||
| 426 | static int vb2_dc_get_user_pages(unsigned long start, struct page **pages, | 459 | static int vb2_dc_get_user_pages(unsigned long start, struct page **pages, |
| 427 | int n_pages, struct vm_area_struct *vma, int write) | 460 | int n_pages, struct vm_area_struct *vma, int write) |
| 428 | { | 461 | { |
| @@ -433,6 +466,9 @@ static int vb2_dc_get_user_pages(unsigned long start, struct page **pages, | |||
| 433 | unsigned long pfn; | 466 | unsigned long pfn; |
| 434 | int ret = follow_pfn(vma, start, &pfn); | 467 | int ret = follow_pfn(vma, start, &pfn); |
| 435 | 468 | ||
| 469 | if (!pfn_valid(pfn)) | ||
| 470 | return -EINVAL; | ||
| 471 | |||
| 436 | if (ret) { | 472 | if (ret) { |
| 437 | pr_err("no page for address %lu\n", start); | 473 | pr_err("no page for address %lu\n", start); |
| 438 | return ret; | 474 | return ret; |
| @@ -468,16 +504,49 @@ static void vb2_dc_put_userptr(void *buf_priv) | |||
| 468 | struct vb2_dc_buf *buf = buf_priv; | 504 | struct vb2_dc_buf *buf = buf_priv; |
| 469 | struct sg_table *sgt = buf->dma_sgt; | 505 | struct sg_table *sgt = buf->dma_sgt; |
| 470 | 506 | ||
| 471 | dma_unmap_sg(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir); | 507 | if (sgt) { |
| 472 | if (!vma_is_io(buf->vma)) | 508 | dma_unmap_sg(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir); |
| 473 | vb2_dc_sgt_foreach_page(sgt, vb2_dc_put_dirty_page); | 509 | if (!vma_is_io(buf->vma)) |
| 510 | vb2_dc_sgt_foreach_page(sgt, vb2_dc_put_dirty_page); | ||
| 474 | 511 | ||
| 475 | sg_free_table(sgt); | 512 | sg_free_table(sgt); |
| 476 | kfree(sgt); | 513 | kfree(sgt); |
| 514 | } | ||
| 477 | vb2_put_vma(buf->vma); | 515 | vb2_put_vma(buf->vma); |
| 478 | kfree(buf); | 516 | kfree(buf); |
| 479 | } | 517 | } |
| 480 | 518 | ||
| 519 | /* | ||
| 520 | * For some kind of reserved memory there might be no struct page available, | ||
| 521 | * so all that can be done to support such 'pages' is to try to convert | ||
| 522 | * pfn to dma address or at the last resort just assume that | ||
| 523 | * dma address == physical address (like it has been assumed in earlier version | ||
| 524 | * of videobuf2-dma-contig | ||
| 525 | */ | ||
| 526 | |||
| 527 | #ifdef __arch_pfn_to_dma | ||
| 528 | static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn) | ||
| 529 | { | ||
| 530 | return (dma_addr_t)__arch_pfn_to_dma(dev, pfn); | ||
| 531 | } | ||
| 532 | #elif defined(__pfn_to_bus) | ||
| 533 | static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn) | ||
| 534 | { | ||
| 535 | return (dma_addr_t)__pfn_to_bus(pfn); | ||
| 536 | } | ||
| 537 | #elif defined(__pfn_to_phys) | ||
| 538 | static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn) | ||
| 539 | { | ||
| 540 | return (dma_addr_t)__pfn_to_phys(pfn); | ||
| 541 | } | ||
| 542 | #else | ||
| 543 | static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn) | ||
| 544 | { | ||
| 545 | /* really, we cannot do anything better at this point */ | ||
| 546 | return (dma_addr_t)(pfn) << PAGE_SHIFT; | ||
| 547 | } | ||
| 548 | #endif | ||
| 549 | |||
| 481 | static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr, | 550 | static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr, |
| 482 | unsigned long size, int write) | 551 | unsigned long size, int write) |
| 483 | { | 552 | { |
| @@ -548,6 +617,14 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr, | |||
| 548 | /* extract page list from userspace mapping */ | 617 | /* extract page list from userspace mapping */ |
| 549 | ret = vb2_dc_get_user_pages(start, pages, n_pages, vma, write); | 618 | ret = vb2_dc_get_user_pages(start, pages, n_pages, vma, write); |
| 550 | if (ret) { | 619 | if (ret) { |
| 620 | unsigned long pfn; | ||
| 621 | if (vb2_dc_get_user_pfn(start, n_pages, vma, &pfn) == 0) { | ||
| 622 | buf->dma_addr = vb2_dc_pfn_to_dma(buf->dev, pfn); | ||
| 623 | buf->size = size; | ||
| 624 | kfree(pages); | ||
| 625 | return buf; | ||
| 626 | } | ||
| 627 | |||
| 551 | pr_err("failed to get user pages\n"); | 628 | pr_err("failed to get user pages\n"); |
| 552 | goto fail_vma; | 629 | goto fail_vma; |
| 553 | } | 630 | } |
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 26b14f9fcac6..6bc9618af094 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
| @@ -168,12 +168,25 @@ static inline int write_disable(struct m25p *flash) | |||
| 168 | */ | 168 | */ |
| 169 | static inline int set_4byte(struct m25p *flash, u32 jedec_id, int enable) | 169 | static inline int set_4byte(struct m25p *flash, u32 jedec_id, int enable) |
| 170 | { | 170 | { |
| 171 | int status; | ||
| 172 | bool need_wren = false; | ||
| 173 | |||
| 171 | switch (JEDEC_MFR(jedec_id)) { | 174 | switch (JEDEC_MFR(jedec_id)) { |
| 172 | case CFI_MFR_MACRONIX: | ||
| 173 | case CFI_MFR_ST: /* Micron, actually */ | 175 | case CFI_MFR_ST: /* Micron, actually */ |
| 176 | /* Some Micron need WREN command; all will accept it */ | ||
| 177 | need_wren = true; | ||
| 178 | case CFI_MFR_MACRONIX: | ||
| 174 | case 0xEF /* winbond */: | 179 | case 0xEF /* winbond */: |
| 180 | if (need_wren) | ||
| 181 | write_enable(flash); | ||
| 182 | |||
| 175 | flash->command[0] = enable ? OPCODE_EN4B : OPCODE_EX4B; | 183 | flash->command[0] = enable ? OPCODE_EN4B : OPCODE_EX4B; |
| 176 | return spi_write(flash->spi, flash->command, 1); | 184 | status = spi_write(flash->spi, flash->command, 1); |
| 185 | |||
| 186 | if (need_wren) | ||
| 187 | write_disable(flash); | ||
| 188 | |||
| 189 | return status; | ||
| 177 | default: | 190 | default: |
| 178 | /* Spansion style */ | 191 | /* Spansion style */ |
| 179 | flash->command[0] = OPCODE_BRWR; | 192 | flash->command[0] = OPCODE_BRWR; |
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 59ab0692f0b9..a9830ff8e3f3 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c | |||
| @@ -349,7 +349,7 @@ static int legacy_set_geometry(struct gpmi_nand_data *this) | |||
| 349 | 349 | ||
| 350 | int common_nfc_set_geometry(struct gpmi_nand_data *this) | 350 | int common_nfc_set_geometry(struct gpmi_nand_data *this) |
| 351 | { | 351 | { |
| 352 | return set_geometry_by_ecc_info(this) ? 0 : legacy_set_geometry(this); | 352 | return legacy_set_geometry(this); |
| 353 | } | 353 | } |
| 354 | 354 | ||
| 355 | struct dma_chan *get_dma_chan(struct gpmi_nand_data *this) | 355 | struct dma_chan *get_dma_chan(struct gpmi_nand_data *this) |
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 7ed4841327f2..d340b2f198c6 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
| @@ -2869,10 +2869,8 @@ static int nand_flash_detect_ext_param_page(struct mtd_info *mtd, | |||
| 2869 | 2869 | ||
| 2870 | len = le16_to_cpu(p->ext_param_page_length) * 16; | 2870 | len = le16_to_cpu(p->ext_param_page_length) * 16; |
| 2871 | ep = kmalloc(len, GFP_KERNEL); | 2871 | ep = kmalloc(len, GFP_KERNEL); |
| 2872 | if (!ep) { | 2872 | if (!ep) |
| 2873 | ret = -ENOMEM; | 2873 | return -ENOMEM; |
| 2874 | goto ext_out; | ||
| 2875 | } | ||
| 2876 | 2874 | ||
| 2877 | /* Send our own NAND_CMD_PARAM. */ | 2875 | /* Send our own NAND_CMD_PARAM. */ |
| 2878 | chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1); | 2876 | chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1); |
| @@ -2920,7 +2918,7 @@ static int nand_flash_detect_ext_param_page(struct mtd_info *mtd, | |||
| 2920 | } | 2918 | } |
| 2921 | 2919 | ||
| 2922 | pr_info("ONFI extended param page detected.\n"); | 2920 | pr_info("ONFI extended param page detected.\n"); |
| 2923 | return 0; | 2921 | ret = 0; |
| 2924 | 2922 | ||
| 2925 | ext_out: | 2923 | ext_out: |
| 2926 | kfree(ep); | 2924 | kfree(ep); |
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index dd03dfdfb0d6..c28d4e29af1a 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
| @@ -1320,7 +1320,12 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) | |||
| 1320 | for (cs = 0; cs < pdata->num_cs; cs++) { | 1320 | for (cs = 0; cs < pdata->num_cs; cs++) { |
| 1321 | struct mtd_info *mtd = info->host[cs]->mtd; | 1321 | struct mtd_info *mtd = info->host[cs]->mtd; |
| 1322 | 1322 | ||
| 1323 | mtd->name = pdev->name; | 1323 | /* |
| 1324 | * The mtd name matches the one used in 'mtdparts' kernel | ||
| 1325 | * parameter. This name cannot be changed or otherwise | ||
| 1326 | * user's mtd partitions configuration would get broken. | ||
| 1327 | */ | ||
| 1328 | mtd->name = "pxa3xx_nand-0"; | ||
| 1324 | info->cs = cs; | 1329 | info->cs = cs; |
| 1325 | ret = pxa3xx_nand_scan(mtd); | 1330 | ret = pxa3xx_nand_scan(mtd); |
| 1326 | if (ret) { | 1331 | if (ret) { |
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c index 3b1ff6148702..693d8ffe4653 100644 --- a/drivers/net/can/at91_can.c +++ b/drivers/net/can/at91_can.c | |||
| @@ -1405,10 +1405,10 @@ static int at91_can_remove(struct platform_device *pdev) | |||
| 1405 | 1405 | ||
| 1406 | static const struct platform_device_id at91_can_id_table[] = { | 1406 | static const struct platform_device_id at91_can_id_table[] = { |
| 1407 | { | 1407 | { |
| 1408 | .name = "at91_can", | 1408 | .name = "at91sam9x5_can", |
| 1409 | .driver_data = (kernel_ulong_t)&at91_at91sam9x5_data, | 1409 | .driver_data = (kernel_ulong_t)&at91_at91sam9x5_data, |
| 1410 | }, { | 1410 | }, { |
| 1411 | .name = "at91sam9x5_can", | 1411 | .name = "at91_can", |
| 1412 | .driver_data = (kernel_ulong_t)&at91_at91sam9263_data, | 1412 | .driver_data = (kernel_ulong_t)&at91_at91sam9263_data, |
| 1413 | }, { | 1413 | }, { |
| 1414 | /* sentinel */ | 1414 | /* sentinel */ |
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index f9cba4123c66..1870c4731a57 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c | |||
| @@ -705,14 +705,14 @@ static size_t can_get_size(const struct net_device *dev) | |||
| 705 | size_t size; | 705 | size_t size; |
| 706 | 706 | ||
| 707 | size = nla_total_size(sizeof(u32)); /* IFLA_CAN_STATE */ | 707 | size = nla_total_size(sizeof(u32)); /* IFLA_CAN_STATE */ |
| 708 | size += sizeof(struct can_ctrlmode); /* IFLA_CAN_CTRLMODE */ | 708 | size += nla_total_size(sizeof(struct can_ctrlmode)); /* IFLA_CAN_CTRLMODE */ |
| 709 | size += nla_total_size(sizeof(u32)); /* IFLA_CAN_RESTART_MS */ | 709 | size += nla_total_size(sizeof(u32)); /* IFLA_CAN_RESTART_MS */ |
| 710 | size += sizeof(struct can_bittiming); /* IFLA_CAN_BITTIMING */ | 710 | size += nla_total_size(sizeof(struct can_bittiming)); /* IFLA_CAN_BITTIMING */ |
| 711 | size += sizeof(struct can_clock); /* IFLA_CAN_CLOCK */ | 711 | size += nla_total_size(sizeof(struct can_clock)); /* IFLA_CAN_CLOCK */ |
| 712 | if (priv->do_get_berr_counter) /* IFLA_CAN_BERR_COUNTER */ | 712 | if (priv->do_get_berr_counter) /* IFLA_CAN_BERR_COUNTER */ |
| 713 | size += sizeof(struct can_berr_counter); | 713 | size += nla_total_size(sizeof(struct can_berr_counter)); |
| 714 | if (priv->bittiming_const) /* IFLA_CAN_BITTIMING_CONST */ | 714 | if (priv->bittiming_const) /* IFLA_CAN_BITTIMING_CONST */ |
| 715 | size += sizeof(struct can_bittiming_const); | 715 | size += nla_total_size(sizeof(struct can_bittiming_const)); |
| 716 | 716 | ||
| 717 | return size; | 717 | return size; |
| 718 | } | 718 | } |
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 3f21142138b7..8f5ce747feb5 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c | |||
| @@ -62,7 +62,7 @@ | |||
| 62 | #define FLEXCAN_MCR_BCC BIT(16) | 62 | #define FLEXCAN_MCR_BCC BIT(16) |
| 63 | #define FLEXCAN_MCR_LPRIO_EN BIT(13) | 63 | #define FLEXCAN_MCR_LPRIO_EN BIT(13) |
| 64 | #define FLEXCAN_MCR_AEN BIT(12) | 64 | #define FLEXCAN_MCR_AEN BIT(12) |
| 65 | #define FLEXCAN_MCR_MAXMB(x) ((x) & 0xf) | 65 | #define FLEXCAN_MCR_MAXMB(x) ((x) & 0x1f) |
| 66 | #define FLEXCAN_MCR_IDAM_A (0 << 8) | 66 | #define FLEXCAN_MCR_IDAM_A (0 << 8) |
| 67 | #define FLEXCAN_MCR_IDAM_B (1 << 8) | 67 | #define FLEXCAN_MCR_IDAM_B (1 << 8) |
| 68 | #define FLEXCAN_MCR_IDAM_C (2 << 8) | 68 | #define FLEXCAN_MCR_IDAM_C (2 << 8) |
| @@ -735,9 +735,11 @@ static int flexcan_chip_start(struct net_device *dev) | |||
| 735 | * | 735 | * |
| 736 | */ | 736 | */ |
| 737 | reg_mcr = flexcan_read(®s->mcr); | 737 | reg_mcr = flexcan_read(®s->mcr); |
| 738 | reg_mcr &= ~FLEXCAN_MCR_MAXMB(0xff); | ||
| 738 | reg_mcr |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_FEN | FLEXCAN_MCR_HALT | | 739 | reg_mcr |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_FEN | FLEXCAN_MCR_HALT | |
| 739 | FLEXCAN_MCR_SUPV | FLEXCAN_MCR_WRN_EN | | 740 | FLEXCAN_MCR_SUPV | FLEXCAN_MCR_WRN_EN | |
| 740 | FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_SRX_DIS; | 741 | FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_SRX_DIS | |
| 742 | FLEXCAN_MCR_MAXMB(FLEXCAN_TX_BUF_ID); | ||
| 741 | netdev_dbg(dev, "%s: writing mcr=0x%08x", __func__, reg_mcr); | 743 | netdev_dbg(dev, "%s: writing mcr=0x%08x", __func__, reg_mcr); |
| 742 | flexcan_write(reg_mcr, ®s->mcr); | 744 | flexcan_write(reg_mcr, ®s->mcr); |
| 743 | 745 | ||
| @@ -771,6 +773,10 @@ static int flexcan_chip_start(struct net_device *dev) | |||
| 771 | netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl); | 773 | netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl); |
| 772 | flexcan_write(reg_ctrl, ®s->ctrl); | 774 | flexcan_write(reg_ctrl, ®s->ctrl); |
| 773 | 775 | ||
| 776 | /* Abort any pending TX, mark Mailbox as INACTIVE */ | ||
| 777 | flexcan_write(FLEXCAN_MB_CNT_CODE(0x4), | ||
| 778 | ®s->cantxfg[FLEXCAN_TX_BUF_ID].can_ctrl); | ||
| 779 | |||
| 774 | /* acceptance mask/acceptance code (accept everything) */ | 780 | /* acceptance mask/acceptance code (accept everything) */ |
| 775 | flexcan_write(0x0, ®s->rxgmask); | 781 | flexcan_write(0x0, ®s->rxgmask); |
| 776 | flexcan_write(0x0, ®s->rx14mask); | 782 | flexcan_write(0x0, ®s->rx14mask); |
| @@ -979,9 +985,9 @@ static void unregister_flexcandev(struct net_device *dev) | |||
| 979 | } | 985 | } |
| 980 | 986 | ||
| 981 | static const struct of_device_id flexcan_of_match[] = { | 987 | static const struct of_device_id flexcan_of_match[] = { |
| 982 | { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, }, | ||
| 983 | { .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, }, | ||
| 984 | { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, }, | 988 | { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, }, |
| 989 | { .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, }, | ||
| 990 | { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, }, | ||
| 985 | { /* sentinel */ }, | 991 | { /* sentinel */ }, |
| 986 | }; | 992 | }; |
| 987 | MODULE_DEVICE_TABLE(of, flexcan_of_match); | 993 | MODULE_DEVICE_TABLE(of, flexcan_of_match); |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h index 97b3d32a98bd..c5e375ddd6c0 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | |||
| @@ -1197,8 +1197,9 @@ union cdu_context { | |||
| 1197 | /* TM (timers) host DB constants */ | 1197 | /* TM (timers) host DB constants */ |
| 1198 | #define TM_ILT_PAGE_SZ_HW 0 | 1198 | #define TM_ILT_PAGE_SZ_HW 0 |
| 1199 | #define TM_ILT_PAGE_SZ (4096 << TM_ILT_PAGE_SZ_HW) /* 4K */ | 1199 | #define TM_ILT_PAGE_SZ (4096 << TM_ILT_PAGE_SZ_HW) /* 4K */ |
| 1200 | /* #define TM_CONN_NUM (CNIC_STARTING_CID+CNIC_ISCSI_CXT_MAX) */ | 1200 | #define TM_CONN_NUM (BNX2X_FIRST_VF_CID + \ |
| 1201 | #define TM_CONN_NUM 1024 | 1201 | BNX2X_VF_CIDS + \ |
| 1202 | CNIC_ISCSI_CID_MAX) | ||
| 1202 | #define TM_ILT_SZ (8 * TM_CONN_NUM) | 1203 | #define TM_ILT_SZ (8 * TM_CONN_NUM) |
| 1203 | #define TM_ILT_LINES DIV_ROUND_UP(TM_ILT_SZ, TM_ILT_PAGE_SZ) | 1204 | #define TM_ILT_LINES DIV_ROUND_UP(TM_ILT_SZ, TM_ILT_PAGE_SZ) |
| 1204 | 1205 | ||
| @@ -1527,7 +1528,6 @@ struct bnx2x { | |||
| 1527 | #define PCI_32BIT_FLAG (1 << 1) | 1528 | #define PCI_32BIT_FLAG (1 << 1) |
| 1528 | #define ONE_PORT_FLAG (1 << 2) | 1529 | #define ONE_PORT_FLAG (1 << 2) |
| 1529 | #define NO_WOL_FLAG (1 << 3) | 1530 | #define NO_WOL_FLAG (1 << 3) |
| 1530 | #define USING_DAC_FLAG (1 << 4) | ||
| 1531 | #define USING_MSIX_FLAG (1 << 5) | 1531 | #define USING_MSIX_FLAG (1 << 5) |
| 1532 | #define USING_MSI_FLAG (1 << 6) | 1532 | #define USING_MSI_FLAG (1 << 6) |
| 1533 | #define DISABLE_MSI_FLAG (1 << 7) | 1533 | #define DISABLE_MSI_FLAG (1 << 7) |
| @@ -1621,7 +1621,7 @@ struct bnx2x { | |||
| 1621 | u16 rx_ticks_int; | 1621 | u16 rx_ticks_int; |
| 1622 | u16 rx_ticks; | 1622 | u16 rx_ticks; |
| 1623 | /* Maximal coalescing timeout in us */ | 1623 | /* Maximal coalescing timeout in us */ |
| 1624 | #define BNX2X_MAX_COALESCE_TOUT (0xf0*12) | 1624 | #define BNX2X_MAX_COALESCE_TOUT (0xff*BNX2X_BTR) |
| 1625 | 1625 | ||
| 1626 | u32 lin_cnt; | 1626 | u32 lin_cnt; |
| 1627 | 1627 | ||
| @@ -2072,7 +2072,8 @@ u32 bnx2x_dmae_opcode(struct bnx2x *bp, u8 src_type, u8 dst_type, | |||
| 2072 | 2072 | ||
| 2073 | void bnx2x_prep_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae, | 2073 | void bnx2x_prep_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae, |
| 2074 | u8 src_type, u8 dst_type); | 2074 | u8 src_type, u8 dst_type); |
| 2075 | int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae); | 2075 | int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae, |
| 2076 | u32 *comp); | ||
| 2076 | 2077 | ||
| 2077 | /* FLR related routines */ | 2078 | /* FLR related routines */ |
| 2078 | u32 bnx2x_flr_clnup_poll_count(struct bnx2x *bp); | 2079 | u32 bnx2x_flr_clnup_poll_count(struct bnx2x *bp); |
| @@ -2498,4 +2499,8 @@ enum bnx2x_pci_bus_speed { | |||
| 2498 | }; | 2499 | }; |
| 2499 | 2500 | ||
| 2500 | void bnx2x_set_local_cmng(struct bnx2x *bp); | 2501 | void bnx2x_set_local_cmng(struct bnx2x *bp); |
| 2502 | |||
| 2503 | #define MCPR_SCRATCH_BASE(bp) \ | ||
| 2504 | (CHIP_IS_E1x(bp) ? MCP_REG_MCPR_SCRATCH : MCP_A_REG_MCPR_SCRATCH) | ||
| 2505 | |||
| 2501 | #endif /* bnx2x.h */ | 2506 | #endif /* bnx2x.h */ |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index e66beff2704d..4ab4c89c60cd 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |||
| @@ -681,6 +681,7 @@ static void bnx2x_gro_receive(struct bnx2x *bp, struct bnx2x_fastpath *fp, | |||
| 681 | } | 681 | } |
| 682 | } | 682 | } |
| 683 | #endif | 683 | #endif |
| 684 | skb_record_rx_queue(skb, fp->rx_queue); | ||
| 684 | napi_gro_receive(&fp->napi, skb); | 685 | napi_gro_receive(&fp->napi, skb); |
| 685 | } | 686 | } |
| 686 | 687 | ||
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c index 324de5f05332..e8efa1c93ffe 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | |||
| @@ -891,17 +891,8 @@ static void bnx2x_get_regs(struct net_device *dev, | |||
| 891 | * will re-enable parity attentions right after the dump. | 891 | * will re-enable parity attentions right after the dump. |
| 892 | */ | 892 | */ |
| 893 | 893 | ||
| 894 | /* Disable parity on path 0 */ | ||
| 895 | bnx2x_pretend_func(bp, 0); | ||
| 896 | bnx2x_disable_blocks_parity(bp); | 894 | bnx2x_disable_blocks_parity(bp); |
| 897 | 895 | ||
| 898 | /* Disable parity on path 1 */ | ||
| 899 | bnx2x_pretend_func(bp, 1); | ||
| 900 | bnx2x_disable_blocks_parity(bp); | ||
| 901 | |||
| 902 | /* Return to current function */ | ||
| 903 | bnx2x_pretend_func(bp, BP_ABS_FUNC(bp)); | ||
| 904 | |||
| 905 | dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1; | 896 | dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1; |
| 906 | dump_hdr.preset = DUMP_ALL_PRESETS; | 897 | dump_hdr.preset = DUMP_ALL_PRESETS; |
| 907 | dump_hdr.version = BNX2X_DUMP_VERSION; | 898 | dump_hdr.version = BNX2X_DUMP_VERSION; |
| @@ -928,18 +919,9 @@ static void bnx2x_get_regs(struct net_device *dev, | |||
| 928 | /* Actually read the registers */ | 919 | /* Actually read the registers */ |
| 929 | __bnx2x_get_regs(bp, p); | 920 | __bnx2x_get_regs(bp, p); |
| 930 | 921 | ||
| 931 | /* Re-enable parity attentions on path 0 */ | 922 | /* Re-enable parity attentions */ |
| 932 | bnx2x_pretend_func(bp, 0); | ||
| 933 | bnx2x_clear_blocks_parity(bp); | 923 | bnx2x_clear_blocks_parity(bp); |
| 934 | bnx2x_enable_blocks_parity(bp); | 924 | bnx2x_enable_blocks_parity(bp); |
| 935 | |||
| 936 | /* Re-enable parity attentions on path 1 */ | ||
| 937 | bnx2x_pretend_func(bp, 1); | ||
| 938 | bnx2x_clear_blocks_parity(bp); | ||
| 939 | bnx2x_enable_blocks_parity(bp); | ||
| 940 | |||
| 941 | /* Return to current function */ | ||
| 942 | bnx2x_pretend_func(bp, BP_ABS_FUNC(bp)); | ||
| 943 | } | 925 | } |
| 944 | 926 | ||
| 945 | static int bnx2x_get_preset_regs_len(struct net_device *dev, u32 preset) | 927 | static int bnx2x_get_preset_regs_len(struct net_device *dev, u32 preset) |
| @@ -993,17 +975,8 @@ static int bnx2x_get_dump_data(struct net_device *dev, | |||
| 993 | * will re-enable parity attentions right after the dump. | 975 | * will re-enable parity attentions right after the dump. |
| 994 | */ | 976 | */ |
| 995 | 977 | ||
| 996 | /* Disable parity on path 0 */ | ||
| 997 | bnx2x_pretend_func(bp, 0); | ||
| 998 | bnx2x_disable_blocks_parity(bp); | 978 | bnx2x_disable_blocks_parity(bp); |
| 999 | 979 | ||
| 1000 | /* Disable parity on path 1 */ | ||
| 1001 | bnx2x_pretend_func(bp, 1); | ||
| 1002 | bnx2x_disable_blocks_parity(bp); | ||
| 1003 | |||
| 1004 | /* Return to current function */ | ||
| 1005 | bnx2x_pretend_func(bp, BP_ABS_FUNC(bp)); | ||
| 1006 | |||
| 1007 | dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1; | 980 | dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1; |
| 1008 | dump_hdr.preset = bp->dump_preset_idx; | 981 | dump_hdr.preset = bp->dump_preset_idx; |
| 1009 | dump_hdr.version = BNX2X_DUMP_VERSION; | 982 | dump_hdr.version = BNX2X_DUMP_VERSION; |
| @@ -1032,19 +1005,10 @@ static int bnx2x_get_dump_data(struct net_device *dev, | |||
| 1032 | /* Actually read the registers */ | 1005 | /* Actually read the registers */ |
| 1033 | __bnx2x_get_preset_regs(bp, p, dump_hdr.preset); | 1006 | __bnx2x_get_preset_regs(bp, p, dump_hdr.preset); |
| 1034 | 1007 | ||
| 1035 | /* Re-enable parity attentions on path 0 */ | 1008 | /* Re-enable parity attentions */ |
| 1036 | bnx2x_pretend_func(bp, 0); | ||
| 1037 | bnx2x_clear_blocks_parity(bp); | 1009 | bnx2x_clear_blocks_parity(bp); |
| 1038 | bnx2x_enable_blocks_parity(bp); | 1010 | bnx2x_enable_blocks_parity(bp); |
| 1039 | 1011 | ||
| 1040 | /* Re-enable parity attentions on path 1 */ | ||
| 1041 | bnx2x_pretend_func(bp, 1); | ||
| 1042 | bnx2x_clear_blocks_parity(bp); | ||
| 1043 | bnx2x_enable_blocks_parity(bp); | ||
| 1044 | |||
| 1045 | /* Return to current function */ | ||
| 1046 | bnx2x_pretend_func(bp, BP_ABS_FUNC(bp)); | ||
| 1047 | |||
| 1048 | return 0; | 1012 | return 0; |
| 1049 | } | 1013 | } |
| 1050 | 1014 | ||
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h index 76df015f486a..c2dfea7968f4 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | |||
| @@ -640,23 +640,35 @@ static const struct { | |||
| 640 | * [30] MCP Latched ump_tx_parity | 640 | * [30] MCP Latched ump_tx_parity |
| 641 | * [31] MCP Latched scpad_parity | 641 | * [31] MCP Latched scpad_parity |
| 642 | */ | 642 | */ |
| 643 | #define MISC_AEU_ENABLE_MCP_PRTY_BITS \ | 643 | #define MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS \ |
| 644 | (AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY | \ | 644 | (AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY | \ |
| 645 | AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY | \ | 645 | AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY | \ |
| 646 | AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY | \ | 646 | AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY) |
| 647 | |||
| 648 | #define MISC_AEU_ENABLE_MCP_PRTY_BITS \ | ||
| 649 | (MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS | \ | ||
| 647 | AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY) | 650 | AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY) |
| 648 | 651 | ||
| 649 | /* Below registers control the MCP parity attention output. When | 652 | /* Below registers control the MCP parity attention output. When |
| 650 | * MISC_AEU_ENABLE_MCP_PRTY_BITS are set - attentions are | 653 | * MISC_AEU_ENABLE_MCP_PRTY_BITS are set - attentions are |
| 651 | * enabled, when cleared - disabled. | 654 | * enabled, when cleared - disabled. |
| 652 | */ | 655 | */ |
| 653 | static const u32 mcp_attn_ctl_regs[] = { | 656 | static const struct { |
| 654 | MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0, | 657 | u32 addr; |
| 655 | MISC_REG_AEU_ENABLE4_NIG_0, | 658 | u32 bits; |
| 656 | MISC_REG_AEU_ENABLE4_PXP_0, | 659 | } mcp_attn_ctl_regs[] = { |
| 657 | MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0, | 660 | { MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0, |
| 658 | MISC_REG_AEU_ENABLE4_NIG_1, | 661 | MISC_AEU_ENABLE_MCP_PRTY_BITS }, |
| 659 | MISC_REG_AEU_ENABLE4_PXP_1 | 662 | { MISC_REG_AEU_ENABLE4_NIG_0, |
| 663 | MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS }, | ||
| 664 | { MISC_REG_AEU_ENABLE4_PXP_0, | ||
| 665 | MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS }, | ||
| 666 | { MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0, | ||
| 667 | MISC_AEU_ENABLE_MCP_PRTY_BITS }, | ||
| 668 | { MISC_REG_AEU_ENABLE4_NIG_1, | ||
| 669 | MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS }, | ||
| 670 | { MISC_REG_AEU_ENABLE4_PXP_1, | ||
| 671 | MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS } | ||
| 660 | }; | 672 | }; |
| 661 | 673 | ||
| 662 | static inline void bnx2x_set_mcp_parity(struct bnx2x *bp, u8 enable) | 674 | static inline void bnx2x_set_mcp_parity(struct bnx2x *bp, u8 enable) |
| @@ -665,14 +677,14 @@ static inline void bnx2x_set_mcp_parity(struct bnx2x *bp, u8 enable) | |||
| 665 | u32 reg_val; | 677 | u32 reg_val; |
| 666 | 678 | ||
| 667 | for (i = 0; i < ARRAY_SIZE(mcp_attn_ctl_regs); i++) { | 679 | for (i = 0; i < ARRAY_SIZE(mcp_attn_ctl_regs); i++) { |
| 668 | reg_val = REG_RD(bp, mcp_attn_ctl_regs[i]); | 680 | reg_val = REG_RD(bp, mcp_attn_ctl_regs[i].addr); |
| 669 | 681 | ||
| 670 | if (enable) | 682 | if (enable) |
| 671 | reg_val |= MISC_AEU_ENABLE_MCP_PRTY_BITS; | 683 | reg_val |= mcp_attn_ctl_regs[i].bits; |
| 672 | else | 684 | else |
| 673 | reg_val &= ~MISC_AEU_ENABLE_MCP_PRTY_BITS; | 685 | reg_val &= ~mcp_attn_ctl_regs[i].bits; |
| 674 | 686 | ||
| 675 | REG_WR(bp, mcp_attn_ctl_regs[i], reg_val); | 687 | REG_WR(bp, mcp_attn_ctl_regs[i].addr, reg_val); |
| 676 | } | 688 | } |
| 677 | } | 689 | } |
| 678 | 690 | ||
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 82b658d8c04c..b42f89ce02ef 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
| @@ -503,9 +503,9 @@ void bnx2x_prep_dmae_with_comp(struct bnx2x *bp, | |||
| 503 | } | 503 | } |
| 504 | 504 | ||
| 505 | /* issue a dmae command over the init-channel and wait for completion */ | 505 | /* issue a dmae command over the init-channel and wait for completion */ |
| 506 | int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae) | 506 | int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae, |
| 507 | u32 *comp) | ||
| 507 | { | 508 | { |
| 508 | u32 *wb_comp = bnx2x_sp(bp, wb_comp); | ||
| 509 | int cnt = CHIP_REV_IS_SLOW(bp) ? (400000) : 4000; | 509 | int cnt = CHIP_REV_IS_SLOW(bp) ? (400000) : 4000; |
| 510 | int rc = 0; | 510 | int rc = 0; |
| 511 | 511 | ||
| @@ -518,14 +518,14 @@ int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae) | |||
| 518 | spin_lock_bh(&bp->dmae_lock); | 518 | spin_lock_bh(&bp->dmae_lock); |
| 519 | 519 | ||
| 520 | /* reset completion */ | 520 | /* reset completion */ |
| 521 | *wb_comp = 0; | 521 | *comp = 0; |
| 522 | 522 | ||
| 523 | /* post the command on the channel used for initializations */ | 523 | /* post the command on the channel used for initializations */ |
| 524 | bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp)); | 524 | bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp)); |
| 525 | 525 | ||
| 526 | /* wait for completion */ | 526 | /* wait for completion */ |
| 527 | udelay(5); | 527 | udelay(5); |
| 528 | while ((*wb_comp & ~DMAE_PCI_ERR_FLAG) != DMAE_COMP_VAL) { | 528 | while ((*comp & ~DMAE_PCI_ERR_FLAG) != DMAE_COMP_VAL) { |
| 529 | 529 | ||
| 530 | if (!cnt || | 530 | if (!cnt || |
| 531 | (bp->recovery_state != BNX2X_RECOVERY_DONE && | 531 | (bp->recovery_state != BNX2X_RECOVERY_DONE && |
| @@ -537,7 +537,7 @@ int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae) | |||
| 537 | cnt--; | 537 | cnt--; |
| 538 | udelay(50); | 538 | udelay(50); |
| 539 | } | 539 | } |
| 540 | if (*wb_comp & DMAE_PCI_ERR_FLAG) { | 540 | if (*comp & DMAE_PCI_ERR_FLAG) { |
| 541 | BNX2X_ERR("DMAE PCI error!\n"); | 541 | BNX2X_ERR("DMAE PCI error!\n"); |
| 542 | rc = DMAE_PCI_ERROR; | 542 | rc = DMAE_PCI_ERROR; |
| 543 | } | 543 | } |
| @@ -574,7 +574,7 @@ void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr, | |||
| 574 | dmae.len = len32; | 574 | dmae.len = len32; |
| 575 | 575 | ||
| 576 | /* issue the command and wait for completion */ | 576 | /* issue the command and wait for completion */ |
| 577 | rc = bnx2x_issue_dmae_with_comp(bp, &dmae); | 577 | rc = bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp)); |
| 578 | if (rc) { | 578 | if (rc) { |
| 579 | BNX2X_ERR("DMAE returned failure %d\n", rc); | 579 | BNX2X_ERR("DMAE returned failure %d\n", rc); |
| 580 | bnx2x_panic(); | 580 | bnx2x_panic(); |
| @@ -611,7 +611,7 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32) | |||
| 611 | dmae.len = len32; | 611 | dmae.len = len32; |
| 612 | 612 | ||
| 613 | /* issue the command and wait for completion */ | 613 | /* issue the command and wait for completion */ |
| 614 | rc = bnx2x_issue_dmae_with_comp(bp, &dmae); | 614 | rc = bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp)); |
| 615 | if (rc) { | 615 | if (rc) { |
| 616 | BNX2X_ERR("DMAE returned failure %d\n", rc); | 616 | BNX2X_ERR("DMAE returned failure %d\n", rc); |
| 617 | bnx2x_panic(); | 617 | bnx2x_panic(); |
| @@ -751,6 +751,10 @@ static int bnx2x_mc_assert(struct bnx2x *bp) | |||
| 751 | return rc; | 751 | return rc; |
| 752 | } | 752 | } |
| 753 | 753 | ||
| 754 | #define MCPR_TRACE_BUFFER_SIZE (0x800) | ||
| 755 | #define SCRATCH_BUFFER_SIZE(bp) \ | ||
| 756 | (CHIP_IS_E1(bp) ? 0x10000 : (CHIP_IS_E1H(bp) ? 0x20000 : 0x28000)) | ||
| 757 | |||
| 754 | void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl) | 758 | void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl) |
| 755 | { | 759 | { |
| 756 | u32 addr, val; | 760 | u32 addr, val; |
| @@ -775,7 +779,17 @@ void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl) | |||
| 775 | trace_shmem_base = bp->common.shmem_base; | 779 | trace_shmem_base = bp->common.shmem_base; |
| 776 | else | 780 | else |
| 777 | trace_shmem_base = SHMEM2_RD(bp, other_shmem_base_addr); | 781 | trace_shmem_base = SHMEM2_RD(bp, other_shmem_base_addr); |
| 778 | addr = trace_shmem_base - 0x800; | 782 | |
| 783 | /* sanity */ | ||
| 784 | if (trace_shmem_base < MCPR_SCRATCH_BASE(bp) + MCPR_TRACE_BUFFER_SIZE || | ||
| 785 | trace_shmem_base >= MCPR_SCRATCH_BASE(bp) + | ||
| 786 | SCRATCH_BUFFER_SIZE(bp)) { | ||
| 787 | BNX2X_ERR("Unable to dump trace buffer (mark %x)\n", | ||
| 788 | trace_shmem_base); | ||
| 789 | return; | ||
| 790 | } | ||
| 791 | |||
| 792 | addr = trace_shmem_base - MCPR_TRACE_BUFFER_SIZE; | ||
| 779 | 793 | ||
| 780 | /* validate TRCB signature */ | 794 | /* validate TRCB signature */ |
| 781 | mark = REG_RD(bp, addr); | 795 | mark = REG_RD(bp, addr); |
| @@ -787,14 +801,17 @@ void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl) | |||
| 787 | /* read cyclic buffer pointer */ | 801 | /* read cyclic buffer pointer */ |
| 788 | addr += 4; | 802 | addr += 4; |
| 789 | mark = REG_RD(bp, addr); | 803 | mark = REG_RD(bp, addr); |
| 790 | mark = (CHIP_IS_E1x(bp) ? MCP_REG_MCPR_SCRATCH : MCP_A_REG_MCPR_SCRATCH) | 804 | mark = MCPR_SCRATCH_BASE(bp) + ((mark + 0x3) & ~0x3) - 0x08000000; |
| 791 | + ((mark + 0x3) & ~0x3) - 0x08000000; | 805 | if (mark >= trace_shmem_base || mark < addr + 4) { |
| 806 | BNX2X_ERR("Mark doesn't fall inside Trace Buffer\n"); | ||
| 807 | return; | ||
| 808 | } | ||
| 792 | printk("%s" "begin fw dump (mark 0x%x)\n", lvl, mark); | 809 | printk("%s" "begin fw dump (mark 0x%x)\n", lvl, mark); |
| 793 | 810 | ||
| 794 | printk("%s", lvl); | 811 | printk("%s", lvl); |
| 795 | 812 | ||
| 796 | /* dump buffer after the mark */ | 813 | /* dump buffer after the mark */ |
| 797 | for (offset = mark; offset <= trace_shmem_base; offset += 0x8*4) { | 814 | for (offset = mark; offset < trace_shmem_base; offset += 0x8*4) { |
| 798 | for (word = 0; word < 8; word++) | 815 | for (word = 0; word < 8; word++) |
| 799 | data[word] = htonl(REG_RD(bp, offset + 4*word)); | 816 | data[word] = htonl(REG_RD(bp, offset + 4*word)); |
| 800 | data[8] = 0x0; | 817 | data[8] = 0x0; |
| @@ -4280,65 +4297,60 @@ static void _print_next_block(int idx, const char *blk) | |||
| 4280 | pr_cont("%s%s", idx ? ", " : "", blk); | 4297 | pr_cont("%s%s", idx ? ", " : "", blk); |
| 4281 | } | 4298 | } |
| 4282 | 4299 | ||
| 4283 | static int bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig, | 4300 | static bool bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig, |
| 4284 | int par_num, bool print) | 4301 | int *par_num, bool print) |
| 4285 | { | 4302 | { |
| 4286 | int i = 0; | 4303 | u32 cur_bit; |
| 4287 | u32 cur_bit = 0; | 4304 | bool res; |
| 4305 | int i; | ||
| 4306 | |||
| 4307 | res = false; | ||
| 4308 | |||
| 4288 | for (i = 0; sig; i++) { | 4309 | for (i = 0; sig; i++) { |
| 4289 | cur_bit = ((u32)0x1 << i); | 4310 | cur_bit = (0x1UL << i); |
| 4290 | if (sig & cur_bit) { | 4311 | if (sig & cur_bit) { |
| 4291 | switch (cur_bit) { | 4312 | res |= true; /* Each bit is real error! */ |
| 4292 | case AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR: | 4313 | |
| 4293 | if (print) { | 4314 | if (print) { |
| 4294 | _print_next_block(par_num++, "BRB"); | 4315 | switch (cur_bit) { |
| 4316 | case AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR: | ||
| 4317 | _print_next_block((*par_num)++, "BRB"); | ||
| 4295 | _print_parity(bp, | 4318 | _print_parity(bp, |
| 4296 | BRB1_REG_BRB1_PRTY_STS); | 4319 | BRB1_REG_BRB1_PRTY_STS); |
| 4297 | } | 4320 | break; |
| 4298 | break; | 4321 | case AEU_INPUTS_ATTN_BITS_PARSER_PARITY_ERROR: |
| 4299 | case AEU_INPUTS_ATTN_BITS_PARSER_PARITY_ERROR: | 4322 | _print_next_block((*par_num)++, |
| 4300 | if (print) { | 4323 | "PARSER"); |
| 4301 | _print_next_block(par_num++, "PARSER"); | ||
| 4302 | _print_parity(bp, PRS_REG_PRS_PRTY_STS); | 4324 | _print_parity(bp, PRS_REG_PRS_PRTY_STS); |
| 4303 | } | 4325 | break; |
| 4304 | break; | 4326 | case AEU_INPUTS_ATTN_BITS_TSDM_PARITY_ERROR: |
| 4305 | case AEU_INPUTS_ATTN_BITS_TSDM_PARITY_ERROR: | 4327 | _print_next_block((*par_num)++, "TSDM"); |
| 4306 | if (print) { | ||
| 4307 | _print_next_block(par_num++, "TSDM"); | ||
| 4308 | _print_parity(bp, | 4328 | _print_parity(bp, |
| 4309 | TSDM_REG_TSDM_PRTY_STS); | 4329 | TSDM_REG_TSDM_PRTY_STS); |
| 4310 | } | 4330 | break; |
| 4311 | break; | 4331 | case AEU_INPUTS_ATTN_BITS_SEARCHER_PARITY_ERROR: |
| 4312 | case AEU_INPUTS_ATTN_BITS_SEARCHER_PARITY_ERROR: | 4332 | _print_next_block((*par_num)++, |
| 4313 | if (print) { | ||
| 4314 | _print_next_block(par_num++, | ||
| 4315 | "SEARCHER"); | 4333 | "SEARCHER"); |
| 4316 | _print_parity(bp, SRC_REG_SRC_PRTY_STS); | 4334 | _print_parity(bp, SRC_REG_SRC_PRTY_STS); |
| 4317 | } | 4335 | break; |
| 4318 | break; | 4336 | case AEU_INPUTS_ATTN_BITS_TCM_PARITY_ERROR: |
| 4319 | case AEU_INPUTS_ATTN_BITS_TCM_PARITY_ERROR: | 4337 | _print_next_block((*par_num)++, "TCM"); |
| 4320 | if (print) { | 4338 | _print_parity(bp, TCM_REG_TCM_PRTY_STS); |
| 4321 | _print_next_block(par_num++, "TCM"); | 4339 | break; |
| 4322 | _print_parity(bp, | 4340 | case AEU_INPUTS_ATTN_BITS_TSEMI_PARITY_ERROR: |
| 4323 | TCM_REG_TCM_PRTY_STS); | 4341 | _print_next_block((*par_num)++, |
| 4324 | } | 4342 | "TSEMI"); |
| 4325 | break; | ||
| 4326 | case AEU_INPUTS_ATTN_BITS_TSEMI_PARITY_ERROR: | ||
| 4327 | if (print) { | ||
| 4328 | _print_next_block(par_num++, "TSEMI"); | ||
| 4329 | _print_parity(bp, | 4343 | _print_parity(bp, |
| 4330 | TSEM_REG_TSEM_PRTY_STS_0); | 4344 | TSEM_REG_TSEM_PRTY_STS_0); |
| 4331 | _print_parity(bp, | 4345 | _print_parity(bp, |
| 4332 | TSEM_REG_TSEM_PRTY_STS_1); | 4346 | TSEM_REG_TSEM_PRTY_STS_1); |
| 4333 | } | 4347 | break; |
| 4334 | break; | 4348 | case AEU_INPUTS_ATTN_BITS_PBCLIENT_PARITY_ERROR: |
| 4335 | case AEU_INPUTS_ATTN_BITS_PBCLIENT_PARITY_ERROR: | 4349 | _print_next_block((*par_num)++, "XPB"); |
| 4336 | if (print) { | ||
| 4337 | _print_next_block(par_num++, "XPB"); | ||
| 4338 | _print_parity(bp, GRCBASE_XPB + | 4350 | _print_parity(bp, GRCBASE_XPB + |
| 4339 | PB_REG_PB_PRTY_STS); | 4351 | PB_REG_PB_PRTY_STS); |
| 4352 | break; | ||
| 4340 | } | 4353 | } |
| 4341 | break; | ||
| 4342 | } | 4354 | } |
| 4343 | 4355 | ||
| 4344 | /* Clear the bit */ | 4356 | /* Clear the bit */ |
| @@ -4346,53 +4358,59 @@ static int bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig, | |||
| 4346 | } | 4358 | } |
| 4347 | } | 4359 | } |
| 4348 | 4360 | ||
| 4349 | return par_num; | 4361 | return res; |
| 4350 | } | 4362 | } |
| 4351 | 4363 | ||
| 4352 | static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, | 4364 | static bool bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, |
| 4353 | int par_num, bool *global, | 4365 | int *par_num, bool *global, |
| 4354 | bool print) | 4366 | bool print) |
| 4355 | { | 4367 | { |
| 4356 | int i = 0; | 4368 | u32 cur_bit; |
| 4357 | u32 cur_bit = 0; | 4369 | bool res; |
| 4370 | int i; | ||
| 4371 | |||
| 4372 | res = false; | ||
| 4373 | |||
| 4358 | for (i = 0; sig; i++) { | 4374 | for (i = 0; sig; i++) { |
| 4359 | cur_bit = ((u32)0x1 << i); | 4375 | cur_bit = (0x1UL << i); |
| 4360 | if (sig & cur_bit) { | 4376 | if (sig & cur_bit) { |
| 4377 | res |= true; /* Each bit is real error! */ | ||
| 4361 | switch (cur_bit) { | 4378 | switch (cur_bit) { |
| 4362 | case AEU_INPUTS_ATTN_BITS_PBF_PARITY_ERROR: | 4379 | case AEU_INPUTS_ATTN_BITS_PBF_PARITY_ERROR: |
| 4363 | if (print) { | 4380 | if (print) { |
| 4364 | _print_next_block(par_num++, "PBF"); | 4381 | _print_next_block((*par_num)++, "PBF"); |
| 4365 | _print_parity(bp, PBF_REG_PBF_PRTY_STS); | 4382 | _print_parity(bp, PBF_REG_PBF_PRTY_STS); |
| 4366 | } | 4383 | } |
| 4367 | break; | 4384 | break; |
| 4368 | case AEU_INPUTS_ATTN_BITS_QM_PARITY_ERROR: | 4385 | case AEU_INPUTS_ATTN_BITS_QM_PARITY_ERROR: |
| 4369 | if (print) { | 4386 | if (print) { |
| 4370 | _print_next_block(par_num++, "QM"); | 4387 | _print_next_block((*par_num)++, "QM"); |
| 4371 | _print_parity(bp, QM_REG_QM_PRTY_STS); | 4388 | _print_parity(bp, QM_REG_QM_PRTY_STS); |
| 4372 | } | 4389 | } |
| 4373 | break; | 4390 | break; |
| 4374 | case AEU_INPUTS_ATTN_BITS_TIMERS_PARITY_ERROR: | 4391 | case AEU_INPUTS_ATTN_BITS_TIMERS_PARITY_ERROR: |
| 4375 | if (print) { | 4392 | if (print) { |
| 4376 | _print_next_block(par_num++, "TM"); | 4393 | _print_next_block((*par_num)++, "TM"); |
| 4377 | _print_parity(bp, TM_REG_TM_PRTY_STS); | 4394 | _print_parity(bp, TM_REG_TM_PRTY_STS); |
| 4378 | } | 4395 | } |
| 4379 | break; | 4396 | break; |
| 4380 | case AEU_INPUTS_ATTN_BITS_XSDM_PARITY_ERROR: | 4397 | case AEU_INPUTS_ATTN_BITS_XSDM_PARITY_ERROR: |
| 4381 | if (print) { | 4398 | if (print) { |
| 4382 | _print_next_block(par_num++, "XSDM"); | 4399 | _print_next_block((*par_num)++, "XSDM"); |
| 4383 | _print_parity(bp, | 4400 | _print_parity(bp, |
| 4384 | XSDM_REG_XSDM_PRTY_STS); | 4401 | XSDM_REG_XSDM_PRTY_STS); |
| 4385 | } | 4402 | } |
| 4386 | break; | 4403 | break; |
| 4387 | case AEU_INPUTS_ATTN_BITS_XCM_PARITY_ERROR: | 4404 | case AEU_INPUTS_ATTN_BITS_XCM_PARITY_ERROR: |
| 4388 | if (print) { | 4405 | if (print) { |
| 4389 | _print_next_block(par_num++, "XCM"); | 4406 | _print_next_block((*par_num)++, "XCM"); |
| 4390 | _print_parity(bp, XCM_REG_XCM_PRTY_STS); | 4407 | _print_parity(bp, XCM_REG_XCM_PRTY_STS); |
| 4391 | } | 4408 | } |
| 4392 | break; | 4409 | break; |
| 4393 | case AEU_INPUTS_ATTN_BITS_XSEMI_PARITY_ERROR: | 4410 | case AEU_INPUTS_ATTN_BITS_XSEMI_PARITY_ERROR: |
| 4394 | if (print) { | 4411 | if (print) { |
| 4395 | _print_next_block(par_num++, "XSEMI"); | 4412 | _print_next_block((*par_num)++, |
| 4413 | "XSEMI"); | ||
| 4396 | _print_parity(bp, | 4414 | _print_parity(bp, |
| 4397 | XSEM_REG_XSEM_PRTY_STS_0); | 4415 | XSEM_REG_XSEM_PRTY_STS_0); |
| 4398 | _print_parity(bp, | 4416 | _print_parity(bp, |
| @@ -4401,7 +4419,7 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, | |||
| 4401 | break; | 4419 | break; |
| 4402 | case AEU_INPUTS_ATTN_BITS_DOORBELLQ_PARITY_ERROR: | 4420 | case AEU_INPUTS_ATTN_BITS_DOORBELLQ_PARITY_ERROR: |
| 4403 | if (print) { | 4421 | if (print) { |
| 4404 | _print_next_block(par_num++, | 4422 | _print_next_block((*par_num)++, |
| 4405 | "DOORBELLQ"); | 4423 | "DOORBELLQ"); |
| 4406 | _print_parity(bp, | 4424 | _print_parity(bp, |
| 4407 | DORQ_REG_DORQ_PRTY_STS); | 4425 | DORQ_REG_DORQ_PRTY_STS); |
| @@ -4409,7 +4427,7 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, | |||
| 4409 | break; | 4427 | break; |
| 4410 | case AEU_INPUTS_ATTN_BITS_NIG_PARITY_ERROR: | 4428 | case AEU_INPUTS_ATTN_BITS_NIG_PARITY_ERROR: |
| 4411 | if (print) { | 4429 | if (print) { |
| 4412 | _print_next_block(par_num++, "NIG"); | 4430 | _print_next_block((*par_num)++, "NIG"); |
| 4413 | if (CHIP_IS_E1x(bp)) { | 4431 | if (CHIP_IS_E1x(bp)) { |
| 4414 | _print_parity(bp, | 4432 | _print_parity(bp, |
| 4415 | NIG_REG_NIG_PRTY_STS); | 4433 | NIG_REG_NIG_PRTY_STS); |
| @@ -4423,32 +4441,34 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, | |||
| 4423 | break; | 4441 | break; |
| 4424 | case AEU_INPUTS_ATTN_BITS_VAUX_PCI_CORE_PARITY_ERROR: | 4442 | case AEU_INPUTS_ATTN_BITS_VAUX_PCI_CORE_PARITY_ERROR: |
| 4425 | if (print) | 4443 | if (print) |
| 4426 | _print_next_block(par_num++, | 4444 | _print_next_block((*par_num)++, |
| 4427 | "VAUX PCI CORE"); | 4445 | "VAUX PCI CORE"); |
| 4428 | *global = true; | 4446 | *global = true; |
| 4429 | break; | 4447 | break; |
| 4430 | case AEU_INPUTS_ATTN_BITS_DEBUG_PARITY_ERROR: | 4448 | case AEU_INPUTS_ATTN_BITS_DEBUG_PARITY_ERROR: |
| 4431 | if (print) { | 4449 | if (print) { |
| 4432 | _print_next_block(par_num++, "DEBUG"); | 4450 | _print_next_block((*par_num)++, |
| 4451 | "DEBUG"); | ||
| 4433 | _print_parity(bp, DBG_REG_DBG_PRTY_STS); | 4452 | _print_parity(bp, DBG_REG_DBG_PRTY_STS); |
| 4434 | } | 4453 | } |
| 4435 | break; | 4454 | break; |
| 4436 | case AEU_INPUTS_ATTN_BITS_USDM_PARITY_ERROR: | 4455 | case AEU_INPUTS_ATTN_BITS_USDM_PARITY_ERROR: |
| 4437 | if (print) { | 4456 | if (print) { |
| 4438 | _print_next_block(par_num++, "USDM"); | 4457 | _print_next_block((*par_num)++, "USDM"); |
| 4439 | _print_parity(bp, | 4458 | _print_parity(bp, |
| 4440 | USDM_REG_USDM_PRTY_STS); | 4459 | USDM_REG_USDM_PRTY_STS); |
| 4441 | } | 4460 | } |
| 4442 | break; | 4461 | break; |
| 4443 | case AEU_INPUTS_ATTN_BITS_UCM_PARITY_ERROR: | 4462 | case AEU_INPUTS_ATTN_BITS_UCM_PARITY_ERROR: |
| 4444 | if (print) { | 4463 | if (print) { |
| 4445 | _print_next_block(par_num++, "UCM"); | 4464 | _print_next_block((*par_num)++, "UCM"); |
| 4446 | _print_parity(bp, UCM_REG_UCM_PRTY_STS); | 4465 | _print_parity(bp, UCM_REG_UCM_PRTY_STS); |
| 4447 | } | 4466 | } |
| 4448 | break; | 4467 | break; |
| 4449 | case AEU_INPUTS_ATTN_BITS_USEMI_PARITY_ERROR: | 4468 | case AEU_INPUTS_ATTN_BITS_USEMI_PARITY_ERROR: |
| 4450 | if (print) { | 4469 | if (print) { |
| 4451 | _print_next_block(par_num++, "USEMI"); | 4470 | _print_next_block((*par_num)++, |
| 4471 | "USEMI"); | ||
| 4452 | _print_parity(bp, | 4472 | _print_parity(bp, |
| 4453 | USEM_REG_USEM_PRTY_STS_0); | 4473 | USEM_REG_USEM_PRTY_STS_0); |
| 4454 | _print_parity(bp, | 4474 | _print_parity(bp, |
| @@ -4457,21 +4477,21 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, | |||
| 4457 | break; | 4477 | break; |
| 4458 | case AEU_INPUTS_ATTN_BITS_UPB_PARITY_ERROR: | 4478 | case AEU_INPUTS_ATTN_BITS_UPB_PARITY_ERROR: |
| 4459 | if (print) { | 4479 | if (print) { |
| 4460 | _print_next_block(par_num++, "UPB"); | 4480 | _print_next_block((*par_num)++, "UPB"); |
| 4461 | _print_parity(bp, GRCBASE_UPB + | 4481 | _print_parity(bp, GRCBASE_UPB + |
| 4462 | PB_REG_PB_PRTY_STS); | 4482 | PB_REG_PB_PRTY_STS); |
| 4463 | } | 4483 | } |
| 4464 | break; | 4484 | break; |
| 4465 | case AEU_INPUTS_ATTN_BITS_CSDM_PARITY_ERROR: | 4485 | case AEU_INPUTS_ATTN_BITS_CSDM_PARITY_ERROR: |
| 4466 | if (print) { | 4486 | if (print) { |
| 4467 | _print_next_block(par_num++, "CSDM"); | 4487 | _print_next_block((*par_num)++, "CSDM"); |
| 4468 | _print_parity(bp, | 4488 | _print_parity(bp, |
| 4469 | CSDM_REG_CSDM_PRTY_STS); | 4489 | CSDM_REG_CSDM_PRTY_STS); |
| 4470 | } | 4490 | } |
| 4471 | break; | 4491 | break; |
| 4472 | case AEU_INPUTS_ATTN_BITS_CCM_PARITY_ERROR: | 4492 | case AEU_INPUTS_ATTN_BITS_CCM_PARITY_ERROR: |
| 4473 | if (print) { | 4493 | if (print) { |
| 4474 | _print_next_block(par_num++, "CCM"); | 4494 | _print_next_block((*par_num)++, "CCM"); |
| 4475 | _print_parity(bp, CCM_REG_CCM_PRTY_STS); | 4495 | _print_parity(bp, CCM_REG_CCM_PRTY_STS); |
| 4476 | } | 4496 | } |
| 4477 | break; | 4497 | break; |
| @@ -4482,80 +4502,73 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, | |||
| 4482 | } | 4502 | } |
| 4483 | } | 4503 | } |
| 4484 | 4504 | ||
| 4485 | return par_num; | 4505 | return res; |
| 4486 | } | 4506 | } |
| 4487 | 4507 | ||
| 4488 | static int bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig, | 4508 | static bool bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig, |
| 4489 | int par_num, bool print) | 4509 | int *par_num, bool print) |
| 4490 | { | 4510 | { |
| 4491 | int i = 0; | 4511 | u32 cur_bit; |
| 4492 | u32 cur_bit = 0; | 4512 | bool res; |
| 4513 | int i; | ||
| 4514 | |||
| 4515 | res = false; | ||
| 4516 | |||
| 4493 | for (i = 0; sig; i++) { | 4517 | for (i = 0; sig; i++) { |
| 4494 | cur_bit = ((u32)0x1 << i); | 4518 | cur_bit = (0x1UL << i); |
| 4495 | if (sig & cur_bit) { | 4519 | if (sig & cur_bit) { |
| 4496 | switch (cur_bit) { | 4520 | res |= true; /* Each bit is real error! */ |
| 4497 | case AEU_INPUTS_ATTN_BITS_CSEMI_PARITY_ERROR: | 4521 | if (print) { |
| 4498 | if (print) { | 4522 | switch (cur_bit) { |
| 4499 | _print_next_block(par_num++, "CSEMI"); | 4523 | case AEU_INPUTS_ATTN_BITS_CSEMI_PARITY_ERROR: |
| 4524 | _print_next_block((*par_num)++, | ||
| 4525 | "CSEMI"); | ||
| 4500 | _print_parity(bp, | 4526 | _print_parity(bp, |
| 4501 | CSEM_REG_CSEM_PRTY_STS_0); | 4527 | CSEM_REG_CSEM_PRTY_STS_0); |
| 4502 | _print_parity(bp, | 4528 | _print_parity(bp, |
| 4503 | CSEM_REG_CSEM_PRTY_STS_1); | 4529 | CSEM_REG_CSEM_PRTY_STS_1); |
| 4504 | } | 4530 | break; |
| 4505 | break; | 4531 | case AEU_INPUTS_ATTN_BITS_PXP_PARITY_ERROR: |
| 4506 | case AEU_INPUTS_ATTN_BITS_PXP_PARITY_ERROR: | 4532 | _print_next_block((*par_num)++, "PXP"); |
| 4507 | if (print) { | ||
| 4508 | _print_next_block(par_num++, "PXP"); | ||
| 4509 | _print_parity(bp, PXP_REG_PXP_PRTY_STS); | 4533 | _print_parity(bp, PXP_REG_PXP_PRTY_STS); |
| 4510 | _print_parity(bp, | 4534 | _print_parity(bp, |
| 4511 | PXP2_REG_PXP2_PRTY_STS_0); | 4535 | PXP2_REG_PXP2_PRTY_STS_0); |
| 4512 | _print_parity(bp, | 4536 | _print_parity(bp, |
| 4513 | PXP2_REG_PXP2_PRTY_STS_1); | 4537 | PXP2_REG_PXP2_PRTY_STS_1); |
| 4514 | } | 4538 | break; |
| 4515 | break; | 4539 | case AEU_IN_ATTN_BITS_PXPPCICLOCKCLIENT_PARITY_ERROR: |
| 4516 | case AEU_IN_ATTN_BITS_PXPPCICLOCKCLIENT_PARITY_ERROR: | 4540 | _print_next_block((*par_num)++, |
| 4517 | if (print) | 4541 | "PXPPCICLOCKCLIENT"); |
| 4518 | _print_next_block(par_num++, | 4542 | break; |
| 4519 | "PXPPCICLOCKCLIENT"); | 4543 | case AEU_INPUTS_ATTN_BITS_CFC_PARITY_ERROR: |
| 4520 | break; | 4544 | _print_next_block((*par_num)++, "CFC"); |
| 4521 | case AEU_INPUTS_ATTN_BITS_CFC_PARITY_ERROR: | ||
| 4522 | if (print) { | ||
| 4523 | _print_next_block(par_num++, "CFC"); | ||
| 4524 | _print_parity(bp, | 4545 | _print_parity(bp, |
| 4525 | CFC_REG_CFC_PRTY_STS); | 4546 | CFC_REG_CFC_PRTY_STS); |
| 4526 | } | 4547 | break; |
| 4527 | break; | 4548 | case AEU_INPUTS_ATTN_BITS_CDU_PARITY_ERROR: |
| 4528 | case AEU_INPUTS_ATTN_BITS_CDU_PARITY_ERROR: | 4549 | _print_next_block((*par_num)++, "CDU"); |
| 4529 | if (print) { | ||
| 4530 | _print_next_block(par_num++, "CDU"); | ||
| 4531 | _print_parity(bp, CDU_REG_CDU_PRTY_STS); | 4550 | _print_parity(bp, CDU_REG_CDU_PRTY_STS); |
| 4532 | } | 4551 | break; |
| 4533 | break; | 4552 | case AEU_INPUTS_ATTN_BITS_DMAE_PARITY_ERROR: |
| 4534 | case AEU_INPUTS_ATTN_BITS_DMAE_PARITY_ERROR: | 4553 | _print_next_block((*par_num)++, "DMAE"); |
| 4535 | if (print) { | ||
| 4536 | _print_next_block(par_num++, "DMAE"); | ||
| 4537 | _print_parity(bp, | 4554 | _print_parity(bp, |
| 4538 | DMAE_REG_DMAE_PRTY_STS); | 4555 | DMAE_REG_DMAE_PRTY_STS); |
| 4539 | } | 4556 | break; |
| 4540 | break; | 4557 | case AEU_INPUTS_ATTN_BITS_IGU_PARITY_ERROR: |
| 4541 | case AEU_INPUTS_ATTN_BITS_IGU_PARITY_ERROR: | 4558 | _print_next_block((*par_num)++, "IGU"); |
| 4542 | if (print) { | ||
| 4543 | _print_next_block(par_num++, "IGU"); | ||
| 4544 | if (CHIP_IS_E1x(bp)) | 4559 | if (CHIP_IS_E1x(bp)) |
| 4545 | _print_parity(bp, | 4560 | _print_parity(bp, |
| 4546 | HC_REG_HC_PRTY_STS); | 4561 | HC_REG_HC_PRTY_STS); |
| 4547 | else | 4562 | else |
| 4548 | _print_parity(bp, | 4563 | _print_parity(bp, |
| 4549 | IGU_REG_IGU_PRTY_STS); | 4564 | IGU_REG_IGU_PRTY_STS); |
| 4550 | } | 4565 | break; |
| 4551 | break; | 4566 | case AEU_INPUTS_ATTN_BITS_MISC_PARITY_ERROR: |
| 4552 | case AEU_INPUTS_ATTN_BITS_MISC_PARITY_ERROR: | 4567 | _print_next_block((*par_num)++, "MISC"); |
| 4553 | if (print) { | ||
| 4554 | _print_next_block(par_num++, "MISC"); | ||
| 4555 | _print_parity(bp, | 4568 | _print_parity(bp, |
| 4556 | MISC_REG_MISC_PRTY_STS); | 4569 | MISC_REG_MISC_PRTY_STS); |
| 4570 | break; | ||
| 4557 | } | 4571 | } |
| 4558 | break; | ||
| 4559 | } | 4572 | } |
| 4560 | 4573 | ||
| 4561 | /* Clear the bit */ | 4574 | /* Clear the bit */ |
| @@ -4563,40 +4576,49 @@ static int bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig, | |||
| 4563 | } | 4576 | } |
| 4564 | } | 4577 | } |
| 4565 | 4578 | ||
| 4566 | return par_num; | 4579 | return res; |
| 4567 | } | 4580 | } |
| 4568 | 4581 | ||
| 4569 | static int bnx2x_check_blocks_with_parity3(u32 sig, int par_num, | 4582 | static bool bnx2x_check_blocks_with_parity3(struct bnx2x *bp, u32 sig, |
| 4570 | bool *global, bool print) | 4583 | int *par_num, bool *global, |
| 4584 | bool print) | ||
| 4571 | { | 4585 | { |
| 4572 | int i = 0; | 4586 | bool res = false; |
| 4573 | u32 cur_bit = 0; | 4587 | u32 cur_bit; |
| 4588 | int i; | ||
| 4589 | |||
| 4574 | for (i = 0; sig; i++) { | 4590 | for (i = 0; sig; i++) { |
| 4575 | cur_bit = ((u32)0x1 << i); | 4591 | cur_bit = (0x1UL << i); |
| 4576 | if (sig & cur_bit) { | 4592 | if (sig & cur_bit) { |
| 4577 | switch (cur_bit) { | 4593 | switch (cur_bit) { |
| 4578 | case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY: | 4594 | case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY: |
| 4579 | if (print) | 4595 | if (print) |
| 4580 | _print_next_block(par_num++, "MCP ROM"); | 4596 | _print_next_block((*par_num)++, |
| 4597 | "MCP ROM"); | ||
| 4581 | *global = true; | 4598 | *global = true; |
| 4599 | res |= true; | ||
| 4582 | break; | 4600 | break; |
| 4583 | case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY: | 4601 | case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY: |
| 4584 | if (print) | 4602 | if (print) |
| 4585 | _print_next_block(par_num++, | 4603 | _print_next_block((*par_num)++, |
| 4586 | "MCP UMP RX"); | 4604 | "MCP UMP RX"); |
| 4587 | *global = true; | 4605 | *global = true; |
| 4606 | res |= true; | ||
| 4588 | break; | 4607 | break; |
| 4589 | case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY: | 4608 | case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY: |
| 4590 | if (print) | 4609 | if (print) |
| 4591 | _print_next_block(par_num++, | 4610 | _print_next_block((*par_num)++, |
| 4592 | "MCP UMP TX"); | 4611 | "MCP UMP TX"); |
| 4593 | *global = true; | 4612 | *global = true; |
| 4613 | res |= true; | ||
| 4594 | break; | 4614 | break; |
| 4595 | case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY: | 4615 | case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY: |
| 4596 | if (print) | 4616 | if (print) |
| 4597 | _print_next_block(par_num++, | 4617 | _print_next_block((*par_num)++, |
| 4598 | "MCP SCPAD"); | 4618 | "MCP SCPAD"); |
| 4599 | *global = true; | 4619 | /* clear latched SCPAD PATIRY from MCP */ |
| 4620 | REG_WR(bp, MISC_REG_AEU_CLR_LATCH_SIGNAL, | ||
| 4621 | 1UL << 10); | ||
| 4600 | break; | 4622 | break; |
| 4601 | } | 4623 | } |
| 4602 | 4624 | ||
| @@ -4605,45 +4627,50 @@ static int bnx2x_check_blocks_with_parity3(u32 sig, int par_num, | |||
| 4605 | } | 4627 | } |
| 4606 | } | 4628 | } |
| 4607 | 4629 | ||
| 4608 | return par_num; | 4630 | return res; |
| 4609 | } | 4631 | } |
| 4610 | 4632 | ||
| 4611 | static int bnx2x_check_blocks_with_parity4(struct bnx2x *bp, u32 sig, | 4633 | static bool bnx2x_check_blocks_with_parity4(struct bnx2x *bp, u32 sig, |
| 4612 | int par_num, bool print) | 4634 | int *par_num, bool print) |
| 4613 | { | 4635 | { |
| 4614 | int i = 0; | 4636 | u32 cur_bit; |
| 4615 | u32 cur_bit = 0; | 4637 | bool res; |
| 4638 | int i; | ||
| 4639 | |||
| 4640 | res = false; | ||
| 4641 | |||
| 4616 | for (i = 0; sig; i++) { | 4642 | for (i = 0; sig; i++) { |
| 4617 | cur_bit = ((u32)0x1 << i); | 4643 | cur_bit = (0x1UL << i); |
| 4618 | if (sig & cur_bit) { | 4644 | if (sig & cur_bit) { |
| 4619 | switch (cur_bit) { | 4645 | res |= true; /* Each bit is real error! */ |
| 4620 | case AEU_INPUTS_ATTN_BITS_PGLUE_PARITY_ERROR: | 4646 | if (print) { |
| 4621 | if (print) { | 4647 | switch (cur_bit) { |
| 4622 | _print_next_block(par_num++, "PGLUE_B"); | 4648 | case AEU_INPUTS_ATTN_BITS_PGLUE_PARITY_ERROR: |
| 4649 | _print_next_block((*par_num)++, | ||
| 4650 | "PGLUE_B"); | ||
| 4623 | _print_parity(bp, | 4651 | _print_parity(bp, |
| 4624 | PGLUE_B_REG_PGLUE_B_PRTY_STS); | 4652 | PGLUE_B_REG_PGLUE_B_PRTY_STS); |
| 4625 | } | 4653 | break; |
| 4626 | break; | 4654 | case AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR: |
| 4627 | case AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR: | 4655 | _print_next_block((*par_num)++, "ATC"); |
| 4628 | if (print) { | ||
| 4629 | _print_next_block(par_num++, "ATC"); | ||
| 4630 | _print_parity(bp, | 4656 | _print_parity(bp, |
| 4631 | ATC_REG_ATC_PRTY_STS); | 4657 | ATC_REG_ATC_PRTY_STS); |
| 4658 | break; | ||
| 4632 | } | 4659 | } |
| 4633 | break; | ||
| 4634 | } | 4660 | } |
| 4635 | |||
| 4636 | /* Clear the bit */ | 4661 | /* Clear the bit */ |
| 4637 | sig &= ~cur_bit; | 4662 | sig &= ~cur_bit; |
| 4638 | } | 4663 | } |
| 4639 | } | 4664 | } |
| 4640 | 4665 | ||
| 4641 | return par_num; | 4666 | return res; |
| 4642 | } | 4667 | } |
| 4643 | 4668 | ||
| 4644 | static bool bnx2x_parity_attn(struct bnx2x *bp, bool *global, bool print, | 4669 | static bool bnx2x_parity_attn(struct bnx2x *bp, bool *global, bool print, |
| 4645 | u32 *sig) | 4670 | u32 *sig) |
| 4646 | { | 4671 | { |
| 4672 | bool res = false; | ||
| 4673 | |||
| 4647 | if ((sig[0] & HW_PRTY_ASSERT_SET_0) || | 4674 | if ((sig[0] & HW_PRTY_ASSERT_SET_0) || |
| 4648 | (sig[1] & HW_PRTY_ASSERT_SET_1) || | 4675 | (sig[1] & HW_PRTY_ASSERT_SET_1) || |
| 4649 | (sig[2] & HW_PRTY_ASSERT_SET_2) || | 4676 | (sig[2] & HW_PRTY_ASSERT_SET_2) || |
| @@ -4660,23 +4687,22 @@ static bool bnx2x_parity_attn(struct bnx2x *bp, bool *global, bool print, | |||
| 4660 | if (print) | 4687 | if (print) |
| 4661 | netdev_err(bp->dev, | 4688 | netdev_err(bp->dev, |
| 4662 | "Parity errors detected in blocks: "); | 4689 | "Parity errors detected in blocks: "); |
| 4663 | par_num = bnx2x_check_blocks_with_parity0(bp, | 4690 | res |= bnx2x_check_blocks_with_parity0(bp, |
| 4664 | sig[0] & HW_PRTY_ASSERT_SET_0, par_num, print); | 4691 | sig[0] & HW_PRTY_ASSERT_SET_0, &par_num, print); |
| 4665 | par_num = bnx2x_check_blocks_with_parity1(bp, | 4692 | res |= bnx2x_check_blocks_with_parity1(bp, |
| 4666 | sig[1] & HW_PRTY_ASSERT_SET_1, par_num, global, print); | 4693 | sig[1] & HW_PRTY_ASSERT_SET_1, &par_num, global, print); |
| 4667 | par_num = bnx2x_check_blocks_with_parity2(bp, | 4694 | res |= bnx2x_check_blocks_with_parity2(bp, |
| 4668 | sig[2] & HW_PRTY_ASSERT_SET_2, par_num, print); | 4695 | sig[2] & HW_PRTY_ASSERT_SET_2, &par_num, print); |
| 4669 | par_num = bnx2x_check_blocks_with_parity3( | 4696 | res |= bnx2x_check_blocks_with_parity3(bp, |
| 4670 | sig[3] & HW_PRTY_ASSERT_SET_3, par_num, global, print); | 4697 | sig[3] & HW_PRTY_ASSERT_SET_3, &par_num, global, print); |
| 4671 | par_num = bnx2x_check_blocks_with_parity4(bp, | 4698 | res |= bnx2x_check_blocks_with_parity4(bp, |
| 4672 | sig[4] & HW_PRTY_ASSERT_SET_4, par_num, print); | 4699 | sig[4] & HW_PRTY_ASSERT_SET_4, &par_num, print); |
| 4673 | 4700 | ||
| 4674 | if (print) | 4701 | if (print) |
| 4675 | pr_cont("\n"); | 4702 | pr_cont("\n"); |
| 4703 | } | ||
| 4676 | 4704 | ||
| 4677 | return true; | 4705 | return res; |
| 4678 | } else | ||
| 4679 | return false; | ||
| 4680 | } | 4706 | } |
| 4681 | 4707 | ||
| 4682 | /** | 4708 | /** |
| @@ -7126,7 +7152,7 @@ static int bnx2x_init_hw_port(struct bnx2x *bp) | |||
| 7126 | int port = BP_PORT(bp); | 7152 | int port = BP_PORT(bp); |
| 7127 | int init_phase = port ? PHASE_PORT1 : PHASE_PORT0; | 7153 | int init_phase = port ? PHASE_PORT1 : PHASE_PORT0; |
| 7128 | u32 low, high; | 7154 | u32 low, high; |
| 7129 | u32 val; | 7155 | u32 val, reg; |
| 7130 | 7156 | ||
| 7131 | DP(NETIF_MSG_HW, "starting port init port %d\n", port); | 7157 | DP(NETIF_MSG_HW, "starting port init port %d\n", port); |
| 7132 | 7158 | ||
| @@ -7271,6 +7297,17 @@ static int bnx2x_init_hw_port(struct bnx2x *bp) | |||
| 7271 | val |= CHIP_IS_E1(bp) ? 0 : 0x10; | 7297 | val |= CHIP_IS_E1(bp) ? 0 : 0x10; |
| 7272 | REG_WR(bp, MISC_REG_AEU_MASK_ATTN_FUNC_0 + port*4, val); | 7298 | REG_WR(bp, MISC_REG_AEU_MASK_ATTN_FUNC_0 + port*4, val); |
| 7273 | 7299 | ||
| 7300 | /* SCPAD_PARITY should NOT trigger close the gates */ | ||
| 7301 | reg = port ? MISC_REG_AEU_ENABLE4_NIG_1 : MISC_REG_AEU_ENABLE4_NIG_0; | ||
| 7302 | REG_WR(bp, reg, | ||
| 7303 | REG_RD(bp, reg) & | ||
| 7304 | ~AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY); | ||
| 7305 | |||
| 7306 | reg = port ? MISC_REG_AEU_ENABLE4_PXP_1 : MISC_REG_AEU_ENABLE4_PXP_0; | ||
| 7307 | REG_WR(bp, reg, | ||
| 7308 | REG_RD(bp, reg) & | ||
| 7309 | ~AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY); | ||
| 7310 | |||
| 7274 | bnx2x_init_block(bp, BLOCK_NIG, init_phase); | 7311 | bnx2x_init_block(bp, BLOCK_NIG, init_phase); |
| 7275 | 7312 | ||
| 7276 | if (!CHIP_IS_E1x(bp)) { | 7313 | if (!CHIP_IS_E1x(bp)) { |
| @@ -11685,9 +11722,6 @@ static int bnx2x_init_bp(struct bnx2x *bp) | |||
| 11685 | static int bnx2x_open(struct net_device *dev) | 11722 | static int bnx2x_open(struct net_device *dev) |
| 11686 | { | 11723 | { |
| 11687 | struct bnx2x *bp = netdev_priv(dev); | 11724 | struct bnx2x *bp = netdev_priv(dev); |
| 11688 | bool global = false; | ||
| 11689 | int other_engine = BP_PATH(bp) ? 0 : 1; | ||
| 11690 | bool other_load_status, load_status; | ||
| 11691 | int rc; | 11725 | int rc; |
| 11692 | 11726 | ||
| 11693 | bp->stats_init = true; | 11727 | bp->stats_init = true; |
| @@ -11703,6 +11737,10 @@ static int bnx2x_open(struct net_device *dev) | |||
| 11703 | * Parity recovery is only relevant for PF driver. | 11737 | * Parity recovery is only relevant for PF driver. |
| 11704 | */ | 11738 | */ |
| 11705 | if (IS_PF(bp)) { | 11739 | if (IS_PF(bp)) { |
| 11740 | int other_engine = BP_PATH(bp) ? 0 : 1; | ||
| 11741 | bool other_load_status, load_status; | ||
| 11742 | bool global = false; | ||
| 11743 | |||
| 11706 | other_load_status = bnx2x_get_load_status(bp, other_engine); | 11744 | other_load_status = bnx2x_get_load_status(bp, other_engine); |
| 11707 | load_status = bnx2x_get_load_status(bp, BP_PATH(bp)); | 11745 | load_status = bnx2x_get_load_status(bp, BP_PATH(bp)); |
| 11708 | if (!bnx2x_reset_is_done(bp, BP_PATH(bp)) || | 11746 | if (!bnx2x_reset_is_done(bp, BP_PATH(bp)) || |
| @@ -12080,7 +12118,6 @@ static int bnx2x_set_coherency_mask(struct bnx2x *bp) | |||
| 12080 | struct device *dev = &bp->pdev->dev; | 12118 | struct device *dev = &bp->pdev->dev; |
| 12081 | 12119 | ||
| 12082 | if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) { | 12120 | if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) { |
| 12083 | bp->flags |= USING_DAC_FLAG; | ||
| 12084 | if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) { | 12121 | if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) { |
| 12085 | dev_err(dev, "dma_set_coherent_mask failed, aborting\n"); | 12122 | dev_err(dev, "dma_set_coherent_mask failed, aborting\n"); |
| 12086 | return -EIO; | 12123 | return -EIO; |
| @@ -12248,8 +12285,7 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, | |||
| 12248 | NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_HIGHDMA; | 12285 | NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_HIGHDMA; |
| 12249 | 12286 | ||
| 12250 | dev->features |= dev->hw_features | NETIF_F_HW_VLAN_CTAG_RX; | 12287 | dev->features |= dev->hw_features | NETIF_F_HW_VLAN_CTAG_RX; |
| 12251 | if (bp->flags & USING_DAC_FLAG) | 12288 | dev->features |= NETIF_F_HIGHDMA; |
| 12252 | dev->features |= NETIF_F_HIGHDMA; | ||
| 12253 | 12289 | ||
| 12254 | /* Add Loopback capability to the device */ | 12290 | /* Add Loopback capability to the device */ |
| 12255 | dev->hw_features |= NETIF_F_LOOPBACK; | 12291 | dev->hw_features |= NETIF_F_LOOPBACK; |
| @@ -12612,24 +12648,24 @@ static int set_max_cos_est(int chip_id) | |||
| 12612 | return BNX2X_MULTI_TX_COS_E1X; | 12648 | return BNX2X_MULTI_TX_COS_E1X; |
| 12613 | case BCM57712: | 12649 | case BCM57712: |
| 12614 | case BCM57712_MF: | 12650 | case BCM57712_MF: |
| 12615 | case BCM57712_VF: | ||
| 12616 | return BNX2X_MULTI_TX_COS_E2_E3A0; | 12651 | return BNX2X_MULTI_TX_COS_E2_E3A0; |
| 12617 | case BCM57800: | 12652 | case BCM57800: |
| 12618 | case BCM57800_MF: | 12653 | case BCM57800_MF: |
| 12619 | case BCM57800_VF: | ||
| 12620 | case BCM57810: | 12654 | case BCM57810: |
| 12621 | case BCM57810_MF: | 12655 | case BCM57810_MF: |
| 12622 | case BCM57840_4_10: | 12656 | case BCM57840_4_10: |
| 12623 | case BCM57840_2_20: | 12657 | case BCM57840_2_20: |
| 12624 | case BCM57840_O: | 12658 | case BCM57840_O: |
| 12625 | case BCM57840_MFO: | 12659 | case BCM57840_MFO: |
| 12626 | case BCM57810_VF: | ||
| 12627 | case BCM57840_MF: | 12660 | case BCM57840_MF: |
| 12628 | case BCM57840_VF: | ||
| 12629 | case BCM57811: | 12661 | case BCM57811: |
| 12630 | case BCM57811_MF: | 12662 | case BCM57811_MF: |
| 12631 | case BCM57811_VF: | ||
| 12632 | return BNX2X_MULTI_TX_COS_E3B0; | 12663 | return BNX2X_MULTI_TX_COS_E3B0; |
| 12664 | case BCM57712_VF: | ||
| 12665 | case BCM57800_VF: | ||
| 12666 | case BCM57810_VF: | ||
| 12667 | case BCM57840_VF: | ||
| 12668 | case BCM57811_VF: | ||
| 12633 | return 1; | 12669 | return 1; |
| 12634 | default: | 12670 | default: |
| 12635 | pr_err("Unknown board_type (%d), aborting\n", chip_id); | 12671 | pr_err("Unknown board_type (%d), aborting\n", chip_id); |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c index 9ad012bdd915..bf08ad68b405 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | |||
| @@ -470,10 +470,10 @@ static int bnx2x_vfop_qdtor_cmd(struct bnx2x *bp, | |||
| 470 | bnx2x_vfop_qdtor, cmd->done); | 470 | bnx2x_vfop_qdtor, cmd->done); |
| 471 | return bnx2x_vfop_transition(bp, vf, bnx2x_vfop_qdtor, | 471 | return bnx2x_vfop_transition(bp, vf, bnx2x_vfop_qdtor, |
| 472 | cmd->block); | 472 | cmd->block); |
| 473 | } else { | ||
| 474 | BNX2X_ERR("VF[%d] failed to add a vfop\n", vf->abs_vfid); | ||
| 475 | return -ENOMEM; | ||
| 473 | } | 476 | } |
| 474 | DP(BNX2X_MSG_IOV, "VF[%d] failed to add a vfop. rc %d\n", | ||
| 475 | vf->abs_vfid, vfop->rc); | ||
| 476 | return -ENOMEM; | ||
| 477 | } | 477 | } |
| 478 | 478 | ||
| 479 | static void | 479 | static void |
| @@ -3390,14 +3390,16 @@ int bnx2x_set_vf_mac(struct net_device *dev, int vfidx, u8 *mac) | |||
| 3390 | rc = bnx2x_del_all_macs(bp, mac_obj, BNX2X_ETH_MAC, true); | 3390 | rc = bnx2x_del_all_macs(bp, mac_obj, BNX2X_ETH_MAC, true); |
| 3391 | if (rc) { | 3391 | if (rc) { |
| 3392 | BNX2X_ERR("failed to delete eth macs\n"); | 3392 | BNX2X_ERR("failed to delete eth macs\n"); |
| 3393 | return -EINVAL; | 3393 | rc = -EINVAL; |
| 3394 | goto out; | ||
| 3394 | } | 3395 | } |
| 3395 | 3396 | ||
| 3396 | /* remove existing uc list macs */ | 3397 | /* remove existing uc list macs */ |
| 3397 | rc = bnx2x_del_all_macs(bp, mac_obj, BNX2X_UC_LIST_MAC, true); | 3398 | rc = bnx2x_del_all_macs(bp, mac_obj, BNX2X_UC_LIST_MAC, true); |
| 3398 | if (rc) { | 3399 | if (rc) { |
| 3399 | BNX2X_ERR("failed to delete uc_list macs\n"); | 3400 | BNX2X_ERR("failed to delete uc_list macs\n"); |
| 3400 | return -EINVAL; | 3401 | rc = -EINVAL; |
| 3402 | goto out; | ||
| 3401 | } | 3403 | } |
| 3402 | 3404 | ||
| 3403 | /* configure the new mac to device */ | 3405 | /* configure the new mac to device */ |
| @@ -3405,6 +3407,7 @@ int bnx2x_set_vf_mac(struct net_device *dev, int vfidx, u8 *mac) | |||
| 3405 | bnx2x_set_mac_one(bp, (u8 *)&bulletin->mac, mac_obj, true, | 3407 | bnx2x_set_mac_one(bp, (u8 *)&bulletin->mac, mac_obj, true, |
| 3406 | BNX2X_ETH_MAC, &ramrod_flags); | 3408 | BNX2X_ETH_MAC, &ramrod_flags); |
| 3407 | 3409 | ||
| 3410 | out: | ||
| 3408 | bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_MAC); | 3411 | bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_MAC); |
| 3409 | } | 3412 | } |
| 3410 | 3413 | ||
| @@ -3467,7 +3470,8 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) | |||
| 3467 | &ramrod_flags); | 3470 | &ramrod_flags); |
| 3468 | if (rc) { | 3471 | if (rc) { |
| 3469 | BNX2X_ERR("failed to delete vlans\n"); | 3472 | BNX2X_ERR("failed to delete vlans\n"); |
| 3470 | return -EINVAL; | 3473 | rc = -EINVAL; |
| 3474 | goto out; | ||
| 3471 | } | 3475 | } |
| 3472 | 3476 | ||
| 3473 | /* send queue update ramrod to configure default vlan and silent | 3477 | /* send queue update ramrod to configure default vlan and silent |
| @@ -3501,7 +3505,8 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) | |||
| 3501 | rc = bnx2x_config_vlan_mac(bp, &ramrod_param); | 3505 | rc = bnx2x_config_vlan_mac(bp, &ramrod_param); |
| 3502 | if (rc) { | 3506 | if (rc) { |
| 3503 | BNX2X_ERR("failed to configure vlan\n"); | 3507 | BNX2X_ERR("failed to configure vlan\n"); |
| 3504 | return -EINVAL; | 3508 | rc = -EINVAL; |
| 3509 | goto out; | ||
| 3505 | } | 3510 | } |
| 3506 | 3511 | ||
| 3507 | /* configure default vlan to vf queue and set silent | 3512 | /* configure default vlan to vf queue and set silent |
| @@ -3519,18 +3524,18 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) | |||
| 3519 | rc = bnx2x_queue_state_change(bp, &q_params); | 3524 | rc = bnx2x_queue_state_change(bp, &q_params); |
| 3520 | if (rc) { | 3525 | if (rc) { |
| 3521 | BNX2X_ERR("Failed to configure default VLAN\n"); | 3526 | BNX2X_ERR("Failed to configure default VLAN\n"); |
| 3522 | return rc; | 3527 | goto out; |
| 3523 | } | 3528 | } |
| 3524 | 3529 | ||
| 3525 | /* clear the flag indicating that this VF needs its vlan | 3530 | /* clear the flag indicating that this VF needs its vlan |
| 3526 | * (will only be set if the HV configured th Vlan before vf was | 3531 | * (will only be set if the HV configured the Vlan before vf was |
| 3527 | * and we were called because the VF came up later | 3532 | * up and we were called because the VF came up later |
| 3528 | */ | 3533 | */ |
| 3534 | out: | ||
| 3529 | vf->cfg_flags &= ~VF_CFG_VLAN; | 3535 | vf->cfg_flags &= ~VF_CFG_VLAN; |
| 3530 | |||
| 3531 | bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_VLAN); | 3536 | bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_VLAN); |
| 3532 | } | 3537 | } |
| 3533 | return 0; | 3538 | return rc; |
| 3534 | } | 3539 | } |
| 3535 | 3540 | ||
| 3536 | /* crc is the first field in the bulletin board. Compute the crc over the | 3541 | /* crc is the first field in the bulletin board. Compute the crc over the |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c index 86436c77af03..3b75070411aa 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | |||
| @@ -196,7 +196,7 @@ static void bnx2x_hw_stats_post(struct bnx2x *bp) | |||
| 196 | 196 | ||
| 197 | } else if (bp->func_stx) { | 197 | } else if (bp->func_stx) { |
| 198 | *stats_comp = 0; | 198 | *stats_comp = 0; |
| 199 | bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp)); | 199 | bnx2x_issue_dmae_with_comp(bp, dmae, stats_comp); |
| 200 | } | 200 | } |
| 201 | } | 201 | } |
| 202 | 202 | ||
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c index da16953eb2ec..28757dfacf0d 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | |||
| @@ -980,7 +980,7 @@ static int bnx2x_copy32_vf_dmae(struct bnx2x *bp, u8 from_vf, | |||
| 980 | dmae.len = len32; | 980 | dmae.len = len32; |
| 981 | 981 | ||
| 982 | /* issue the command and wait for completion */ | 982 | /* issue the command and wait for completion */ |
| 983 | return bnx2x_issue_dmae_with_comp(bp, &dmae); | 983 | return bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp)); |
| 984 | } | 984 | } |
| 985 | 985 | ||
| 986 | static void bnx2x_vf_mbx_resp(struct bnx2x *bp, struct bnx2x_virtf *vf) | 986 | static void bnx2x_vf_mbx_resp(struct bnx2x *bp, struct bnx2x_virtf *vf) |
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c index 78d6d6b970e1..48f52882a22b 100644 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c | |||
| @@ -106,7 +106,6 @@ | |||
| 106 | #define XGMAC_DMA_HW_FEATURE 0x00000f58 /* Enabled Hardware Features */ | 106 | #define XGMAC_DMA_HW_FEATURE 0x00000f58 /* Enabled Hardware Features */ |
| 107 | 107 | ||
| 108 | #define XGMAC_ADDR_AE 0x80000000 | 108 | #define XGMAC_ADDR_AE 0x80000000 |
| 109 | #define XGMAC_MAX_FILTER_ADDR 31 | ||
| 110 | 109 | ||
| 111 | /* PMT Control and Status */ | 110 | /* PMT Control and Status */ |
| 112 | #define XGMAC_PMT_POINTER_RESET 0x80000000 | 111 | #define XGMAC_PMT_POINTER_RESET 0x80000000 |
| @@ -384,6 +383,7 @@ struct xgmac_priv { | |||
| 384 | struct device *device; | 383 | struct device *device; |
| 385 | struct napi_struct napi; | 384 | struct napi_struct napi; |
| 386 | 385 | ||
| 386 | int max_macs; | ||
| 387 | struct xgmac_extra_stats xstats; | 387 | struct xgmac_extra_stats xstats; |
| 388 | 388 | ||
| 389 | spinlock_t stats_lock; | 389 | spinlock_t stats_lock; |
| @@ -1291,14 +1291,12 @@ static void xgmac_set_rx_mode(struct net_device *dev) | |||
| 1291 | netdev_dbg(priv->dev, "# mcasts %d, # unicast %d\n", | 1291 | netdev_dbg(priv->dev, "# mcasts %d, # unicast %d\n", |
| 1292 | netdev_mc_count(dev), netdev_uc_count(dev)); | 1292 | netdev_mc_count(dev), netdev_uc_count(dev)); |
| 1293 | 1293 | ||
| 1294 | if (dev->flags & IFF_PROMISC) { | 1294 | if (dev->flags & IFF_PROMISC) |
| 1295 | writel(XGMAC_FRAME_FILTER_PR, ioaddr + XGMAC_FRAME_FILTER); | 1295 | value |= XGMAC_FRAME_FILTER_PR; |
| 1296 | return; | ||
| 1297 | } | ||
| 1298 | 1296 | ||
| 1299 | memset(hash_filter, 0, sizeof(hash_filter)); | 1297 | memset(hash_filter, 0, sizeof(hash_filter)); |
| 1300 | 1298 | ||
| 1301 | if (netdev_uc_count(dev) > XGMAC_MAX_FILTER_ADDR) { | 1299 | if (netdev_uc_count(dev) > priv->max_macs) { |
| 1302 | use_hash = true; | 1300 | use_hash = true; |
| 1303 | value |= XGMAC_FRAME_FILTER_HUC | XGMAC_FRAME_FILTER_HPF; | 1301 | value |= XGMAC_FRAME_FILTER_HUC | XGMAC_FRAME_FILTER_HPF; |
| 1304 | } | 1302 | } |
| @@ -1321,7 +1319,7 @@ static void xgmac_set_rx_mode(struct net_device *dev) | |||
| 1321 | goto out; | 1319 | goto out; |
| 1322 | } | 1320 | } |
| 1323 | 1321 | ||
| 1324 | if ((netdev_mc_count(dev) + reg - 1) > XGMAC_MAX_FILTER_ADDR) { | 1322 | if ((netdev_mc_count(dev) + reg - 1) > priv->max_macs) { |
| 1325 | use_hash = true; | 1323 | use_hash = true; |
| 1326 | value |= XGMAC_FRAME_FILTER_HMC | XGMAC_FRAME_FILTER_HPF; | 1324 | value |= XGMAC_FRAME_FILTER_HMC | XGMAC_FRAME_FILTER_HPF; |
| 1327 | } else { | 1325 | } else { |
| @@ -1342,8 +1340,8 @@ static void xgmac_set_rx_mode(struct net_device *dev) | |||
| 1342 | } | 1340 | } |
| 1343 | 1341 | ||
| 1344 | out: | 1342 | out: |
| 1345 | for (i = reg; i < XGMAC_MAX_FILTER_ADDR; i++) | 1343 | for (i = reg; i <= priv->max_macs; i++) |
| 1346 | xgmac_set_mac_addr(ioaddr, NULL, reg); | 1344 | xgmac_set_mac_addr(ioaddr, NULL, i); |
| 1347 | for (i = 0; i < XGMAC_NUM_HASH; i++) | 1345 | for (i = 0; i < XGMAC_NUM_HASH; i++) |
| 1348 | writel(hash_filter[i], ioaddr + XGMAC_HASH(i)); | 1346 | writel(hash_filter[i], ioaddr + XGMAC_HASH(i)); |
| 1349 | 1347 | ||
| @@ -1761,6 +1759,13 @@ static int xgmac_probe(struct platform_device *pdev) | |||
| 1761 | uid = readl(priv->base + XGMAC_VERSION); | 1759 | uid = readl(priv->base + XGMAC_VERSION); |
| 1762 | netdev_info(ndev, "h/w version is 0x%x\n", uid); | 1760 | netdev_info(ndev, "h/w version is 0x%x\n", uid); |
| 1763 | 1761 | ||
| 1762 | /* Figure out how many valid mac address filter registers we have */ | ||
| 1763 | writel(1, priv->base + XGMAC_ADDR_HIGH(31)); | ||
| 1764 | if (readl(priv->base + XGMAC_ADDR_HIGH(31)) == 1) | ||
| 1765 | priv->max_macs = 31; | ||
| 1766 | else | ||
| 1767 | priv->max_macs = 7; | ||
| 1768 | |||
| 1764 | writel(0, priv->base + XGMAC_DMA_INTR_ENA); | 1769 | writel(0, priv->base + XGMAC_DMA_INTR_ENA); |
| 1765 | ndev->irq = platform_get_irq(pdev, 0); | 1770 | ndev->irq = platform_get_irq(pdev, 0); |
| 1766 | if (ndev->irq == -ENXIO) { | 1771 | if (ndev->irq == -ENXIO) { |
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c index 5f5896e522d2..a7a941b1a655 100644 --- a/drivers/net/ethernet/davicom/dm9000.c +++ b/drivers/net/ethernet/davicom/dm9000.c | |||
| @@ -158,18 +158,6 @@ static inline board_info_t *to_dm9000_board(struct net_device *dev) | |||
| 158 | 158 | ||
| 159 | /* DM9000 network board routine ---------------------------- */ | 159 | /* DM9000 network board routine ---------------------------- */ |
| 160 | 160 | ||
| 161 | static void | ||
| 162 | dm9000_reset(board_info_t * db) | ||
| 163 | { | ||
| 164 | dev_dbg(db->dev, "resetting device\n"); | ||
| 165 | |||
| 166 | /* RESET device */ | ||
| 167 | writeb(DM9000_NCR, db->io_addr); | ||
| 168 | udelay(200); | ||
| 169 | writeb(NCR_RST, db->io_data); | ||
| 170 | udelay(200); | ||
| 171 | } | ||
| 172 | |||
| 173 | /* | 161 | /* |
| 174 | * Read a byte from I/O port | 162 | * Read a byte from I/O port |
| 175 | */ | 163 | */ |
| @@ -191,6 +179,27 @@ iow(board_info_t * db, int reg, int value) | |||
| 191 | writeb(value, db->io_data); | 179 | writeb(value, db->io_data); |
| 192 | } | 180 | } |
| 193 | 181 | ||
| 182 | static void | ||
| 183 | dm9000_reset(board_info_t *db) | ||
| 184 | { | ||
| 185 | dev_dbg(db->dev, "resetting device\n"); | ||
| 186 | |||
| 187 | /* Reset DM9000, see DM9000 Application Notes V1.22 Jun 11, 2004 page 29 | ||
| 188 | * The essential point is that we have to do a double reset, and the | ||
| 189 | * instruction is to set LBK into MAC internal loopback mode. | ||
| 190 | */ | ||
| 191 | iow(db, DM9000_NCR, 0x03); | ||
| 192 | udelay(100); /* Application note says at least 20 us */ | ||
| 193 | if (ior(db, DM9000_NCR) & 1) | ||
| 194 | dev_err(db->dev, "dm9000 did not respond to first reset\n"); | ||
| 195 | |||
| 196 | iow(db, DM9000_NCR, 0); | ||
| 197 | iow(db, DM9000_NCR, 0x03); | ||
| 198 | udelay(100); | ||
| 199 | if (ior(db, DM9000_NCR) & 1) | ||
| 200 | dev_err(db->dev, "dm9000 did not respond to second reset\n"); | ||
| 201 | } | ||
| 202 | |||
| 194 | /* routines for sending block to chip */ | 203 | /* routines for sending block to chip */ |
| 195 | 204 | ||
| 196 | static void dm9000_outblk_8bit(void __iomem *reg, void *data, int count) | 205 | static void dm9000_outblk_8bit(void __iomem *reg, void *data, int count) |
| @@ -744,15 +753,20 @@ static const struct ethtool_ops dm9000_ethtool_ops = { | |||
| 744 | static void dm9000_show_carrier(board_info_t *db, | 753 | static void dm9000_show_carrier(board_info_t *db, |
| 745 | unsigned carrier, unsigned nsr) | 754 | unsigned carrier, unsigned nsr) |
| 746 | { | 755 | { |
| 756 | int lpa; | ||
| 747 | struct net_device *ndev = db->ndev; | 757 | struct net_device *ndev = db->ndev; |
| 758 | struct mii_if_info *mii = &db->mii; | ||
| 748 | unsigned ncr = dm9000_read_locked(db, DM9000_NCR); | 759 | unsigned ncr = dm9000_read_locked(db, DM9000_NCR); |
| 749 | 760 | ||
| 750 | if (carrier) | 761 | if (carrier) { |
| 751 | dev_info(db->dev, "%s: link up, %dMbps, %s-duplex, no LPA\n", | 762 | lpa = mii->mdio_read(mii->dev, mii->phy_id, MII_LPA); |
| 763 | dev_info(db->dev, | ||
| 764 | "%s: link up, %dMbps, %s-duplex, lpa 0x%04X\n", | ||
| 752 | ndev->name, (nsr & NSR_SPEED) ? 10 : 100, | 765 | ndev->name, (nsr & NSR_SPEED) ? 10 : 100, |
| 753 | (ncr & NCR_FDX) ? "full" : "half"); | 766 | (ncr & NCR_FDX) ? "full" : "half", lpa); |
| 754 | else | 767 | } else { |
| 755 | dev_info(db->dev, "%s: link down\n", ndev->name); | 768 | dev_info(db->dev, "%s: link down\n", ndev->name); |
| 769 | } | ||
| 756 | } | 770 | } |
| 757 | 771 | ||
| 758 | static void | 772 | static void |
| @@ -890,9 +904,15 @@ dm9000_init_dm9000(struct net_device *dev) | |||
| 890 | (dev->features & NETIF_F_RXCSUM) ? RCSR_CSUM : 0); | 904 | (dev->features & NETIF_F_RXCSUM) ? RCSR_CSUM : 0); |
| 891 | 905 | ||
| 892 | iow(db, DM9000_GPCR, GPCR_GEP_CNTL); /* Let GPIO0 output */ | 906 | iow(db, DM9000_GPCR, GPCR_GEP_CNTL); /* Let GPIO0 output */ |
| 907 | iow(db, DM9000_GPR, 0); | ||
| 893 | 908 | ||
| 894 | dm9000_phy_write(dev, 0, MII_BMCR, BMCR_RESET); /* PHY RESET */ | 909 | /* If we are dealing with DM9000B, some extra steps are required: a |
| 895 | dm9000_phy_write(dev, 0, MII_DM_DSPCR, DSPCR_INIT_PARAM); /* Init */ | 910 | * manual phy reset, and setting init params. |
| 911 | */ | ||
| 912 | if (db->type == TYPE_DM9000B) { | ||
| 913 | dm9000_phy_write(dev, 0, MII_BMCR, BMCR_RESET); | ||
| 914 | dm9000_phy_write(dev, 0, MII_DM_DSPCR, DSPCR_INIT_PARAM); | ||
| 915 | } | ||
| 896 | 916 | ||
| 897 | ncr = (db->flags & DM9000_PLATF_EXT_PHY) ? NCR_EXT_PHY : 0; | 917 | ncr = (db->flags & DM9000_PLATF_EXT_PHY) ? NCR_EXT_PHY : 0; |
| 898 | 918 | ||
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index bd0e0c0bbcd8..c08fd32bb8e5 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c | |||
| @@ -1198,7 +1198,6 @@ int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo) | |||
| 1198 | 1198 | ||
| 1199 | if (lancer_chip(adapter)) { | 1199 | if (lancer_chip(adapter)) { |
| 1200 | req->hdr.version = 1; | 1200 | req->hdr.version = 1; |
| 1201 | req->if_id = cpu_to_le16(adapter->if_handle); | ||
| 1202 | } else if (BEx_chip(adapter)) { | 1201 | } else if (BEx_chip(adapter)) { |
| 1203 | if (adapter->function_caps & BE_FUNCTION_CAPS_SUPER_NIC) | 1202 | if (adapter->function_caps & BE_FUNCTION_CAPS_SUPER_NIC) |
| 1204 | req->hdr.version = 2; | 1203 | req->hdr.version = 2; |
| @@ -1206,6 +1205,8 @@ int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo) | |||
| 1206 | req->hdr.version = 2; | 1205 | req->hdr.version = 2; |
| 1207 | } | 1206 | } |
| 1208 | 1207 | ||
| 1208 | if (req->hdr.version > 0) | ||
| 1209 | req->if_id = cpu_to_le16(adapter->if_handle); | ||
| 1209 | req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size); | 1210 | req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size); |
| 1210 | req->ulp_num = BE_ULP1_NUM; | 1211 | req->ulp_num = BE_ULP1_NUM; |
| 1211 | req->type = BE_ETH_TX_RING_TYPE_STANDARD; | 1212 | req->type = BE_ETH_TX_RING_TYPE_STANDARD; |
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index c4eaadeb572f..9fbe4dda7a0e 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c | |||
| @@ -88,6 +88,7 @@ | |||
| 88 | 88 | ||
| 89 | #include <asm/io.h> | 89 | #include <asm/io.h> |
| 90 | #include <asm/reg.h> | 90 | #include <asm/reg.h> |
| 91 | #include <asm/mpc85xx.h> | ||
| 91 | #include <asm/irq.h> | 92 | #include <asm/irq.h> |
| 92 | #include <asm/uaccess.h> | 93 | #include <asm/uaccess.h> |
| 93 | #include <linux/module.h> | 94 | #include <linux/module.h> |
| @@ -939,9 +940,8 @@ static void gfar_init_filer_table(struct gfar_private *priv) | |||
| 939 | } | 940 | } |
| 940 | } | 941 | } |
| 941 | 942 | ||
| 942 | static void gfar_detect_errata(struct gfar_private *priv) | 943 | static void __gfar_detect_errata_83xx(struct gfar_private *priv) |
| 943 | { | 944 | { |
| 944 | struct device *dev = &priv->ofdev->dev; | ||
| 945 | unsigned int pvr = mfspr(SPRN_PVR); | 945 | unsigned int pvr = mfspr(SPRN_PVR); |
| 946 | unsigned int svr = mfspr(SPRN_SVR); | 946 | unsigned int svr = mfspr(SPRN_SVR); |
| 947 | unsigned int mod = (svr >> 16) & 0xfff6; /* w/o E suffix */ | 947 | unsigned int mod = (svr >> 16) & 0xfff6; /* w/o E suffix */ |
| @@ -957,15 +957,33 @@ static void gfar_detect_errata(struct gfar_private *priv) | |||
| 957 | (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0)) | 957 | (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0)) |
| 958 | priv->errata |= GFAR_ERRATA_76; | 958 | priv->errata |= GFAR_ERRATA_76; |
| 959 | 959 | ||
| 960 | /* MPC8313 and MPC837x all rev */ | 960 | /* MPC8313 Rev < 2.0 */ |
| 961 | if ((pvr == 0x80850010 && mod == 0x80b0) || | 961 | if (pvr == 0x80850010 && mod == 0x80b0 && rev < 0x0020) |
| 962 | (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0)) | 962 | priv->errata |= GFAR_ERRATA_12; |
| 963 | priv->errata |= GFAR_ERRATA_A002; | 963 | } |
| 964 | 964 | ||
| 965 | /* MPC8313 Rev < 2.0, MPC8548 rev 2.0 */ | 965 | static void __gfar_detect_errata_85xx(struct gfar_private *priv) |
| 966 | if ((pvr == 0x80850010 && mod == 0x80b0 && rev < 0x0020) || | 966 | { |
| 967 | (pvr == 0x80210020 && mod == 0x8030 && rev == 0x0020)) | 967 | unsigned int svr = mfspr(SPRN_SVR); |
| 968 | |||
| 969 | if ((SVR_SOC_VER(svr) == SVR_8548) && (SVR_REV(svr) == 0x20)) | ||
| 968 | priv->errata |= GFAR_ERRATA_12; | 970 | priv->errata |= GFAR_ERRATA_12; |
| 971 | if (((SVR_SOC_VER(svr) == SVR_P2020) && (SVR_REV(svr) < 0x20)) || | ||
| 972 | ((SVR_SOC_VER(svr) == SVR_P2010) && (SVR_REV(svr) < 0x20))) | ||
| 973 | priv->errata |= GFAR_ERRATA_76; /* aka eTSEC 20 */ | ||
| 974 | } | ||
| 975 | |||
| 976 | static void gfar_detect_errata(struct gfar_private *priv) | ||
| 977 | { | ||
| 978 | struct device *dev = &priv->ofdev->dev; | ||
| 979 | |||
| 980 | /* no plans to fix */ | ||
| 981 | priv->errata |= GFAR_ERRATA_A002; | ||
| 982 | |||
| 983 | if (pvr_version_is(PVR_VER_E500V1) || pvr_version_is(PVR_VER_E500V2)) | ||
| 984 | __gfar_detect_errata_85xx(priv); | ||
| 985 | else /* non-mpc85xx parts, i.e. e300 core based */ | ||
| 986 | __gfar_detect_errata_83xx(priv); | ||
| 969 | 987 | ||
| 970 | if (priv->errata) | 988 | if (priv->errata) |
| 971 | dev_info(dev, "enabled errata workarounds, flags: 0x%x\n", | 989 | dev_info(dev, "enabled errata workarounds, flags: 0x%x\n", |
| @@ -1599,7 +1617,7 @@ static int __gfar_is_rx_idle(struct gfar_private *priv) | |||
| 1599 | /* Normaly TSEC should not hang on GRS commands, so we should | 1617 | /* Normaly TSEC should not hang on GRS commands, so we should |
| 1600 | * actually wait for IEVENT_GRSC flag. | 1618 | * actually wait for IEVENT_GRSC flag. |
| 1601 | */ | 1619 | */ |
| 1602 | if (likely(!gfar_has_errata(priv, GFAR_ERRATA_A002))) | 1620 | if (!gfar_has_errata(priv, GFAR_ERRATA_A002)) |
| 1603 | return 0; | 1621 | return 0; |
| 1604 | 1622 | ||
| 1605 | /* Read the eTSEC register at offset 0xD1C. If bits 7-14 are | 1623 | /* Read the eTSEC register at offset 0xD1C. If bits 7-14 are |
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index 86d51429a189..151e00cad113 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c | |||
| @@ -2655,6 +2655,8 @@ static int igb_set_eee(struct net_device *netdev, | |||
| 2655 | (hw->phy.media_type != e1000_media_type_copper)) | 2655 | (hw->phy.media_type != e1000_media_type_copper)) |
| 2656 | return -EOPNOTSUPP; | 2656 | return -EOPNOTSUPP; |
| 2657 | 2657 | ||
| 2658 | memset(&eee_curr, 0, sizeof(struct ethtool_eee)); | ||
| 2659 | |||
| 2658 | ret_val = igb_get_eee(netdev, &eee_curr); | 2660 | ret_val = igb_get_eee(netdev, &eee_curr); |
| 2659 | if (ret_val) | 2661 | if (ret_val) |
| 2660 | return ret_val; | 2662 | return ret_val; |
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 7fb5677451f9..2c210ec35d59 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c | |||
| @@ -1131,15 +1131,13 @@ static void mib_counters_update(struct mv643xx_eth_private *mp) | |||
| 1131 | p->rx_discard += rdlp(mp, RX_DISCARD_FRAME_CNT); | 1131 | p->rx_discard += rdlp(mp, RX_DISCARD_FRAME_CNT); |
| 1132 | p->rx_overrun += rdlp(mp, RX_OVERRUN_FRAME_CNT); | 1132 | p->rx_overrun += rdlp(mp, RX_OVERRUN_FRAME_CNT); |
| 1133 | spin_unlock_bh(&mp->mib_counters_lock); | 1133 | spin_unlock_bh(&mp->mib_counters_lock); |
| 1134 | |||
| 1135 | mod_timer(&mp->mib_counters_timer, jiffies + 30 * HZ); | ||
| 1136 | } | 1134 | } |
| 1137 | 1135 | ||
| 1138 | static void mib_counters_timer_wrapper(unsigned long _mp) | 1136 | static void mib_counters_timer_wrapper(unsigned long _mp) |
| 1139 | { | 1137 | { |
| 1140 | struct mv643xx_eth_private *mp = (void *)_mp; | 1138 | struct mv643xx_eth_private *mp = (void *)_mp; |
| 1141 | |||
| 1142 | mib_counters_update(mp); | 1139 | mib_counters_update(mp); |
| 1140 | mod_timer(&mp->mib_counters_timer, jiffies + 30 * HZ); | ||
| 1143 | } | 1141 | } |
| 1144 | 1142 | ||
| 1145 | 1143 | ||
| @@ -2237,6 +2235,7 @@ static int mv643xx_eth_open(struct net_device *dev) | |||
| 2237 | mp->int_mask |= INT_TX_END_0 << i; | 2235 | mp->int_mask |= INT_TX_END_0 << i; |
| 2238 | } | 2236 | } |
| 2239 | 2237 | ||
| 2238 | add_timer(&mp->mib_counters_timer); | ||
| 2240 | port_start(mp); | 2239 | port_start(mp); |
| 2241 | 2240 | ||
| 2242 | wrlp(mp, INT_MASK_EXT, INT_EXT_LINK_PHY | INT_EXT_TX); | 2241 | wrlp(mp, INT_MASK_EXT, INT_EXT_LINK_PHY | INT_EXT_TX); |
| @@ -2534,6 +2533,7 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev, | |||
| 2534 | if (!ppdev) | 2533 | if (!ppdev) |
| 2535 | return -ENOMEM; | 2534 | return -ENOMEM; |
| 2536 | ppdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); | 2535 | ppdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); |
| 2536 | ppdev->dev.of_node = pnp; | ||
| 2537 | 2537 | ||
| 2538 | ret = platform_device_add_resources(ppdev, &res, 1); | 2538 | ret = platform_device_add_resources(ppdev, &res, 1); |
| 2539 | if (ret) | 2539 | if (ret) |
| @@ -2916,7 +2916,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev) | |||
| 2916 | mp->mib_counters_timer.data = (unsigned long)mp; | 2916 | mp->mib_counters_timer.data = (unsigned long)mp; |
| 2917 | mp->mib_counters_timer.function = mib_counters_timer_wrapper; | 2917 | mp->mib_counters_timer.function = mib_counters_timer_wrapper; |
| 2918 | mp->mib_counters_timer.expires = jiffies + 30 * HZ; | 2918 | mp->mib_counters_timer.expires = jiffies + 30 * HZ; |
| 2919 | add_timer(&mp->mib_counters_timer); | ||
| 2920 | 2919 | ||
| 2921 | spin_lock_init(&mp->mib_counters_lock); | 2920 | spin_lock_init(&mp->mib_counters_lock); |
| 2922 | 2921 | ||
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index dec455c8f627..afe2efa69c86 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c | |||
| @@ -70,14 +70,15 @@ static int mlx4_alloc_pages(struct mlx4_en_priv *priv, | |||
| 70 | put_page(page); | 70 | put_page(page); |
| 71 | return -ENOMEM; | 71 | return -ENOMEM; |
| 72 | } | 72 | } |
| 73 | page_alloc->size = PAGE_SIZE << order; | 73 | page_alloc->page_size = PAGE_SIZE << order; |
| 74 | page_alloc->page = page; | 74 | page_alloc->page = page; |
| 75 | page_alloc->dma = dma; | 75 | page_alloc->dma = dma; |
| 76 | page_alloc->offset = frag_info->frag_align; | 76 | page_alloc->page_offset = frag_info->frag_align; |
| 77 | /* Not doing get_page() for each frag is a big win | 77 | /* Not doing get_page() for each frag is a big win |
| 78 | * on asymetric workloads. | 78 | * on asymetric workloads. |
| 79 | */ | 79 | */ |
| 80 | atomic_set(&page->_count, page_alloc->size / frag_info->frag_stride); | 80 | atomic_set(&page->_count, |
| 81 | page_alloc->page_size / frag_info->frag_stride); | ||
| 81 | return 0; | 82 | return 0; |
| 82 | } | 83 | } |
| 83 | 84 | ||
| @@ -96,16 +97,19 @@ static int mlx4_en_alloc_frags(struct mlx4_en_priv *priv, | |||
| 96 | for (i = 0; i < priv->num_frags; i++) { | 97 | for (i = 0; i < priv->num_frags; i++) { |
| 97 | frag_info = &priv->frag_info[i]; | 98 | frag_info = &priv->frag_info[i]; |
| 98 | page_alloc[i] = ring_alloc[i]; | 99 | page_alloc[i] = ring_alloc[i]; |
| 99 | page_alloc[i].offset += frag_info->frag_stride; | 100 | page_alloc[i].page_offset += frag_info->frag_stride; |
| 100 | if (page_alloc[i].offset + frag_info->frag_stride <= ring_alloc[i].size) | 101 | |
| 102 | if (page_alloc[i].page_offset + frag_info->frag_stride <= | ||
| 103 | ring_alloc[i].page_size) | ||
| 101 | continue; | 104 | continue; |
| 105 | |||
| 102 | if (mlx4_alloc_pages(priv, &page_alloc[i], frag_info, gfp)) | 106 | if (mlx4_alloc_pages(priv, &page_alloc[i], frag_info, gfp)) |
| 103 | goto out; | 107 | goto out; |
| 104 | } | 108 | } |
| 105 | 109 | ||
| 106 | for (i = 0; i < priv->num_frags; i++) { | 110 | for (i = 0; i < priv->num_frags; i++) { |
| 107 | frags[i] = ring_alloc[i]; | 111 | frags[i] = ring_alloc[i]; |
| 108 | dma = ring_alloc[i].dma + ring_alloc[i].offset; | 112 | dma = ring_alloc[i].dma + ring_alloc[i].page_offset; |
| 109 | ring_alloc[i] = page_alloc[i]; | 113 | ring_alloc[i] = page_alloc[i]; |
| 110 | rx_desc->data[i].addr = cpu_to_be64(dma); | 114 | rx_desc->data[i].addr = cpu_to_be64(dma); |
| 111 | } | 115 | } |
| @@ -117,7 +121,7 @@ out: | |||
| 117 | frag_info = &priv->frag_info[i]; | 121 | frag_info = &priv->frag_info[i]; |
| 118 | if (page_alloc[i].page != ring_alloc[i].page) { | 122 | if (page_alloc[i].page != ring_alloc[i].page) { |
| 119 | dma_unmap_page(priv->ddev, page_alloc[i].dma, | 123 | dma_unmap_page(priv->ddev, page_alloc[i].dma, |
| 120 | page_alloc[i].size, PCI_DMA_FROMDEVICE); | 124 | page_alloc[i].page_size, PCI_DMA_FROMDEVICE); |
| 121 | page = page_alloc[i].page; | 125 | page = page_alloc[i].page; |
| 122 | atomic_set(&page->_count, 1); | 126 | atomic_set(&page->_count, 1); |
| 123 | put_page(page); | 127 | put_page(page); |
| @@ -131,10 +135,12 @@ static void mlx4_en_free_frag(struct mlx4_en_priv *priv, | |||
| 131 | int i) | 135 | int i) |
| 132 | { | 136 | { |
| 133 | const struct mlx4_en_frag_info *frag_info = &priv->frag_info[i]; | 137 | const struct mlx4_en_frag_info *frag_info = &priv->frag_info[i]; |
| 138 | u32 next_frag_end = frags[i].page_offset + 2 * frag_info->frag_stride; | ||
| 139 | |||
| 134 | 140 | ||
| 135 | if (frags[i].offset + frag_info->frag_stride > frags[i].size) | 141 | if (next_frag_end > frags[i].page_size) |
| 136 | dma_unmap_page(priv->ddev, frags[i].dma, frags[i].size, | 142 | dma_unmap_page(priv->ddev, frags[i].dma, frags[i].page_size, |
| 137 | PCI_DMA_FROMDEVICE); | 143 | PCI_DMA_FROMDEVICE); |
| 138 | 144 | ||
| 139 | if (frags[i].page) | 145 | if (frags[i].page) |
| 140 | put_page(frags[i].page); | 146 | put_page(frags[i].page); |
| @@ -161,7 +167,7 @@ out: | |||
| 161 | 167 | ||
| 162 | page_alloc = &ring->page_alloc[i]; | 168 | page_alloc = &ring->page_alloc[i]; |
| 163 | dma_unmap_page(priv->ddev, page_alloc->dma, | 169 | dma_unmap_page(priv->ddev, page_alloc->dma, |
| 164 | page_alloc->size, PCI_DMA_FROMDEVICE); | 170 | page_alloc->page_size, PCI_DMA_FROMDEVICE); |
| 165 | page = page_alloc->page; | 171 | page = page_alloc->page; |
| 166 | atomic_set(&page->_count, 1); | 172 | atomic_set(&page->_count, 1); |
| 167 | put_page(page); | 173 | put_page(page); |
| @@ -184,10 +190,11 @@ static void mlx4_en_destroy_allocator(struct mlx4_en_priv *priv, | |||
| 184 | i, page_count(page_alloc->page)); | 190 | i, page_count(page_alloc->page)); |
| 185 | 191 | ||
| 186 | dma_unmap_page(priv->ddev, page_alloc->dma, | 192 | dma_unmap_page(priv->ddev, page_alloc->dma, |
| 187 | page_alloc->size, PCI_DMA_FROMDEVICE); | 193 | page_alloc->page_size, PCI_DMA_FROMDEVICE); |
| 188 | while (page_alloc->offset + frag_info->frag_stride < page_alloc->size) { | 194 | while (page_alloc->page_offset + frag_info->frag_stride < |
| 195 | page_alloc->page_size) { | ||
| 189 | put_page(page_alloc->page); | 196 | put_page(page_alloc->page); |
| 190 | page_alloc->offset += frag_info->frag_stride; | 197 | page_alloc->page_offset += frag_info->frag_stride; |
| 191 | } | 198 | } |
| 192 | page_alloc->page = NULL; | 199 | page_alloc->page = NULL; |
| 193 | } | 200 | } |
| @@ -478,7 +485,7 @@ static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv, | |||
| 478 | /* Save page reference in skb */ | 485 | /* Save page reference in skb */ |
| 479 | __skb_frag_set_page(&skb_frags_rx[nr], frags[nr].page); | 486 | __skb_frag_set_page(&skb_frags_rx[nr], frags[nr].page); |
| 480 | skb_frag_size_set(&skb_frags_rx[nr], frag_info->frag_size); | 487 | skb_frag_size_set(&skb_frags_rx[nr], frag_info->frag_size); |
| 481 | skb_frags_rx[nr].page_offset = frags[nr].offset; | 488 | skb_frags_rx[nr].page_offset = frags[nr].page_offset; |
| 482 | skb->truesize += frag_info->frag_stride; | 489 | skb->truesize += frag_info->frag_stride; |
| 483 | frags[nr].page = NULL; | 490 | frags[nr].page = NULL; |
| 484 | } | 491 | } |
| @@ -517,7 +524,7 @@ static struct sk_buff *mlx4_en_rx_skb(struct mlx4_en_priv *priv, | |||
| 517 | 524 | ||
| 518 | /* Get pointer to first fragment so we could copy the headers into the | 525 | /* Get pointer to first fragment so we could copy the headers into the |
| 519 | * (linear part of the) skb */ | 526 | * (linear part of the) skb */ |
| 520 | va = page_address(frags[0].page) + frags[0].offset; | 527 | va = page_address(frags[0].page) + frags[0].page_offset; |
| 521 | 528 | ||
| 522 | if (length <= SMALL_PACKET_SIZE) { | 529 | if (length <= SMALL_PACKET_SIZE) { |
| 523 | /* We are copying all relevant data to the skb - temporarily | 530 | /* We are copying all relevant data to the skb - temporarily |
| @@ -645,7 +652,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud | |||
| 645 | dma_sync_single_for_cpu(priv->ddev, dma, sizeof(*ethh), | 652 | dma_sync_single_for_cpu(priv->ddev, dma, sizeof(*ethh), |
| 646 | DMA_FROM_DEVICE); | 653 | DMA_FROM_DEVICE); |
| 647 | ethh = (struct ethhdr *)(page_address(frags[0].page) + | 654 | ethh = (struct ethhdr *)(page_address(frags[0].page) + |
| 648 | frags[0].offset); | 655 | frags[0].page_offset); |
| 649 | 656 | ||
| 650 | if (is_multicast_ether_addr(ethh->h_dest)) { | 657 | if (is_multicast_ether_addr(ethh->h_dest)) { |
| 651 | struct mlx4_mac_entry *entry; | 658 | struct mlx4_mac_entry *entry; |
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h index 5e0aa569306a..bf06e3610d27 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | |||
| @@ -237,8 +237,8 @@ struct mlx4_en_tx_desc { | |||
| 237 | struct mlx4_en_rx_alloc { | 237 | struct mlx4_en_rx_alloc { |
| 238 | struct page *page; | 238 | struct page *page; |
| 239 | dma_addr_t dma; | 239 | dma_addr_t dma; |
| 240 | u32 offset; | 240 | u32 page_offset; |
| 241 | u32 size; | 241 | u32 page_size; |
| 242 | }; | 242 | }; |
| 243 | 243 | ||
| 244 | struct mlx4_en_tx_ring { | 244 | struct mlx4_en_tx_ring { |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c index 5472cbd34028..6ca30739625f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c | |||
| @@ -180,28 +180,32 @@ static int verify_block_sig(struct mlx5_cmd_prot_block *block) | |||
| 180 | return 0; | 180 | return 0; |
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | static void calc_block_sig(struct mlx5_cmd_prot_block *block, u8 token) | 183 | static void calc_block_sig(struct mlx5_cmd_prot_block *block, u8 token, |
| 184 | int csum) | ||
| 184 | { | 185 | { |
| 185 | block->token = token; | 186 | block->token = token; |
| 186 | block->ctrl_sig = ~xor8_buf(block->rsvd0, sizeof(*block) - sizeof(block->data) - 2); | 187 | if (csum) { |
| 187 | block->sig = ~xor8_buf(block, sizeof(*block) - 1); | 188 | block->ctrl_sig = ~xor8_buf(block->rsvd0, sizeof(*block) - |
| 189 | sizeof(block->data) - 2); | ||
| 190 | block->sig = ~xor8_buf(block, sizeof(*block) - 1); | ||
| 191 | } | ||
| 188 | } | 192 | } |
| 189 | 193 | ||
| 190 | static void calc_chain_sig(struct mlx5_cmd_msg *msg, u8 token) | 194 | static void calc_chain_sig(struct mlx5_cmd_msg *msg, u8 token, int csum) |
| 191 | { | 195 | { |
| 192 | struct mlx5_cmd_mailbox *next = msg->next; | 196 | struct mlx5_cmd_mailbox *next = msg->next; |
| 193 | 197 | ||
| 194 | while (next) { | 198 | while (next) { |
| 195 | calc_block_sig(next->buf, token); | 199 | calc_block_sig(next->buf, token, csum); |
| 196 | next = next->next; | 200 | next = next->next; |
| 197 | } | 201 | } |
| 198 | } | 202 | } |
| 199 | 203 | ||
| 200 | static void set_signature(struct mlx5_cmd_work_ent *ent) | 204 | static void set_signature(struct mlx5_cmd_work_ent *ent, int csum) |
| 201 | { | 205 | { |
| 202 | ent->lay->sig = ~xor8_buf(ent->lay, sizeof(*ent->lay)); | 206 | ent->lay->sig = ~xor8_buf(ent->lay, sizeof(*ent->lay)); |
| 203 | calc_chain_sig(ent->in, ent->token); | 207 | calc_chain_sig(ent->in, ent->token, csum); |
| 204 | calc_chain_sig(ent->out, ent->token); | 208 | calc_chain_sig(ent->out, ent->token, csum); |
| 205 | } | 209 | } |
| 206 | 210 | ||
| 207 | static void poll_timeout(struct mlx5_cmd_work_ent *ent) | 211 | static void poll_timeout(struct mlx5_cmd_work_ent *ent) |
| @@ -539,8 +543,7 @@ static void cmd_work_handler(struct work_struct *work) | |||
| 539 | lay->type = MLX5_PCI_CMD_XPORT; | 543 | lay->type = MLX5_PCI_CMD_XPORT; |
| 540 | lay->token = ent->token; | 544 | lay->token = ent->token; |
| 541 | lay->status_own = CMD_OWNER_HW; | 545 | lay->status_own = CMD_OWNER_HW; |
| 542 | if (!cmd->checksum_disabled) | 546 | set_signature(ent, !cmd->checksum_disabled); |
| 543 | set_signature(ent); | ||
| 544 | dump_command(dev, ent, 1); | 547 | dump_command(dev, ent, 1); |
| 545 | ktime_get_ts(&ent->ts1); | 548 | ktime_get_ts(&ent->ts1); |
| 546 | 549 | ||
| @@ -773,8 +776,6 @@ static int mlx5_copy_from_msg(void *to, struct mlx5_cmd_msg *from, int size) | |||
| 773 | 776 | ||
| 774 | copy = min_t(int, size, MLX5_CMD_DATA_BLOCK_SIZE); | 777 | copy = min_t(int, size, MLX5_CMD_DATA_BLOCK_SIZE); |
| 775 | block = next->buf; | 778 | block = next->buf; |
| 776 | if (xor8_buf(block, sizeof(*block)) != 0xff) | ||
| 777 | return -EINVAL; | ||
| 778 | 779 | ||
| 779 | memcpy(to, block->data, copy); | 780 | memcpy(to, block->data, copy); |
| 780 | to += copy; | 781 | to += copy; |
| @@ -1361,6 +1362,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) | |||
| 1361 | goto err_map; | 1362 | goto err_map; |
| 1362 | } | 1363 | } |
| 1363 | 1364 | ||
| 1365 | cmd->checksum_disabled = 1; | ||
| 1364 | cmd->max_reg_cmds = (1 << cmd->log_sz) - 1; | 1366 | cmd->max_reg_cmds = (1 << cmd->log_sz) - 1; |
| 1365 | cmd->bitmask = (1 << cmd->max_reg_cmds) - 1; | 1367 | cmd->bitmask = (1 << cmd->max_reg_cmds) - 1; |
| 1366 | 1368 | ||
| @@ -1510,7 +1512,7 @@ int mlx5_cmd_status_to_err(struct mlx5_outbox_hdr *hdr) | |||
| 1510 | case MLX5_CMD_STAT_BAD_SYS_STATE_ERR: return -EIO; | 1512 | case MLX5_CMD_STAT_BAD_SYS_STATE_ERR: return -EIO; |
| 1511 | case MLX5_CMD_STAT_BAD_RES_ERR: return -EINVAL; | 1513 | case MLX5_CMD_STAT_BAD_RES_ERR: return -EINVAL; |
| 1512 | case MLX5_CMD_STAT_RES_BUSY: return -EBUSY; | 1514 | case MLX5_CMD_STAT_RES_BUSY: return -EBUSY; |
| 1513 | case MLX5_CMD_STAT_LIM_ERR: return -EINVAL; | 1515 | case MLX5_CMD_STAT_LIM_ERR: return -ENOMEM; |
| 1514 | case MLX5_CMD_STAT_BAD_RES_STATE_ERR: return -EINVAL; | 1516 | case MLX5_CMD_STAT_BAD_RES_STATE_ERR: return -EINVAL; |
| 1515 | case MLX5_CMD_STAT_IX_ERR: return -EINVAL; | 1517 | case MLX5_CMD_STAT_IX_ERR: return -EINVAL; |
| 1516 | case MLX5_CMD_STAT_NO_RES_ERR: return -EAGAIN; | 1518 | case MLX5_CMD_STAT_NO_RES_ERR: return -EAGAIN; |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c index 443cc4d7b024..2231d93cc7ad 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c | |||
| @@ -366,9 +366,11 @@ int mlx5_create_map_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq, u8 vecidx, | |||
| 366 | goto err_in; | 366 | goto err_in; |
| 367 | } | 367 | } |
| 368 | 368 | ||
| 369 | snprintf(eq->name, MLX5_MAX_EQ_NAME, "%s@pci:%s", | ||
| 370 | name, pci_name(dev->pdev)); | ||
| 369 | eq->eqn = out.eq_number; | 371 | eq->eqn = out.eq_number; |
| 370 | err = request_irq(table->msix_arr[vecidx].vector, mlx5_msix_handler, 0, | 372 | err = request_irq(table->msix_arr[vecidx].vector, mlx5_msix_handler, 0, |
| 371 | name, eq); | 373 | eq->name, eq); |
| 372 | if (err) | 374 | if (err) |
| 373 | goto err_eq; | 375 | goto err_eq; |
| 374 | 376 | ||
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index b47739b0b5f6..bc0f5fb66e24 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c | |||
| @@ -165,9 +165,7 @@ static int handle_hca_cap(struct mlx5_core_dev *dev) | |||
| 165 | struct mlx5_cmd_set_hca_cap_mbox_in *set_ctx = NULL; | 165 | struct mlx5_cmd_set_hca_cap_mbox_in *set_ctx = NULL; |
| 166 | struct mlx5_cmd_query_hca_cap_mbox_in query_ctx; | 166 | struct mlx5_cmd_query_hca_cap_mbox_in query_ctx; |
| 167 | struct mlx5_cmd_set_hca_cap_mbox_out set_out; | 167 | struct mlx5_cmd_set_hca_cap_mbox_out set_out; |
| 168 | struct mlx5_profile *prof = dev->profile; | ||
| 169 | u64 flags; | 168 | u64 flags; |
| 170 | int csum = 1; | ||
| 171 | int err; | 169 | int err; |
| 172 | 170 | ||
| 173 | memset(&query_ctx, 0, sizeof(query_ctx)); | 171 | memset(&query_ctx, 0, sizeof(query_ctx)); |
| @@ -197,20 +195,14 @@ static int handle_hca_cap(struct mlx5_core_dev *dev) | |||
| 197 | memcpy(&set_ctx->hca_cap, &query_out->hca_cap, | 195 | memcpy(&set_ctx->hca_cap, &query_out->hca_cap, |
| 198 | sizeof(set_ctx->hca_cap)); | 196 | sizeof(set_ctx->hca_cap)); |
| 199 | 197 | ||
| 200 | if (prof->mask & MLX5_PROF_MASK_CMDIF_CSUM) { | ||
| 201 | csum = !!prof->cmdif_csum; | ||
| 202 | flags = be64_to_cpu(set_ctx->hca_cap.flags); | ||
| 203 | if (csum) | ||
| 204 | flags |= MLX5_DEV_CAP_FLAG_CMDIF_CSUM; | ||
| 205 | else | ||
| 206 | flags &= ~MLX5_DEV_CAP_FLAG_CMDIF_CSUM; | ||
| 207 | |||
| 208 | set_ctx->hca_cap.flags = cpu_to_be64(flags); | ||
| 209 | } | ||
| 210 | |||
| 211 | if (dev->profile->mask & MLX5_PROF_MASK_QP_SIZE) | 198 | if (dev->profile->mask & MLX5_PROF_MASK_QP_SIZE) |
| 212 | set_ctx->hca_cap.log_max_qp = dev->profile->log_max_qp; | 199 | set_ctx->hca_cap.log_max_qp = dev->profile->log_max_qp; |
| 213 | 200 | ||
| 201 | flags = be64_to_cpu(query_out->hca_cap.flags); | ||
| 202 | /* disable checksum */ | ||
| 203 | flags &= ~MLX5_DEV_CAP_FLAG_CMDIF_CSUM; | ||
| 204 | |||
| 205 | set_ctx->hca_cap.flags = cpu_to_be64(flags); | ||
| 214 | memset(&set_out, 0, sizeof(set_out)); | 206 | memset(&set_out, 0, sizeof(set_out)); |
| 215 | set_ctx->hca_cap.log_uar_page_sz = cpu_to_be16(PAGE_SHIFT - 12); | 207 | set_ctx->hca_cap.log_uar_page_sz = cpu_to_be16(PAGE_SHIFT - 12); |
| 216 | set_ctx->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_SET_HCA_CAP); | 208 | set_ctx->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_SET_HCA_CAP); |
| @@ -225,9 +217,6 @@ static int handle_hca_cap(struct mlx5_core_dev *dev) | |||
| 225 | if (err) | 217 | if (err) |
| 226 | goto query_ex; | 218 | goto query_ex; |
| 227 | 219 | ||
| 228 | if (!csum) | ||
| 229 | dev->cmd.checksum_disabled = 1; | ||
| 230 | |||
| 231 | query_ex: | 220 | query_ex: |
| 232 | kfree(query_out); | 221 | kfree(query_out); |
| 233 | kfree(set_ctx); | 222 | kfree(set_ctx); |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c index 3a2408d44820..7b12acf210f8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | |||
| @@ -90,6 +90,10 @@ struct mlx5_manage_pages_outbox { | |||
| 90 | __be64 pas[0]; | 90 | __be64 pas[0]; |
| 91 | }; | 91 | }; |
| 92 | 92 | ||
| 93 | enum { | ||
| 94 | MAX_RECLAIM_TIME_MSECS = 5000, | ||
| 95 | }; | ||
| 96 | |||
| 93 | static int insert_page(struct mlx5_core_dev *dev, u64 addr, struct page *page, u16 func_id) | 97 | static int insert_page(struct mlx5_core_dev *dev, u64 addr, struct page *page, u16 func_id) |
| 94 | { | 98 | { |
| 95 | struct rb_root *root = &dev->priv.page_root; | 99 | struct rb_root *root = &dev->priv.page_root; |
| @@ -279,6 +283,9 @@ static int reclaim_pages(struct mlx5_core_dev *dev, u32 func_id, int npages, | |||
| 279 | int err; | 283 | int err; |
| 280 | int i; | 284 | int i; |
| 281 | 285 | ||
| 286 | if (nclaimed) | ||
| 287 | *nclaimed = 0; | ||
| 288 | |||
| 282 | memset(&in, 0, sizeof(in)); | 289 | memset(&in, 0, sizeof(in)); |
| 283 | outlen = sizeof(*out) + npages * sizeof(out->pas[0]); | 290 | outlen = sizeof(*out) + npages * sizeof(out->pas[0]); |
| 284 | out = mlx5_vzalloc(outlen); | 291 | out = mlx5_vzalloc(outlen); |
| @@ -388,20 +395,25 @@ static int optimal_reclaimed_pages(void) | |||
| 388 | 395 | ||
| 389 | int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev) | 396 | int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev) |
| 390 | { | 397 | { |
| 391 | unsigned long end = jiffies + msecs_to_jiffies(5000); | 398 | unsigned long end = jiffies + msecs_to_jiffies(MAX_RECLAIM_TIME_MSECS); |
| 392 | struct fw_page *fwp; | 399 | struct fw_page *fwp; |
| 393 | struct rb_node *p; | 400 | struct rb_node *p; |
| 401 | int nclaimed = 0; | ||
| 394 | int err; | 402 | int err; |
| 395 | 403 | ||
| 396 | do { | 404 | do { |
| 397 | p = rb_first(&dev->priv.page_root); | 405 | p = rb_first(&dev->priv.page_root); |
| 398 | if (p) { | 406 | if (p) { |
| 399 | fwp = rb_entry(p, struct fw_page, rb_node); | 407 | fwp = rb_entry(p, struct fw_page, rb_node); |
| 400 | err = reclaim_pages(dev, fwp->func_id, optimal_reclaimed_pages(), NULL); | 408 | err = reclaim_pages(dev, fwp->func_id, |
| 409 | optimal_reclaimed_pages(), | ||
| 410 | &nclaimed); | ||
| 401 | if (err) { | 411 | if (err) { |
| 402 | mlx5_core_warn(dev, "failed reclaiming pages (%d)\n", err); | 412 | mlx5_core_warn(dev, "failed reclaiming pages (%d)\n", err); |
| 403 | return err; | 413 | return err; |
| 404 | } | 414 | } |
| 415 | if (nclaimed) | ||
| 416 | end = jiffies + msecs_to_jiffies(MAX_RECLAIM_TIME_MSECS); | ||
| 405 | } | 417 | } |
| 406 | if (time_after(jiffies, end)) { | 418 | if (time_after(jiffies, end)) { |
| 407 | mlx5_core_warn(dev, "FW did not return all pages. giving up...\n"); | 419 | mlx5_core_warn(dev, "FW did not return all pages. giving up...\n"); |
diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index bd1a2d2bc2ae..ea54d95e5b9f 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c | |||
| @@ -448,7 +448,8 @@ static int moxart_mac_probe(struct platform_device *pdev) | |||
| 448 | irq = irq_of_parse_and_map(node, 0); | 448 | irq = irq_of_parse_and_map(node, 0); |
| 449 | if (irq <= 0) { | 449 | if (irq <= 0) { |
| 450 | netdev_err(ndev, "irq_of_parse_and_map failed\n"); | 450 | netdev_err(ndev, "irq_of_parse_and_map failed\n"); |
| 451 | return -EINVAL; | 451 | ret = -EINVAL; |
| 452 | goto irq_map_fail; | ||
| 452 | } | 453 | } |
| 453 | 454 | ||
| 454 | priv = netdev_priv(ndev); | 455 | priv = netdev_priv(ndev); |
| @@ -472,24 +473,32 @@ static int moxart_mac_probe(struct platform_device *pdev) | |||
| 472 | priv->tx_desc_base = dma_alloc_coherent(NULL, TX_REG_DESC_SIZE * | 473 | priv->tx_desc_base = dma_alloc_coherent(NULL, TX_REG_DESC_SIZE * |
| 473 | TX_DESC_NUM, &priv->tx_base, | 474 | TX_DESC_NUM, &priv->tx_base, |
| 474 | GFP_DMA | GFP_KERNEL); | 475 | GFP_DMA | GFP_KERNEL); |
| 475 | if (priv->tx_desc_base == NULL) | 476 | if (priv->tx_desc_base == NULL) { |
| 477 | ret = -ENOMEM; | ||
| 476 | goto init_fail; | 478 | goto init_fail; |
| 479 | } | ||
| 477 | 480 | ||
| 478 | priv->rx_desc_base = dma_alloc_coherent(NULL, RX_REG_DESC_SIZE * | 481 | priv->rx_desc_base = dma_alloc_coherent(NULL, RX_REG_DESC_SIZE * |
| 479 | RX_DESC_NUM, &priv->rx_base, | 482 | RX_DESC_NUM, &priv->rx_base, |
| 480 | GFP_DMA | GFP_KERNEL); | 483 | GFP_DMA | GFP_KERNEL); |
| 481 | if (priv->rx_desc_base == NULL) | 484 | if (priv->rx_desc_base == NULL) { |
| 485 | ret = -ENOMEM; | ||
| 482 | goto init_fail; | 486 | goto init_fail; |
| 487 | } | ||
| 483 | 488 | ||
| 484 | priv->tx_buf_base = kmalloc(priv->tx_buf_size * TX_DESC_NUM, | 489 | priv->tx_buf_base = kmalloc(priv->tx_buf_size * TX_DESC_NUM, |
| 485 | GFP_ATOMIC); | 490 | GFP_ATOMIC); |
| 486 | if (!priv->tx_buf_base) | 491 | if (!priv->tx_buf_base) { |
| 492 | ret = -ENOMEM; | ||
| 487 | goto init_fail; | 493 | goto init_fail; |
| 494 | } | ||
| 488 | 495 | ||
| 489 | priv->rx_buf_base = kmalloc(priv->rx_buf_size * RX_DESC_NUM, | 496 | priv->rx_buf_base = kmalloc(priv->rx_buf_size * RX_DESC_NUM, |
| 490 | GFP_ATOMIC); | 497 | GFP_ATOMIC); |
| 491 | if (!priv->rx_buf_base) | 498 | if (!priv->rx_buf_base) { |
| 499 | ret = -ENOMEM; | ||
| 492 | goto init_fail; | 500 | goto init_fail; |
| 501 | } | ||
| 493 | 502 | ||
| 494 | platform_set_drvdata(pdev, ndev); | 503 | platform_set_drvdata(pdev, ndev); |
| 495 | 504 | ||
| @@ -522,7 +531,8 @@ static int moxart_mac_probe(struct platform_device *pdev) | |||
| 522 | init_fail: | 531 | init_fail: |
| 523 | netdev_err(ndev, "init failed\n"); | 532 | netdev_err(ndev, "init failed\n"); |
| 524 | moxart_mac_free_memory(ndev); | 533 | moxart_mac_free_memory(ndev); |
| 525 | 534 | irq_map_fail: | |
| 535 | free_netdev(ndev); | ||
| 526 | return ret; | 536 | return ret; |
| 527 | } | 537 | } |
| 528 | 538 | ||
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c index ebe4c86e5230..ff83a9fcd4c5 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | |||
| @@ -665,7 +665,7 @@ static int qlcnic_set_channels(struct net_device *dev, | |||
| 665 | return err; | 665 | return err; |
| 666 | } | 666 | } |
| 667 | 667 | ||
| 668 | if (channel->tx_count) { | 668 | if (qlcnic_82xx_check(adapter) && channel->tx_count) { |
| 669 | err = qlcnic_validate_max_tx_rings(adapter, channel->tx_count); | 669 | err = qlcnic_validate_max_tx_rings(adapter, channel->tx_count); |
| 670 | if (err) | 670 | if (err) |
| 671 | return err; | 671 | return err; |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 21d00a0449a1..9e61eb867452 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
| @@ -2257,7 +2257,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 2257 | 2257 | ||
| 2258 | err = qlcnic_alloc_adapter_resources(adapter); | 2258 | err = qlcnic_alloc_adapter_resources(adapter); |
| 2259 | if (err) | 2259 | if (err) |
| 2260 | goto err_out_free_netdev; | 2260 | goto err_out_free_wq; |
| 2261 | 2261 | ||
| 2262 | adapter->dev_rst_time = jiffies; | 2262 | adapter->dev_rst_time = jiffies; |
| 2263 | adapter->ahw->revision_id = pdev->revision; | 2263 | adapter->ahw->revision_id = pdev->revision; |
| @@ -2396,6 +2396,9 @@ err_out_disable_msi: | |||
| 2396 | err_out_free_hw: | 2396 | err_out_free_hw: |
| 2397 | qlcnic_free_adapter_resources(adapter); | 2397 | qlcnic_free_adapter_resources(adapter); |
| 2398 | 2398 | ||
| 2399 | err_out_free_wq: | ||
| 2400 | destroy_workqueue(adapter->qlcnic_wq); | ||
| 2401 | |||
| 2399 | err_out_free_netdev: | 2402 | err_out_free_netdev: |
| 2400 | free_netdev(netdev); | 2403 | free_netdev(netdev); |
| 2401 | 2404 | ||
| @@ -3648,11 +3651,6 @@ int qlcnic_validate_max_tx_rings(struct qlcnic_adapter *adapter, u32 txq) | |||
| 3648 | u8 max_hw = QLCNIC_MAX_TX_RINGS; | 3651 | u8 max_hw = QLCNIC_MAX_TX_RINGS; |
| 3649 | u32 max_allowed; | 3652 | u32 max_allowed; |
| 3650 | 3653 | ||
| 3651 | if (!qlcnic_82xx_check(adapter)) { | ||
| 3652 | netdev_err(netdev, "No Multi TX-Q support\n"); | ||
| 3653 | return -EINVAL; | ||
| 3654 | } | ||
| 3655 | |||
| 3656 | if (!qlcnic_use_msi_x && !qlcnic_use_msi) { | 3654 | if (!qlcnic_use_msi_x && !qlcnic_use_msi) { |
| 3657 | netdev_err(netdev, "No Multi TX-Q support in INT-x mode\n"); | 3655 | netdev_err(netdev, "No Multi TX-Q support in INT-x mode\n"); |
| 3658 | return -EINVAL; | 3656 | return -EINVAL; |
| @@ -3692,8 +3690,7 @@ int qlcnic_validate_max_rss(struct qlcnic_adapter *adapter, | |||
| 3692 | u8 max_hw = adapter->ahw->max_rx_ques; | 3690 | u8 max_hw = adapter->ahw->max_rx_ques; |
| 3693 | u32 max_allowed; | 3691 | u32 max_allowed; |
| 3694 | 3692 | ||
| 3695 | if (qlcnic_82xx_check(adapter) && !qlcnic_use_msi_x && | 3693 | if (!qlcnic_use_msi_x && !qlcnic_use_msi) { |
| 3696 | !qlcnic_use_msi) { | ||
| 3697 | netdev_err(netdev, "No RSS support in INT-x mode\n"); | 3694 | netdev_err(netdev, "No RSS support in INT-x mode\n"); |
| 3698 | return -EINVAL; | 3695 | return -EINVAL; |
| 3699 | } | 3696 | } |
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 5cd831ebfa83..b57c278d3b46 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c | |||
| @@ -688,12 +688,16 @@ static struct sh_eth_cpu_data r8a7740_data = { | |||
| 688 | .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | | 688 | .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | |
| 689 | EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE | | 689 | EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE | |
| 690 | EESR_TDE | EESR_ECI, | 690 | EESR_TDE | EESR_ECI, |
| 691 | .fdr_value = 0x0000070f, | ||
| 692 | .rmcr_value = 0x00000001, | ||
| 691 | 693 | ||
| 692 | .apr = 1, | 694 | .apr = 1, |
| 693 | .mpr = 1, | 695 | .mpr = 1, |
| 694 | .tpauser = 1, | 696 | .tpauser = 1, |
| 695 | .bculr = 1, | 697 | .bculr = 1, |
| 696 | .hw_swap = 1, | 698 | .hw_swap = 1, |
| 699 | .rpadir = 1, | ||
| 700 | .rpadir_value = 2 << 16, | ||
| 697 | .no_trimd = 1, | 701 | .no_trimd = 1, |
| 698 | .no_ade = 1, | 702 | .no_ade = 1, |
| 699 | .tsu = 1, | 703 | .tsu = 1, |
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c index 9f18ae984f9e..21f9ad6392e9 100644 --- a/drivers/net/ethernet/sfc/ef10.c +++ b/drivers/net/ethernet/sfc/ef10.c | |||
| @@ -444,6 +444,18 @@ static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = { | |||
| 444 | EF10_DMA_STAT(rx_align_error, RX_ALIGN_ERROR_PKTS), | 444 | EF10_DMA_STAT(rx_align_error, RX_ALIGN_ERROR_PKTS), |
| 445 | EF10_DMA_STAT(rx_length_error, RX_LENGTH_ERROR_PKTS), | 445 | EF10_DMA_STAT(rx_length_error, RX_LENGTH_ERROR_PKTS), |
| 446 | EF10_DMA_STAT(rx_nodesc_drops, RX_NODESC_DROPS), | 446 | EF10_DMA_STAT(rx_nodesc_drops, RX_NODESC_DROPS), |
| 447 | EF10_DMA_STAT(rx_pm_trunc_bb_overflow, PM_TRUNC_BB_OVERFLOW), | ||
| 448 | EF10_DMA_STAT(rx_pm_discard_bb_overflow, PM_DISCARD_BB_OVERFLOW), | ||
| 449 | EF10_DMA_STAT(rx_pm_trunc_vfifo_full, PM_TRUNC_VFIFO_FULL), | ||
| 450 | EF10_DMA_STAT(rx_pm_discard_vfifo_full, PM_DISCARD_VFIFO_FULL), | ||
| 451 | EF10_DMA_STAT(rx_pm_trunc_qbb, PM_TRUNC_QBB), | ||
| 452 | EF10_DMA_STAT(rx_pm_discard_qbb, PM_DISCARD_QBB), | ||
| 453 | EF10_DMA_STAT(rx_pm_discard_mapping, PM_DISCARD_MAPPING), | ||
| 454 | EF10_DMA_STAT(rx_dp_q_disabled_packets, RXDP_Q_DISABLED_PKTS), | ||
| 455 | EF10_DMA_STAT(rx_dp_di_dropped_packets, RXDP_DI_DROPPED_PKTS), | ||
| 456 | EF10_DMA_STAT(rx_dp_streaming_packets, RXDP_STREAMING_PKTS), | ||
| 457 | EF10_DMA_STAT(rx_dp_emerg_fetch, RXDP_EMERGENCY_FETCH_CONDITIONS), | ||
| 458 | EF10_DMA_STAT(rx_dp_emerg_wait, RXDP_EMERGENCY_WAIT_CONDITIONS), | ||
| 447 | }; | 459 | }; |
| 448 | 460 | ||
| 449 | #define HUNT_COMMON_STAT_MASK ((1ULL << EF10_STAT_tx_bytes) | \ | 461 | #define HUNT_COMMON_STAT_MASK ((1ULL << EF10_STAT_tx_bytes) | \ |
| @@ -498,44 +510,72 @@ static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = { | |||
| 498 | #define HUNT_40G_EXTRA_STAT_MASK ((1ULL << EF10_STAT_rx_align_error) | \ | 510 | #define HUNT_40G_EXTRA_STAT_MASK ((1ULL << EF10_STAT_rx_align_error) | \ |
| 499 | (1ULL << EF10_STAT_rx_length_error)) | 511 | (1ULL << EF10_STAT_rx_length_error)) |
| 500 | 512 | ||
| 501 | #if BITS_PER_LONG == 64 | 513 | /* These statistics are only provided if the firmware supports the |
| 502 | #define STAT_MASK_BITMAP(bits) (bits) | 514 | * capability PM_AND_RXDP_COUNTERS. |
| 503 | #else | 515 | */ |
| 504 | #define STAT_MASK_BITMAP(bits) (bits) & 0xffffffff, (bits) >> 32 | 516 | #define HUNT_PM_AND_RXDP_STAT_MASK ( \ |
| 505 | #endif | 517 | (1ULL << EF10_STAT_rx_pm_trunc_bb_overflow) | \ |
| 506 | 518 | (1ULL << EF10_STAT_rx_pm_discard_bb_overflow) | \ | |
| 507 | static const unsigned long *efx_ef10_stat_mask(struct efx_nic *efx) | 519 | (1ULL << EF10_STAT_rx_pm_trunc_vfifo_full) | \ |
| 508 | { | 520 | (1ULL << EF10_STAT_rx_pm_discard_vfifo_full) | \ |
| 509 | static const unsigned long hunt_40g_stat_mask[] = { | 521 | (1ULL << EF10_STAT_rx_pm_trunc_qbb) | \ |
| 510 | STAT_MASK_BITMAP(HUNT_COMMON_STAT_MASK | | 522 | (1ULL << EF10_STAT_rx_pm_discard_qbb) | \ |
| 511 | HUNT_40G_EXTRA_STAT_MASK) | 523 | (1ULL << EF10_STAT_rx_pm_discard_mapping) | \ |
| 512 | }; | 524 | (1ULL << EF10_STAT_rx_dp_q_disabled_packets) | \ |
| 513 | static const unsigned long hunt_10g_only_stat_mask[] = { | 525 | (1ULL << EF10_STAT_rx_dp_di_dropped_packets) | \ |
| 514 | STAT_MASK_BITMAP(HUNT_COMMON_STAT_MASK | | 526 | (1ULL << EF10_STAT_rx_dp_streaming_packets) | \ |
| 515 | HUNT_10G_ONLY_STAT_MASK) | 527 | (1ULL << EF10_STAT_rx_dp_emerg_fetch) | \ |
| 516 | }; | 528 | (1ULL << EF10_STAT_rx_dp_emerg_wait)) |
| 529 | |||
| 530 | static u64 efx_ef10_raw_stat_mask(struct efx_nic *efx) | ||
| 531 | { | ||
| 532 | u64 raw_mask = HUNT_COMMON_STAT_MASK; | ||
| 517 | u32 port_caps = efx_mcdi_phy_get_caps(efx); | 533 | u32 port_caps = efx_mcdi_phy_get_caps(efx); |
| 534 | struct efx_ef10_nic_data *nic_data = efx->nic_data; | ||
| 518 | 535 | ||
| 519 | if (port_caps & (1 << MC_CMD_PHY_CAP_40000FDX_LBN)) | 536 | if (port_caps & (1 << MC_CMD_PHY_CAP_40000FDX_LBN)) |
| 520 | return hunt_40g_stat_mask; | 537 | raw_mask |= HUNT_40G_EXTRA_STAT_MASK; |
| 521 | else | 538 | else |
| 522 | return hunt_10g_only_stat_mask; | 539 | raw_mask |= HUNT_10G_ONLY_STAT_MASK; |
| 540 | |||
| 541 | if (nic_data->datapath_caps & | ||
| 542 | (1 << MC_CMD_GET_CAPABILITIES_OUT_PM_AND_RXDP_COUNTERS_LBN)) | ||
| 543 | raw_mask |= HUNT_PM_AND_RXDP_STAT_MASK; | ||
| 544 | |||
| 545 | return raw_mask; | ||
| 546 | } | ||
| 547 | |||
| 548 | static void efx_ef10_get_stat_mask(struct efx_nic *efx, unsigned long *mask) | ||
| 549 | { | ||
| 550 | u64 raw_mask = efx_ef10_raw_stat_mask(efx); | ||
| 551 | |||
| 552 | #if BITS_PER_LONG == 64 | ||
| 553 | mask[0] = raw_mask; | ||
| 554 | #else | ||
| 555 | mask[0] = raw_mask & 0xffffffff; | ||
| 556 | mask[1] = raw_mask >> 32; | ||
| 557 | #endif | ||
| 523 | } | 558 | } |
| 524 | 559 | ||
| 525 | static size_t efx_ef10_describe_stats(struct efx_nic *efx, u8 *names) | 560 | static size_t efx_ef10_describe_stats(struct efx_nic *efx, u8 *names) |
| 526 | { | 561 | { |
| 562 | DECLARE_BITMAP(mask, EF10_STAT_COUNT); | ||
| 563 | |||
| 564 | efx_ef10_get_stat_mask(efx, mask); | ||
| 527 | return efx_nic_describe_stats(efx_ef10_stat_desc, EF10_STAT_COUNT, | 565 | return efx_nic_describe_stats(efx_ef10_stat_desc, EF10_STAT_COUNT, |
| 528 | efx_ef10_stat_mask(efx), names); | 566 | mask, names); |
| 529 | } | 567 | } |
| 530 | 568 | ||
| 531 | static int efx_ef10_try_update_nic_stats(struct efx_nic *efx) | 569 | static int efx_ef10_try_update_nic_stats(struct efx_nic *efx) |
| 532 | { | 570 | { |
| 533 | struct efx_ef10_nic_data *nic_data = efx->nic_data; | 571 | struct efx_ef10_nic_data *nic_data = efx->nic_data; |
| 534 | const unsigned long *stats_mask = efx_ef10_stat_mask(efx); | 572 | DECLARE_BITMAP(mask, EF10_STAT_COUNT); |
| 535 | __le64 generation_start, generation_end; | 573 | __le64 generation_start, generation_end; |
| 536 | u64 *stats = nic_data->stats; | 574 | u64 *stats = nic_data->stats; |
| 537 | __le64 *dma_stats; | 575 | __le64 *dma_stats; |
| 538 | 576 | ||
| 577 | efx_ef10_get_stat_mask(efx, mask); | ||
| 578 | |||
| 539 | dma_stats = efx->stats_buffer.addr; | 579 | dma_stats = efx->stats_buffer.addr; |
| 540 | nic_data = efx->nic_data; | 580 | nic_data = efx->nic_data; |
| 541 | 581 | ||
| @@ -543,8 +583,9 @@ static int efx_ef10_try_update_nic_stats(struct efx_nic *efx) | |||
| 543 | if (generation_end == EFX_MC_STATS_GENERATION_INVALID) | 583 | if (generation_end == EFX_MC_STATS_GENERATION_INVALID) |
| 544 | return 0; | 584 | return 0; |
| 545 | rmb(); | 585 | rmb(); |
| 546 | efx_nic_update_stats(efx_ef10_stat_desc, EF10_STAT_COUNT, stats_mask, | 586 | efx_nic_update_stats(efx_ef10_stat_desc, EF10_STAT_COUNT, mask, |
| 547 | stats, efx->stats_buffer.addr, false); | 587 | stats, efx->stats_buffer.addr, false); |
| 588 | rmb(); | ||
| 548 | generation_start = dma_stats[MC_CMD_MAC_GENERATION_START]; | 589 | generation_start = dma_stats[MC_CMD_MAC_GENERATION_START]; |
| 549 | if (generation_end != generation_start) | 590 | if (generation_end != generation_start) |
| 550 | return -EAGAIN; | 591 | return -EAGAIN; |
| @@ -563,12 +604,14 @@ static int efx_ef10_try_update_nic_stats(struct efx_nic *efx) | |||
| 563 | static size_t efx_ef10_update_stats(struct efx_nic *efx, u64 *full_stats, | 604 | static size_t efx_ef10_update_stats(struct efx_nic *efx, u64 *full_stats, |
| 564 | struct rtnl_link_stats64 *core_stats) | 605 | struct rtnl_link_stats64 *core_stats) |
| 565 | { | 606 | { |
| 566 | const unsigned long *mask = efx_ef10_stat_mask(efx); | 607 | DECLARE_BITMAP(mask, EF10_STAT_COUNT); |
| 567 | struct efx_ef10_nic_data *nic_data = efx->nic_data; | 608 | struct efx_ef10_nic_data *nic_data = efx->nic_data; |
| 568 | u64 *stats = nic_data->stats; | 609 | u64 *stats = nic_data->stats; |
| 569 | size_t stats_count = 0, index; | 610 | size_t stats_count = 0, index; |
| 570 | int retry; | 611 | int retry; |
| 571 | 612 | ||
| 613 | efx_ef10_get_stat_mask(efx, mask); | ||
| 614 | |||
| 572 | /* If we're unlucky enough to read statistics during the DMA, wait | 615 | /* If we're unlucky enough to read statistics during the DMA, wait |
| 573 | * up to 10ms for it to finish (typically takes <500us) | 616 | * up to 10ms for it to finish (typically takes <500us) |
| 574 | */ | 617 | */ |
diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c index c082562dbf4e..366c8e3e3784 100644 --- a/drivers/net/ethernet/sfc/mcdi.c +++ b/drivers/net/ethernet/sfc/mcdi.c | |||
| @@ -963,7 +963,7 @@ static int efx_mcdi_drv_attach(struct efx_nic *efx, bool driver_operating, | |||
| 963 | bool *was_attached) | 963 | bool *was_attached) |
| 964 | { | 964 | { |
| 965 | MCDI_DECLARE_BUF(inbuf, MC_CMD_DRV_ATTACH_IN_LEN); | 965 | MCDI_DECLARE_BUF(inbuf, MC_CMD_DRV_ATTACH_IN_LEN); |
| 966 | MCDI_DECLARE_BUF(outbuf, MC_CMD_DRV_ATTACH_OUT_LEN); | 966 | MCDI_DECLARE_BUF(outbuf, MC_CMD_DRV_ATTACH_EXT_OUT_LEN); |
| 967 | size_t outlen; | 967 | size_t outlen; |
| 968 | int rc; | 968 | int rc; |
| 969 | 969 | ||
| @@ -981,6 +981,22 @@ static int efx_mcdi_drv_attach(struct efx_nic *efx, bool driver_operating, | |||
| 981 | goto fail; | 981 | goto fail; |
| 982 | } | 982 | } |
| 983 | 983 | ||
| 984 | /* We currently assume we have control of the external link | ||
| 985 | * and are completely trusted by firmware. Abort probing | ||
| 986 | * if that's not true for this function. | ||
| 987 | */ | ||
| 988 | if (driver_operating && | ||
| 989 | outlen >= MC_CMD_DRV_ATTACH_EXT_OUT_LEN && | ||
| 990 | (MCDI_DWORD(outbuf, DRV_ATTACH_EXT_OUT_FUNC_FLAGS) & | ||
| 991 | (1 << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_LINKCTRL | | ||
| 992 | 1 << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_TRUSTED)) != | ||
| 993 | (1 << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_LINKCTRL | | ||
| 994 | 1 << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_TRUSTED)) { | ||
| 995 | netif_err(efx, probe, efx->net_dev, | ||
| 996 | "This driver version only supports one function per port\n"); | ||
| 997 | return -ENODEV; | ||
| 998 | } | ||
| 999 | |||
| 984 | if (was_attached != NULL) | 1000 | if (was_attached != NULL) |
| 985 | *was_attached = MCDI_DWORD(outbuf, DRV_ATTACH_OUT_OLD_STATE); | 1001 | *was_attached = MCDI_DWORD(outbuf, DRV_ATTACH_OUT_OLD_STATE); |
| 986 | return 0; | 1002 | return 0; |
diff --git a/drivers/net/ethernet/sfc/mcdi_pcol.h b/drivers/net/ethernet/sfc/mcdi_pcol.h index b5cf62492f8e..e0a63ddb7a6c 100644 --- a/drivers/net/ethernet/sfc/mcdi_pcol.h +++ b/drivers/net/ethernet/sfc/mcdi_pcol.h | |||
| @@ -2574,8 +2574,58 @@ | |||
| 2574 | #define MC_CMD_MAC_RX_LANES01_DISP_ERR 0x39 /* enum */ | 2574 | #define MC_CMD_MAC_RX_LANES01_DISP_ERR 0x39 /* enum */ |
| 2575 | #define MC_CMD_MAC_RX_LANES23_DISP_ERR 0x3a /* enum */ | 2575 | #define MC_CMD_MAC_RX_LANES23_DISP_ERR 0x3a /* enum */ |
| 2576 | #define MC_CMD_MAC_RX_MATCH_FAULT 0x3b /* enum */ | 2576 | #define MC_CMD_MAC_RX_MATCH_FAULT 0x3b /* enum */ |
| 2577 | #define MC_CMD_GMAC_DMABUF_START 0x40 /* enum */ | 2577 | /* enum: PM trunc_bb_overflow counter. Valid for EF10 with PM_AND_RXDP_COUNTERS |
| 2578 | #define MC_CMD_GMAC_DMABUF_END 0x5f /* enum */ | 2578 | * capability only. |
| 2579 | */ | ||
| 2580 | #define MC_CMD_MAC_PM_TRUNC_BB_OVERFLOW 0x3c | ||
| 2581 | /* enum: PM discard_bb_overflow counter. Valid for EF10 with | ||
| 2582 | * PM_AND_RXDP_COUNTERS capability only. | ||
| 2583 | */ | ||
| 2584 | #define MC_CMD_MAC_PM_DISCARD_BB_OVERFLOW 0x3d | ||
| 2585 | /* enum: PM trunc_vfifo_full counter. Valid for EF10 with PM_AND_RXDP_COUNTERS | ||
| 2586 | * capability only. | ||
| 2587 | */ | ||
| 2588 | #define MC_CMD_MAC_PM_TRUNC_VFIFO_FULL 0x3e | ||
| 2589 | /* enum: PM discard_vfifo_full counter. Valid for EF10 with | ||
| 2590 | * PM_AND_RXDP_COUNTERS capability only. | ||
| 2591 | */ | ||
| 2592 | #define MC_CMD_MAC_PM_DISCARD_VFIFO_FULL 0x3f | ||
| 2593 | /* enum: PM trunc_qbb counter. Valid for EF10 with PM_AND_RXDP_COUNTERS | ||
| 2594 | * capability only. | ||
| 2595 | */ | ||
| 2596 | #define MC_CMD_MAC_PM_TRUNC_QBB 0x40 | ||
| 2597 | /* enum: PM discard_qbb counter. Valid for EF10 with PM_AND_RXDP_COUNTERS | ||
| 2598 | * capability only. | ||
| 2599 | */ | ||
| 2600 | #define MC_CMD_MAC_PM_DISCARD_QBB 0x41 | ||
| 2601 | /* enum: PM discard_mapping counter. Valid for EF10 with PM_AND_RXDP_COUNTERS | ||
| 2602 | * capability only. | ||
| 2603 | */ | ||
| 2604 | #define MC_CMD_MAC_PM_DISCARD_MAPPING 0x42 | ||
| 2605 | /* enum: RXDP counter: Number of packets dropped due to the queue being | ||
| 2606 | * disabled. Valid for EF10 with PM_AND_RXDP_COUNTERS capability only. | ||
| 2607 | */ | ||
| 2608 | #define MC_CMD_MAC_RXDP_Q_DISABLED_PKTS 0x43 | ||
| 2609 | /* enum: RXDP counter: Number of packets dropped by the DICPU. Valid for EF10 | ||
| 2610 | * with PM_AND_RXDP_COUNTERS capability only. | ||
| 2611 | */ | ||
| 2612 | #define MC_CMD_MAC_RXDP_DI_DROPPED_PKTS 0x45 | ||
| 2613 | /* enum: RXDP counter: Number of non-host packets. Valid for EF10 with | ||
| 2614 | * PM_AND_RXDP_COUNTERS capability only. | ||
| 2615 | */ | ||
| 2616 | #define MC_CMD_MAC_RXDP_STREAMING_PKTS 0x46 | ||
| 2617 | /* enum: RXDP counter: Number of times an emergency descriptor fetch was | ||
| 2618 | * performed. Valid for EF10 with PM_AND_RXDP_COUNTERS capability only. | ||
| 2619 | */ | ||
| 2620 | #define MC_CMD_MAC_RXDP_EMERGENCY_FETCH_CONDITIONS 0x47 | ||
| 2621 | /* enum: RXDP counter: Number of times the DPCPU waited for an existing | ||
| 2622 | * descriptor fetch. Valid for EF10 with PM_AND_RXDP_COUNTERS capability only. | ||
| 2623 | */ | ||
| 2624 | #define MC_CMD_MAC_RXDP_EMERGENCY_WAIT_CONDITIONS 0x48 | ||
| 2625 | /* enum: Start of GMAC stats buffer space, for Siena only. */ | ||
| 2626 | #define MC_CMD_GMAC_DMABUF_START 0x40 | ||
| 2627 | /* enum: End of GMAC stats buffer space, for Siena only. */ | ||
| 2628 | #define MC_CMD_GMAC_DMABUF_END 0x5f | ||
| 2579 | #define MC_CMD_MAC_GENERATION_END 0x60 /* enum */ | 2629 | #define MC_CMD_MAC_GENERATION_END 0x60 /* enum */ |
| 2580 | #define MC_CMD_MAC_NSTATS 0x61 /* enum */ | 2630 | #define MC_CMD_MAC_NSTATS 0x61 /* enum */ |
| 2581 | 2631 | ||
| @@ -5065,6 +5115,8 @@ | |||
| 5065 | #define MC_CMD_GET_CAPABILITIES_OUT_RX_BATCHING_WIDTH 1 | 5115 | #define MC_CMD_GET_CAPABILITIES_OUT_RX_BATCHING_WIDTH 1 |
| 5066 | #define MC_CMD_GET_CAPABILITIES_OUT_MCAST_FILTER_CHAINING_LBN 26 | 5116 | #define MC_CMD_GET_CAPABILITIES_OUT_MCAST_FILTER_CHAINING_LBN 26 |
| 5067 | #define MC_CMD_GET_CAPABILITIES_OUT_MCAST_FILTER_CHAINING_WIDTH 1 | 5117 | #define MC_CMD_GET_CAPABILITIES_OUT_MCAST_FILTER_CHAINING_WIDTH 1 |
| 5118 | #define MC_CMD_GET_CAPABILITIES_OUT_PM_AND_RXDP_COUNTERS_LBN 27 | ||
| 5119 | #define MC_CMD_GET_CAPABILITIES_OUT_PM_AND_RXDP_COUNTERS_WIDTH 1 | ||
| 5068 | /* RxDPCPU firmware id. */ | 5120 | /* RxDPCPU firmware id. */ |
| 5069 | #define MC_CMD_GET_CAPABILITIES_OUT_RX_DPCPU_FW_ID_OFST 4 | 5121 | #define MC_CMD_GET_CAPABILITIES_OUT_RX_DPCPU_FW_ID_OFST 4 |
| 5070 | #define MC_CMD_GET_CAPABILITIES_OUT_RX_DPCPU_FW_ID_LEN 2 | 5122 | #define MC_CMD_GET_CAPABILITIES_OUT_RX_DPCPU_FW_ID_LEN 2 |
diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c index e7dbd2dd202e..9826594c8a48 100644 --- a/drivers/net/ethernet/sfc/nic.c +++ b/drivers/net/ethernet/sfc/nic.c | |||
| @@ -469,8 +469,7 @@ size_t efx_nic_describe_stats(const struct efx_hw_stat_desc *desc, size_t count, | |||
| 469 | * @count: Length of the @desc array | 469 | * @count: Length of the @desc array |
| 470 | * @mask: Bitmask of which elements of @desc are enabled | 470 | * @mask: Bitmask of which elements of @desc are enabled |
| 471 | * @stats: Buffer to update with the converted statistics. The length | 471 | * @stats: Buffer to update with the converted statistics. The length |
| 472 | * of this array must be at least the number of set bits in the | 472 | * of this array must be at least @count. |
| 473 | * first @count bits of @mask. | ||
| 474 | * @dma_buf: DMA buffer containing hardware statistics | 473 | * @dma_buf: DMA buffer containing hardware statistics |
| 475 | * @accumulate: If set, the converted values will be added rather than | 474 | * @accumulate: If set, the converted values will be added rather than |
| 476 | * directly stored to the corresponding elements of @stats | 475 | * directly stored to the corresponding elements of @stats |
| @@ -503,11 +502,9 @@ void efx_nic_update_stats(const struct efx_hw_stat_desc *desc, size_t count, | |||
| 503 | } | 502 | } |
| 504 | 503 | ||
| 505 | if (accumulate) | 504 | if (accumulate) |
| 506 | *stats += val; | 505 | stats[index] += val; |
| 507 | else | 506 | else |
| 508 | *stats = val; | 507 | stats[index] = val; |
| 509 | } | 508 | } |
| 510 | |||
| 511 | ++stats; | ||
| 512 | } | 509 | } |
| 513 | } | 510 | } |
diff --git a/drivers/net/ethernet/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h index fda29d39032f..890bbbe8320e 100644 --- a/drivers/net/ethernet/sfc/nic.h +++ b/drivers/net/ethernet/sfc/nic.h | |||
| @@ -386,6 +386,18 @@ enum { | |||
| 386 | EF10_STAT_rx_align_error, | 386 | EF10_STAT_rx_align_error, |
| 387 | EF10_STAT_rx_length_error, | 387 | EF10_STAT_rx_length_error, |
| 388 | EF10_STAT_rx_nodesc_drops, | 388 | EF10_STAT_rx_nodesc_drops, |
| 389 | EF10_STAT_rx_pm_trunc_bb_overflow, | ||
| 390 | EF10_STAT_rx_pm_discard_bb_overflow, | ||
| 391 | EF10_STAT_rx_pm_trunc_vfifo_full, | ||
| 392 | EF10_STAT_rx_pm_discard_vfifo_full, | ||
| 393 | EF10_STAT_rx_pm_trunc_qbb, | ||
| 394 | EF10_STAT_rx_pm_discard_qbb, | ||
| 395 | EF10_STAT_rx_pm_discard_mapping, | ||
| 396 | EF10_STAT_rx_dp_q_disabled_packets, | ||
| 397 | EF10_STAT_rx_dp_di_dropped_packets, | ||
| 398 | EF10_STAT_rx_dp_streaming_packets, | ||
| 399 | EF10_STAT_rx_dp_emerg_fetch, | ||
| 400 | EF10_STAT_rx_dp_emerg_wait, | ||
| 389 | EF10_STAT_COUNT | 401 | EF10_STAT_COUNT |
| 390 | }; | 402 | }; |
| 391 | 403 | ||
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h index 5730fe2445a6..98eedb90cdc3 100644 --- a/drivers/net/ethernet/smsc/smc91x.h +++ b/drivers/net/ethernet/smsc/smc91x.h | |||
| @@ -1124,8 +1124,7 @@ static const char * chip_ids[ 16 ] = { | |||
| 1124 | void __iomem *__ioaddr = ioaddr; \ | 1124 | void __iomem *__ioaddr = ioaddr; \ |
| 1125 | if (__len >= 2 && (unsigned long)__ptr & 2) { \ | 1125 | if (__len >= 2 && (unsigned long)__ptr & 2) { \ |
| 1126 | __len -= 2; \ | 1126 | __len -= 2; \ |
| 1127 | SMC_outw(*(u16 *)__ptr, ioaddr, \ | 1127 | SMC_outsw(ioaddr, DATA_REG(lp), __ptr, 1); \ |
| 1128 | DATA_REG(lp)); \ | ||
| 1129 | __ptr += 2; \ | 1128 | __ptr += 2; \ |
| 1130 | } \ | 1129 | } \ |
| 1131 | if (SMC_CAN_USE_DATACS && lp->datacs) \ | 1130 | if (SMC_CAN_USE_DATACS && lp->datacs) \ |
| @@ -1133,8 +1132,7 @@ static const char * chip_ids[ 16 ] = { | |||
| 1133 | SMC_outsl(__ioaddr, DATA_REG(lp), __ptr, __len>>2); \ | 1132 | SMC_outsl(__ioaddr, DATA_REG(lp), __ptr, __len>>2); \ |
| 1134 | if (__len & 2) { \ | 1133 | if (__len & 2) { \ |
| 1135 | __ptr += (__len & ~3); \ | 1134 | __ptr += (__len & ~3); \ |
| 1136 | SMC_outw(*((u16 *)__ptr), ioaddr, \ | 1135 | SMC_outsw(ioaddr, DATA_REG(lp), __ptr, 1); \ |
| 1137 | DATA_REG(lp)); \ | ||
| 1138 | } \ | 1136 | } \ |
| 1139 | } else if (SMC_16BIT(lp)) \ | 1137 | } else if (SMC_16BIT(lp)) \ |
| 1140 | SMC_outsw(ioaddr, DATA_REG(lp), p, (l) >> 1); \ | 1138 | SMC_outsw(ioaddr, DATA_REG(lp), p, (l) >> 1); \ |
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 79974e31187a..cc3ce557e4aa 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c | |||
| @@ -639,13 +639,6 @@ void cpsw_rx_handler(void *token, int len, int status) | |||
| 639 | static irqreturn_t cpsw_interrupt(int irq, void *dev_id) | 639 | static irqreturn_t cpsw_interrupt(int irq, void *dev_id) |
| 640 | { | 640 | { |
| 641 | struct cpsw_priv *priv = dev_id; | 641 | struct cpsw_priv *priv = dev_id; |
| 642 | u32 rx, tx, rx_thresh; | ||
| 643 | |||
| 644 | rx_thresh = __raw_readl(&priv->wr_regs->rx_thresh_stat); | ||
| 645 | rx = __raw_readl(&priv->wr_regs->rx_stat); | ||
| 646 | tx = __raw_readl(&priv->wr_regs->tx_stat); | ||
| 647 | if (!rx_thresh && !rx && !tx) | ||
| 648 | return IRQ_NONE; | ||
| 649 | 642 | ||
| 650 | cpsw_intr_disable(priv); | 643 | cpsw_intr_disable(priv); |
| 651 | if (priv->irq_enabled == true) { | 644 | if (priv->irq_enabled == true) { |
| @@ -1169,9 +1162,9 @@ static int cpsw_ndo_open(struct net_device *ndev) | |||
| 1169 | } | 1162 | } |
| 1170 | } | 1163 | } |
| 1171 | 1164 | ||
| 1165 | napi_enable(&priv->napi); | ||
| 1172 | cpdma_ctlr_start(priv->dma); | 1166 | cpdma_ctlr_start(priv->dma); |
| 1173 | cpsw_intr_enable(priv); | 1167 | cpsw_intr_enable(priv); |
| 1174 | napi_enable(&priv->napi); | ||
| 1175 | cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_RX); | 1168 | cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_RX); |
| 1176 | cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_TX); | 1169 | cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_TX); |
| 1177 | 1170 | ||
| @@ -1771,8 +1764,8 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, | |||
| 1771 | } | 1764 | } |
| 1772 | data->mac_control = prop; | 1765 | data->mac_control = prop; |
| 1773 | 1766 | ||
| 1774 | if (!of_property_read_u32(node, "dual_emac", &prop)) | 1767 | if (of_property_read_bool(node, "dual_emac")) |
| 1775 | data->dual_emac = prop; | 1768 | data->dual_emac = 1; |
| 1776 | 1769 | ||
| 1777 | /* | 1770 | /* |
| 1778 | * Populate all the child nodes here... | 1771 | * Populate all the child nodes here... |
| @@ -1782,7 +1775,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, | |||
| 1782 | if (ret) | 1775 | if (ret) |
| 1783 | pr_warn("Doesn't have any child node\n"); | 1776 | pr_warn("Doesn't have any child node\n"); |
| 1784 | 1777 | ||
| 1785 | for_each_node_by_name(slave_node, "slave") { | 1778 | for_each_child_of_node(node, slave_node) { |
| 1786 | struct cpsw_slave_data *slave_data = data->slave_data + i; | 1779 | struct cpsw_slave_data *slave_data = data->slave_data + i; |
| 1787 | const void *mac_addr = NULL; | 1780 | const void *mac_addr = NULL; |
| 1788 | u32 phyid; | 1781 | u32 phyid; |
| @@ -1791,6 +1784,10 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, | |||
| 1791 | struct device_node *mdio_node; | 1784 | struct device_node *mdio_node; |
| 1792 | struct platform_device *mdio; | 1785 | struct platform_device *mdio; |
| 1793 | 1786 | ||
| 1787 | /* This is no slave child node, continue */ | ||
| 1788 | if (strcmp(slave_node->name, "slave")) | ||
| 1789 | continue; | ||
| 1790 | |||
| 1794 | parp = of_get_property(slave_node, "phy_id", &lenp); | 1791 | parp = of_get_property(slave_node, "phy_id", &lenp); |
| 1795 | if ((parp == NULL) || (lenp != (sizeof(void *) * 2))) { | 1792 | if ((parp == NULL) || (lenp != (sizeof(void *) * 2))) { |
| 1796 | pr_err("Missing slave[%d] phy_id property\n", i); | 1793 | pr_err("Missing slave[%d] phy_id property\n", i); |
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index 67df09ea9d04..6a32ef9d63ae 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c | |||
| @@ -876,8 +876,7 @@ static void emac_dev_mcast_set(struct net_device *ndev) | |||
| 876 | netdev_mc_count(ndev) > EMAC_DEF_MAX_MULTICAST_ADDRESSES) { | 876 | netdev_mc_count(ndev) > EMAC_DEF_MAX_MULTICAST_ADDRESSES) { |
| 877 | mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST); | 877 | mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST); |
| 878 | emac_add_mcast(priv, EMAC_ALL_MULTI_SET, NULL); | 878 | emac_add_mcast(priv, EMAC_ALL_MULTI_SET, NULL); |
| 879 | } | 879 | } else if (!netdev_mc_empty(ndev)) { |
| 880 | if (!netdev_mc_empty(ndev)) { | ||
| 881 | struct netdev_hw_addr *ha; | 880 | struct netdev_hw_addr *ha; |
| 882 | 881 | ||
| 883 | mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST); | 882 | mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST); |
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 0721e72f9299..5af1c3e5032a 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
| @@ -975,7 +975,6 @@ static int yam_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 975 | return -EINVAL; /* Cannot change this parameter when up */ | 975 | return -EINVAL; /* Cannot change this parameter when up */ |
| 976 | if ((ym = kmalloc(sizeof(struct yamdrv_ioctl_mcs), GFP_KERNEL)) == NULL) | 976 | if ((ym = kmalloc(sizeof(struct yamdrv_ioctl_mcs), GFP_KERNEL)) == NULL) |
| 977 | return -ENOBUFS; | 977 | return -ENOBUFS; |
| 978 | ym->bitrate = 9600; | ||
| 979 | if (copy_from_user(ym, ifr->ifr_data, sizeof(struct yamdrv_ioctl_mcs))) { | 978 | if (copy_from_user(ym, ifr->ifr_data, sizeof(struct yamdrv_ioctl_mcs))) { |
| 980 | kfree(ym); | 979 | kfree(ym); |
| 981 | return -EFAULT; | 980 | return -EFAULT; |
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index 42e6deee6db5..0632d34905c7 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c | |||
| @@ -82,7 +82,6 @@ struct mrf24j40 { | |||
| 82 | 82 | ||
| 83 | struct mutex buffer_mutex; /* only used to protect buf */ | 83 | struct mutex buffer_mutex; /* only used to protect buf */ |
| 84 | struct completion tx_complete; | 84 | struct completion tx_complete; |
| 85 | struct work_struct irqwork; | ||
| 86 | u8 *buf; /* 3 bytes. Used for SPI single-register transfers. */ | 85 | u8 *buf; /* 3 bytes. Used for SPI single-register transfers. */ |
| 87 | }; | 86 | }; |
| 88 | 87 | ||
| @@ -344,6 +343,8 @@ static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb) | |||
| 344 | if (ret) | 343 | if (ret) |
| 345 | goto err; | 344 | goto err; |
| 346 | 345 | ||
| 346 | INIT_COMPLETION(devrec->tx_complete); | ||
| 347 | |||
| 347 | /* Set TXNTRIG bit of TXNCON to send packet */ | 348 | /* Set TXNTRIG bit of TXNCON to send packet */ |
| 348 | ret = read_short_reg(devrec, REG_TXNCON, &val); | 349 | ret = read_short_reg(devrec, REG_TXNCON, &val); |
| 349 | if (ret) | 350 | if (ret) |
| @@ -354,8 +355,6 @@ static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb) | |||
| 354 | val |= 0x4; | 355 | val |= 0x4; |
| 355 | write_short_reg(devrec, REG_TXNCON, val); | 356 | write_short_reg(devrec, REG_TXNCON, val); |
| 356 | 357 | ||
| 357 | INIT_COMPLETION(devrec->tx_complete); | ||
| 358 | |||
| 359 | /* Wait for the device to send the TX complete interrupt. */ | 358 | /* Wait for the device to send the TX complete interrupt. */ |
| 360 | ret = wait_for_completion_interruptible_timeout( | 359 | ret = wait_for_completion_interruptible_timeout( |
| 361 | &devrec->tx_complete, | 360 | &devrec->tx_complete, |
| @@ -590,17 +589,6 @@ static struct ieee802154_ops mrf24j40_ops = { | |||
| 590 | static irqreturn_t mrf24j40_isr(int irq, void *data) | 589 | static irqreturn_t mrf24j40_isr(int irq, void *data) |
| 591 | { | 590 | { |
| 592 | struct mrf24j40 *devrec = data; | 591 | struct mrf24j40 *devrec = data; |
| 593 | |||
| 594 | disable_irq_nosync(irq); | ||
| 595 | |||
| 596 | schedule_work(&devrec->irqwork); | ||
| 597 | |||
| 598 | return IRQ_HANDLED; | ||
| 599 | } | ||
| 600 | |||
| 601 | static void mrf24j40_isrwork(struct work_struct *work) | ||
| 602 | { | ||
| 603 | struct mrf24j40 *devrec = container_of(work, struct mrf24j40, irqwork); | ||
| 604 | u8 intstat; | 592 | u8 intstat; |
| 605 | int ret; | 593 | int ret; |
| 606 | 594 | ||
| @@ -618,7 +606,7 @@ static void mrf24j40_isrwork(struct work_struct *work) | |||
| 618 | mrf24j40_handle_rx(devrec); | 606 | mrf24j40_handle_rx(devrec); |
| 619 | 607 | ||
| 620 | out: | 608 | out: |
| 621 | enable_irq(devrec->spi->irq); | 609 | return IRQ_HANDLED; |
| 622 | } | 610 | } |
| 623 | 611 | ||
| 624 | static int mrf24j40_probe(struct spi_device *spi) | 612 | static int mrf24j40_probe(struct spi_device *spi) |
| @@ -642,7 +630,6 @@ static int mrf24j40_probe(struct spi_device *spi) | |||
| 642 | 630 | ||
| 643 | mutex_init(&devrec->buffer_mutex); | 631 | mutex_init(&devrec->buffer_mutex); |
| 644 | init_completion(&devrec->tx_complete); | 632 | init_completion(&devrec->tx_complete); |
| 645 | INIT_WORK(&devrec->irqwork, mrf24j40_isrwork); | ||
| 646 | devrec->spi = spi; | 633 | devrec->spi = spi; |
| 647 | spi_set_drvdata(spi, devrec); | 634 | spi_set_drvdata(spi, devrec); |
| 648 | 635 | ||
| @@ -688,11 +675,12 @@ static int mrf24j40_probe(struct spi_device *spi) | |||
| 688 | val &= ~0x3; /* Clear RX mode (normal) */ | 675 | val &= ~0x3; /* Clear RX mode (normal) */ |
| 689 | write_short_reg(devrec, REG_RXMCR, val); | 676 | write_short_reg(devrec, REG_RXMCR, val); |
| 690 | 677 | ||
| 691 | ret = request_irq(spi->irq, | 678 | ret = request_threaded_irq(spi->irq, |
| 692 | mrf24j40_isr, | 679 | NULL, |
| 693 | IRQF_TRIGGER_FALLING, | 680 | mrf24j40_isr, |
| 694 | dev_name(&spi->dev), | 681 | IRQF_TRIGGER_LOW|IRQF_ONESHOT, |
| 695 | devrec); | 682 | dev_name(&spi->dev), |
| 683 | devrec); | ||
| 696 | 684 | ||
| 697 | if (ret) { | 685 | if (ret) { |
| 698 | dev_err(printdev(devrec), "Unable to get IRQ"); | 686 | dev_err(printdev(devrec), "Unable to get IRQ"); |
| @@ -721,7 +709,6 @@ static int mrf24j40_remove(struct spi_device *spi) | |||
| 721 | dev_dbg(printdev(devrec), "remove\n"); | 709 | dev_dbg(printdev(devrec), "remove\n"); |
| 722 | 710 | ||
| 723 | free_irq(spi->irq, devrec); | 711 | free_irq(spi->irq, devrec); |
| 724 | flush_work(&devrec->irqwork); /* TODO: Is this the right call? */ | ||
| 725 | ieee802154_unregister_device(devrec->dev); | 712 | ieee802154_unregister_device(devrec->dev); |
| 726 | ieee802154_free_device(devrec->dev); | 713 | ieee802154_free_device(devrec->dev); |
| 727 | /* TODO: Will ieee802154_free_device() wait until ->xmit() is | 714 | /* TODO: Will ieee802154_free_device() wait until ->xmit() is |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 807815fc9968..7cb105c103fe 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -1293,7 +1293,8 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile, | |||
| 1293 | if (unlikely(!noblock)) | 1293 | if (unlikely(!noblock)) |
| 1294 | add_wait_queue(&tfile->wq.wait, &wait); | 1294 | add_wait_queue(&tfile->wq.wait, &wait); |
| 1295 | while (len) { | 1295 | while (len) { |
| 1296 | current->state = TASK_INTERRUPTIBLE; | 1296 | if (unlikely(!noblock)) |
| 1297 | current->state = TASK_INTERRUPTIBLE; | ||
| 1297 | 1298 | ||
| 1298 | /* Read frames from the queue */ | 1299 | /* Read frames from the queue */ |
| 1299 | if (!(skb = skb_dequeue(&tfile->socket.sk->sk_receive_queue))) { | 1300 | if (!(skb = skb_dequeue(&tfile->socket.sk->sk_receive_queue))) { |
| @@ -1320,9 +1321,10 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile, | |||
| 1320 | break; | 1321 | break; |
| 1321 | } | 1322 | } |
| 1322 | 1323 | ||
| 1323 | current->state = TASK_RUNNING; | 1324 | if (unlikely(!noblock)) { |
| 1324 | if (unlikely(!noblock)) | 1325 | current->state = TASK_RUNNING; |
| 1325 | remove_wait_queue(&tfile->wq.wait, &wait); | 1326 | remove_wait_queue(&tfile->wq.wait, &wait); |
| 1327 | } | ||
| 1326 | 1328 | ||
| 1327 | return ret; | 1329 | return ret; |
| 1328 | } | 1330 | } |
diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index 3569293df872..846cc19c04f2 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c | |||
| @@ -36,8 +36,8 @@ | |||
| 36 | #define AX_RXHDR_L4_TYPE_TCP 16 | 36 | #define AX_RXHDR_L4_TYPE_TCP 16 |
| 37 | #define AX_RXHDR_L3CSUM_ERR 2 | 37 | #define AX_RXHDR_L3CSUM_ERR 2 |
| 38 | #define AX_RXHDR_L4CSUM_ERR 1 | 38 | #define AX_RXHDR_L4CSUM_ERR 1 |
| 39 | #define AX_RXHDR_CRC_ERR ((u32)BIT(31)) | 39 | #define AX_RXHDR_CRC_ERR ((u32)BIT(29)) |
| 40 | #define AX_RXHDR_DROP_ERR ((u32)BIT(30)) | 40 | #define AX_RXHDR_DROP_ERR ((u32)BIT(31)) |
| 41 | #define AX_ACCESS_MAC 0x01 | 41 | #define AX_ACCESS_MAC 0x01 |
| 42 | #define AX_ACCESS_PHY 0x02 | 42 | #define AX_ACCESS_PHY 0x02 |
| 43 | #define AX_ACCESS_EEPROM 0x04 | 43 | #define AX_ACCESS_EEPROM 0x04 |
| @@ -1406,6 +1406,19 @@ static const struct driver_info sitecom_info = { | |||
| 1406 | .tx_fixup = ax88179_tx_fixup, | 1406 | .tx_fixup = ax88179_tx_fixup, |
| 1407 | }; | 1407 | }; |
| 1408 | 1408 | ||
| 1409 | static const struct driver_info samsung_info = { | ||
| 1410 | .description = "Samsung USB Ethernet Adapter", | ||
| 1411 | .bind = ax88179_bind, | ||
| 1412 | .unbind = ax88179_unbind, | ||
| 1413 | .status = ax88179_status, | ||
| 1414 | .link_reset = ax88179_link_reset, | ||
| 1415 | .reset = ax88179_reset, | ||
| 1416 | .stop = ax88179_stop, | ||
| 1417 | .flags = FLAG_ETHER | FLAG_FRAMING_AX, | ||
| 1418 | .rx_fixup = ax88179_rx_fixup, | ||
| 1419 | .tx_fixup = ax88179_tx_fixup, | ||
| 1420 | }; | ||
| 1421 | |||
| 1409 | static const struct usb_device_id products[] = { | 1422 | static const struct usb_device_id products[] = { |
| 1410 | { | 1423 | { |
| 1411 | /* ASIX AX88179 10/100/1000 */ | 1424 | /* ASIX AX88179 10/100/1000 */ |
| @@ -1418,7 +1431,11 @@ static const struct usb_device_id products[] = { | |||
| 1418 | }, { | 1431 | }, { |
| 1419 | /* Sitecom USB 3.0 to Gigabit Adapter */ | 1432 | /* Sitecom USB 3.0 to Gigabit Adapter */ |
| 1420 | USB_DEVICE(0x0df6, 0x0072), | 1433 | USB_DEVICE(0x0df6, 0x0072), |
| 1421 | .driver_info = (unsigned long) &sitecom_info, | 1434 | .driver_info = (unsigned long)&sitecom_info, |
| 1435 | }, { | ||
| 1436 | /* Samsung USB Ethernet Adapter */ | ||
| 1437 | USB_DEVICE(0x04e8, 0xa100), | ||
| 1438 | .driver_info = (unsigned long)&samsung_info, | ||
| 1422 | }, | 1439 | }, |
| 1423 | { }, | 1440 | { }, |
| 1424 | }; | 1441 | }; |
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 3d6aaf79d8b2..818ce90185b5 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c | |||
| @@ -714,6 +714,7 @@ static const struct usb_device_id products[] = { | |||
| 714 | {QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */ | 714 | {QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */ |
| 715 | {QMI_FIXED_INTF(0x2357, 0x9000, 4)}, /* TP-LINK MA260 */ | 715 | {QMI_FIXED_INTF(0x2357, 0x9000, 4)}, /* TP-LINK MA260 */ |
| 716 | {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */ | 716 | {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */ |
| 717 | {QMI_FIXED_INTF(0x0b3c, 0xc005, 6)}, /* Olivetti Olicard 200 */ | ||
| 717 | {QMI_FIXED_INTF(0x1e2d, 0x0060, 4)}, /* Cinterion PLxx */ | 718 | {QMI_FIXED_INTF(0x1e2d, 0x0060, 4)}, /* Cinterion PLxx */ |
| 718 | 719 | ||
| 719 | /* 4. Gobi 1000 devices */ | 720 | /* 4. Gobi 1000 devices */ |
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index bf94e10a37c8..90a429b7ebad 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
| @@ -1688,8 +1688,10 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) | |||
| 1688 | if (dev->can_dma_sg && !(info->flags & FLAG_SEND_ZLP) && | 1688 | if (dev->can_dma_sg && !(info->flags & FLAG_SEND_ZLP) && |
| 1689 | !(info->flags & FLAG_MULTI_PACKET)) { | 1689 | !(info->flags & FLAG_MULTI_PACKET)) { |
| 1690 | dev->padding_pkt = kzalloc(1, GFP_KERNEL); | 1690 | dev->padding_pkt = kzalloc(1, GFP_KERNEL); |
| 1691 | if (!dev->padding_pkt) | 1691 | if (!dev->padding_pkt) { |
| 1692 | status = -ENOMEM; | ||
| 1692 | goto out4; | 1693 | goto out4; |
| 1694 | } | ||
| 1693 | } | 1695 | } |
| 1694 | 1696 | ||
| 1695 | status = register_netdev (net); | 1697 | status = register_netdev (net); |
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index defec2b3c5a4..9fbdfcd1e1a0 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
| @@ -938,7 +938,9 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) | |||
| 938 | return -EINVAL; | 938 | return -EINVAL; |
| 939 | } else { | 939 | } else { |
| 940 | vi->curr_queue_pairs = queue_pairs; | 940 | vi->curr_queue_pairs = queue_pairs; |
| 941 | schedule_delayed_work(&vi->refill, 0); | 941 | /* virtnet_open() will refill when device is going to up. */ |
| 942 | if (dev->flags & IFF_UP) | ||
| 943 | schedule_delayed_work(&vi->refill, 0); | ||
| 942 | } | 944 | } |
| 943 | 945 | ||
| 944 | return 0; | 946 | return 0; |
| @@ -1116,6 +1118,11 @@ static int virtnet_cpu_callback(struct notifier_block *nfb, | |||
| 1116 | { | 1118 | { |
| 1117 | struct virtnet_info *vi = container_of(nfb, struct virtnet_info, nb); | 1119 | struct virtnet_info *vi = container_of(nfb, struct virtnet_info, nb); |
| 1118 | 1120 | ||
| 1121 | mutex_lock(&vi->config_lock); | ||
| 1122 | |||
| 1123 | if (!vi->config_enable) | ||
| 1124 | goto done; | ||
| 1125 | |||
| 1119 | switch(action & ~CPU_TASKS_FROZEN) { | 1126 | switch(action & ~CPU_TASKS_FROZEN) { |
| 1120 | case CPU_ONLINE: | 1127 | case CPU_ONLINE: |
| 1121 | case CPU_DOWN_FAILED: | 1128 | case CPU_DOWN_FAILED: |
| @@ -1128,6 +1135,9 @@ static int virtnet_cpu_callback(struct notifier_block *nfb, | |||
| 1128 | default: | 1135 | default: |
| 1129 | break; | 1136 | break; |
| 1130 | } | 1137 | } |
| 1138 | |||
| 1139 | done: | ||
| 1140 | mutex_unlock(&vi->config_lock); | ||
| 1131 | return NOTIFY_OK; | 1141 | return NOTIFY_OK; |
| 1132 | } | 1142 | } |
| 1133 | 1143 | ||
| @@ -1733,7 +1743,9 @@ static int virtnet_restore(struct virtio_device *vdev) | |||
| 1733 | vi->config_enable = true; | 1743 | vi->config_enable = true; |
| 1734 | mutex_unlock(&vi->config_lock); | 1744 | mutex_unlock(&vi->config_lock); |
| 1735 | 1745 | ||
| 1746 | rtnl_lock(); | ||
| 1736 | virtnet_set_queues(vi, vi->curr_queue_pairs); | 1747 | virtnet_set_queues(vi, vi->curr_queue_pairs); |
| 1748 | rtnl_unlock(); | ||
| 1737 | 1749 | ||
| 1738 | return 0; | 1750 | return 0; |
| 1739 | } | 1751 | } |
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 3f0c4f268751..bcfff0d62de4 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c | |||
| @@ -1972,6 +1972,7 @@ fst_get_iface(struct fst_card_info *card, struct fst_port_info *port, | |||
| 1972 | } | 1972 | } |
| 1973 | 1973 | ||
| 1974 | i = port->index; | 1974 | i = port->index; |
| 1975 | memset(&sync, 0, sizeof(sync)); | ||
| 1975 | sync.clock_rate = FST_RDL(card, portConfig[i].lineSpeed); | 1976 | sync.clock_rate = FST_RDL(card, portConfig[i].lineSpeed); |
| 1976 | /* Lucky card and linux use same encoding here */ | 1977 | /* Lucky card and linux use same encoding here */ |
| 1977 | sync.clock_type = FST_RDB(card, portConfig[i].internalClock) == | 1978 | sync.clock_type = FST_RDB(card, portConfig[i].internalClock) == |
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c index 6a24a5a70cc7..4c0a69779b89 100644 --- a/drivers/net/wan/wanxl.c +++ b/drivers/net/wan/wanxl.c | |||
| @@ -355,6 +355,7 @@ static int wanxl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 355 | ifr->ifr_settings.size = size; /* data size wanted */ | 355 | ifr->ifr_settings.size = size; /* data size wanted */ |
| 356 | return -ENOBUFS; | 356 | return -ENOBUFS; |
| 357 | } | 357 | } |
| 358 | memset(&line, 0, sizeof(line)); | ||
| 358 | line.clock_type = get_status(port)->clocking; | 359 | line.clock_type = get_status(port)->clocking; |
| 359 | line.clock_rate = 0; | 360 | line.clock_rate = 0; |
| 360 | line.loopback = 0; | 361 | line.loopback = 0; |
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index e4f65900132d..709301f88dcd 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
| @@ -208,6 +208,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) | |||
| 208 | struct ath_hw *ah = sc->sc_ah; | 208 | struct ath_hw *ah = sc->sc_ah; |
| 209 | struct ath_common *common = ath9k_hw_common(ah); | 209 | struct ath_common *common = ath9k_hw_common(ah); |
| 210 | unsigned long flags; | 210 | unsigned long flags; |
| 211 | int i; | ||
| 211 | 212 | ||
| 212 | if (ath_startrecv(sc) != 0) { | 213 | if (ath_startrecv(sc) != 0) { |
| 213 | ath_err(common, "Unable to restart recv logic\n"); | 214 | ath_err(common, "Unable to restart recv logic\n"); |
| @@ -235,6 +236,15 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) | |||
| 235 | } | 236 | } |
| 236 | work: | 237 | work: |
| 237 | ath_restart_work(sc); | 238 | ath_restart_work(sc); |
| 239 | |||
| 240 | for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) { | ||
| 241 | if (!ATH_TXQ_SETUP(sc, i)) | ||
| 242 | continue; | ||
| 243 | |||
| 244 | spin_lock_bh(&sc->tx.txq[i].axq_lock); | ||
| 245 | ath_txq_schedule(sc, &sc->tx.txq[i]); | ||
| 246 | spin_unlock_bh(&sc->tx.txq[i].axq_lock); | ||
| 247 | } | ||
| 238 | } | 248 | } |
| 239 | 249 | ||
| 240 | ieee80211_wake_queues(sc->hw); | 250 | ieee80211_wake_queues(sc->hw); |
| @@ -539,21 +549,10 @@ chip_reset: | |||
| 539 | 549 | ||
| 540 | static int ath_reset(struct ath_softc *sc) | 550 | static int ath_reset(struct ath_softc *sc) |
| 541 | { | 551 | { |
| 542 | int i, r; | 552 | int r; |
| 543 | 553 | ||
| 544 | ath9k_ps_wakeup(sc); | 554 | ath9k_ps_wakeup(sc); |
| 545 | |||
| 546 | r = ath_reset_internal(sc, NULL); | 555 | r = ath_reset_internal(sc, NULL); |
| 547 | |||
| 548 | for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) { | ||
| 549 | if (!ATH_TXQ_SETUP(sc, i)) | ||
| 550 | continue; | ||
| 551 | |||
| 552 | spin_lock_bh(&sc->tx.txq[i].axq_lock); | ||
| 553 | ath_txq_schedule(sc, &sc->tx.txq[i]); | ||
| 554 | spin_unlock_bh(&sc->tx.txq[i].axq_lock); | ||
| 555 | } | ||
| 556 | |||
| 557 | ath9k_ps_restore(sc); | 556 | ath9k_ps_restore(sc); |
| 558 | 557 | ||
| 559 | return r; | 558 | return r; |
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 5ac713d2ff5d..dd30452df966 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
| @@ -1969,15 +1969,18 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq, | |||
| 1969 | static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq, | 1969 | static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq, |
| 1970 | struct ath_atx_tid *tid, struct sk_buff *skb) | 1970 | struct ath_atx_tid *tid, struct sk_buff *skb) |
| 1971 | { | 1971 | { |
| 1972 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | ||
| 1972 | struct ath_frame_info *fi = get_frame_info(skb); | 1973 | struct ath_frame_info *fi = get_frame_info(skb); |
| 1973 | struct list_head bf_head; | 1974 | struct list_head bf_head; |
| 1974 | struct ath_buf *bf; | 1975 | struct ath_buf *bf = fi->bf; |
| 1975 | |||
| 1976 | bf = fi->bf; | ||
| 1977 | 1976 | ||
| 1978 | INIT_LIST_HEAD(&bf_head); | 1977 | INIT_LIST_HEAD(&bf_head); |
| 1979 | list_add_tail(&bf->list, &bf_head); | 1978 | list_add_tail(&bf->list, &bf_head); |
| 1980 | bf->bf_state.bf_type = 0; | 1979 | bf->bf_state.bf_type = 0; |
| 1980 | if (tid && (tx_info->flags & IEEE80211_TX_CTL_AMPDU)) { | ||
| 1981 | bf->bf_state.bf_type = BUF_AMPDU; | ||
| 1982 | ath_tx_addto_baw(sc, tid, bf); | ||
| 1983 | } | ||
| 1981 | 1984 | ||
| 1982 | bf->bf_next = NULL; | 1985 | bf->bf_next = NULL; |
| 1983 | bf->bf_lastbf = bf; | 1986 | bf->bf_lastbf = bf; |
diff --git a/drivers/net/wireless/cw1200/cw1200_spi.c b/drivers/net/wireless/cw1200/cw1200_spi.c index 899cad34ccd3..755a0c8edfe1 100644 --- a/drivers/net/wireless/cw1200/cw1200_spi.c +++ b/drivers/net/wireless/cw1200/cw1200_spi.c | |||
| @@ -237,7 +237,9 @@ static irqreturn_t cw1200_spi_irq_handler(int irq, void *dev_id) | |||
| 237 | struct hwbus_priv *self = dev_id; | 237 | struct hwbus_priv *self = dev_id; |
| 238 | 238 | ||
| 239 | if (self->core) { | 239 | if (self->core) { |
| 240 | cw1200_spi_lock(self); | ||
| 240 | cw1200_irq_handler(self->core); | 241 | cw1200_irq_handler(self->core); |
| 242 | cw1200_spi_unlock(self); | ||
| 241 | return IRQ_HANDLED; | 243 | return IRQ_HANDLED; |
| 242 | } else { | 244 | } else { |
| 243 | return IRQ_NONE; | 245 | return IRQ_NONE; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index 30d45e2fc193..8ac305be68f4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
| @@ -240,6 +240,12 @@ const struct iwl_cfg iwl6035_2agn_cfg = { | |||
| 240 | .ht_params = &iwl6000_ht_params, | 240 | .ht_params = &iwl6000_ht_params, |
| 241 | }; | 241 | }; |
| 242 | 242 | ||
| 243 | const struct iwl_cfg iwl6035_2agn_sff_cfg = { | ||
| 244 | .name = "Intel(R) Centrino(R) Ultimate-N 6235 AGN", | ||
| 245 | IWL_DEVICE_6035, | ||
| 246 | .ht_params = &iwl6000_ht_params, | ||
| 247 | }; | ||
| 248 | |||
| 243 | const struct iwl_cfg iwl1030_bgn_cfg = { | 249 | const struct iwl_cfg iwl1030_bgn_cfg = { |
| 244 | .name = "Intel(R) Centrino(R) Wireless-N 1030 BGN", | 250 | .name = "Intel(R) Centrino(R) Wireless-N 1030 BGN", |
| 245 | IWL_DEVICE_6030, | 251 | IWL_DEVICE_6030, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h index e4d370bff306..b03c25e14903 100644 --- a/drivers/net/wireless/iwlwifi/iwl-config.h +++ b/drivers/net/wireless/iwlwifi/iwl-config.h | |||
| @@ -280,6 +280,7 @@ extern const struct iwl_cfg iwl2000_2bgn_cfg; | |||
| 280 | extern const struct iwl_cfg iwl2000_2bgn_d_cfg; | 280 | extern const struct iwl_cfg iwl2000_2bgn_d_cfg; |
| 281 | extern const struct iwl_cfg iwl2030_2bgn_cfg; | 281 | extern const struct iwl_cfg iwl2030_2bgn_cfg; |
| 282 | extern const struct iwl_cfg iwl6035_2agn_cfg; | 282 | extern const struct iwl_cfg iwl6035_2agn_cfg; |
| 283 | extern const struct iwl_cfg iwl6035_2agn_sff_cfg; | ||
| 283 | extern const struct iwl_cfg iwl105_bgn_cfg; | 284 | extern const struct iwl_cfg iwl105_bgn_cfg; |
| 284 | extern const struct iwl_cfg iwl105_bgn_d_cfg; | 285 | extern const struct iwl_cfg iwl105_bgn_d_cfg; |
| 285 | extern const struct iwl_cfg iwl135_bgn_cfg; | 286 | extern const struct iwl_cfg iwl135_bgn_cfg; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h index dd57a36ecb10..80b47508647c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/iwlwifi/iwl-trans.h | |||
| @@ -601,8 +601,10 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans, | |||
| 601 | { | 601 | { |
| 602 | int ret; | 602 | int ret; |
| 603 | 603 | ||
| 604 | WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE, | 604 | if (trans->state != IWL_TRANS_FW_ALIVE) { |
| 605 | "%s bad state = %d", __func__, trans->state); | 605 | IWL_ERR(trans, "%s bad state = %d", __func__, trans->state); |
| 606 | return -EIO; | ||
| 607 | } | ||
| 606 | 608 | ||
| 607 | if (!(cmd->flags & CMD_ASYNC)) | 609 | if (!(cmd->flags & CMD_ASYNC)) |
| 608 | lock_map_acquire_read(&trans->sync_cmd_lockdep_map); | 610 | lock_map_acquire_read(&trans->sync_cmd_lockdep_map); |
diff --git a/drivers/net/wireless/iwlwifi/mvm/power.c b/drivers/net/wireless/iwlwifi/mvm/power.c index 21407a353a3b..d58e393324ef 100644 --- a/drivers/net/wireless/iwlwifi/mvm/power.c +++ b/drivers/net/wireless/iwlwifi/mvm/power.c | |||
| @@ -273,7 +273,10 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, | |||
| 273 | if (!mvmvif->queue_params[ac].uapsd) | 273 | if (!mvmvif->queue_params[ac].uapsd) |
| 274 | continue; | 274 | continue; |
| 275 | 275 | ||
| 276 | cmd->flags |= cpu_to_le16(POWER_FLAGS_ADVANCE_PM_ENA_MSK); | 276 | if (mvm->cur_ucode != IWL_UCODE_WOWLAN) |
| 277 | cmd->flags |= | ||
| 278 | cpu_to_le16(POWER_FLAGS_ADVANCE_PM_ENA_MSK); | ||
| 279 | |||
| 277 | cmd->uapsd_ac_flags |= BIT(ac); | 280 | cmd->uapsd_ac_flags |= BIT(ac); |
| 278 | 281 | ||
| 279 | /* QNDP TID - the highest TID with no admission control */ | 282 | /* QNDP TID - the highest TID with no admission control */ |
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index 9a7ab8495300..621fb71f282a 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c | |||
| @@ -394,6 +394,11 @@ static bool iwl_mvm_scan_abort_notif(struct iwl_notif_wait_data *notif_wait, | |||
| 394 | return false; | 394 | return false; |
| 395 | } | 395 | } |
| 396 | 396 | ||
| 397 | /* | ||
| 398 | * If scan cannot be aborted, it means that we had a | ||
| 399 | * SCAN_COMPLETE_NOTIFICATION in the pipe and it called | ||
| 400 | * ieee80211_scan_completed already. | ||
| 401 | */ | ||
| 397 | IWL_DEBUG_SCAN(mvm, "Scan cannot be aborted, exit now: %d\n", | 402 | IWL_DEBUG_SCAN(mvm, "Scan cannot be aborted, exit now: %d\n", |
| 398 | *resp); | 403 | *resp); |
| 399 | return true; | 404 | return true; |
| @@ -417,14 +422,19 @@ void iwl_mvm_cancel_scan(struct iwl_mvm *mvm) | |||
| 417 | SCAN_COMPLETE_NOTIFICATION }; | 422 | SCAN_COMPLETE_NOTIFICATION }; |
| 418 | int ret; | 423 | int ret; |
| 419 | 424 | ||
| 425 | if (mvm->scan_status == IWL_MVM_SCAN_NONE) | ||
| 426 | return; | ||
| 427 | |||
| 420 | iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_abort, | 428 | iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_abort, |
| 421 | scan_abort_notif, | 429 | scan_abort_notif, |
| 422 | ARRAY_SIZE(scan_abort_notif), | 430 | ARRAY_SIZE(scan_abort_notif), |
| 423 | iwl_mvm_scan_abort_notif, NULL); | 431 | iwl_mvm_scan_abort_notif, NULL); |
| 424 | 432 | ||
| 425 | ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD, CMD_SYNC, 0, NULL); | 433 | ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD, |
| 434 | CMD_SYNC | CMD_SEND_IN_RFKILL, 0, NULL); | ||
| 426 | if (ret) { | 435 | if (ret) { |
| 427 | IWL_ERR(mvm, "Couldn't send SCAN_ABORT_CMD: %d\n", ret); | 436 | IWL_ERR(mvm, "Couldn't send SCAN_ABORT_CMD: %d\n", ret); |
| 437 | /* mac80211's state will be cleaned in the fw_restart flow */ | ||
| 428 | goto out_remove_notif; | 438 | goto out_remove_notif; |
| 429 | } | 439 | } |
| 430 | 440 | ||
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c index dc02cb9792af..26108a1a29fa 100644 --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c | |||
| @@ -139,13 +139,16 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { | |||
| 139 | 139 | ||
| 140 | /* 6x00 Series */ | 140 | /* 6x00 Series */ |
| 141 | {IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_3agn_cfg)}, | 141 | {IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_3agn_cfg)}, |
| 142 | {IWL_PCI_DEVICE(0x422B, 0x1108, iwl6000_3agn_cfg)}, | ||
| 142 | {IWL_PCI_DEVICE(0x422B, 0x1121, iwl6000_3agn_cfg)}, | 143 | {IWL_PCI_DEVICE(0x422B, 0x1121, iwl6000_3agn_cfg)}, |
| 144 | {IWL_PCI_DEVICE(0x422B, 0x1128, iwl6000_3agn_cfg)}, | ||
| 143 | {IWL_PCI_DEVICE(0x422C, 0x1301, iwl6000i_2agn_cfg)}, | 145 | {IWL_PCI_DEVICE(0x422C, 0x1301, iwl6000i_2agn_cfg)}, |
| 144 | {IWL_PCI_DEVICE(0x422C, 0x1306, iwl6000i_2abg_cfg)}, | 146 | {IWL_PCI_DEVICE(0x422C, 0x1306, iwl6000i_2abg_cfg)}, |
| 145 | {IWL_PCI_DEVICE(0x422C, 0x1307, iwl6000i_2bg_cfg)}, | 147 | {IWL_PCI_DEVICE(0x422C, 0x1307, iwl6000i_2bg_cfg)}, |
| 146 | {IWL_PCI_DEVICE(0x422C, 0x1321, iwl6000i_2agn_cfg)}, | 148 | {IWL_PCI_DEVICE(0x422C, 0x1321, iwl6000i_2agn_cfg)}, |
| 147 | {IWL_PCI_DEVICE(0x422C, 0x1326, iwl6000i_2abg_cfg)}, | 149 | {IWL_PCI_DEVICE(0x422C, 0x1326, iwl6000i_2abg_cfg)}, |
| 148 | {IWL_PCI_DEVICE(0x4238, 0x1111, iwl6000_3agn_cfg)}, | 150 | {IWL_PCI_DEVICE(0x4238, 0x1111, iwl6000_3agn_cfg)}, |
| 151 | {IWL_PCI_DEVICE(0x4238, 0x1118, iwl6000_3agn_cfg)}, | ||
| 149 | {IWL_PCI_DEVICE(0x4239, 0x1311, iwl6000i_2agn_cfg)}, | 152 | {IWL_PCI_DEVICE(0x4239, 0x1311, iwl6000i_2agn_cfg)}, |
| 150 | {IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)}, | 153 | {IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)}, |
| 151 | 154 | ||
| @@ -153,12 +156,16 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { | |||
| 153 | {IWL_PCI_DEVICE(0x0082, 0x1301, iwl6005_2agn_cfg)}, | 156 | {IWL_PCI_DEVICE(0x0082, 0x1301, iwl6005_2agn_cfg)}, |
| 154 | {IWL_PCI_DEVICE(0x0082, 0x1306, iwl6005_2abg_cfg)}, | 157 | {IWL_PCI_DEVICE(0x0082, 0x1306, iwl6005_2abg_cfg)}, |
| 155 | {IWL_PCI_DEVICE(0x0082, 0x1307, iwl6005_2bg_cfg)}, | 158 | {IWL_PCI_DEVICE(0x0082, 0x1307, iwl6005_2bg_cfg)}, |
| 159 | {IWL_PCI_DEVICE(0x0082, 0x1308, iwl6005_2agn_cfg)}, | ||
| 156 | {IWL_PCI_DEVICE(0x0082, 0x1321, iwl6005_2agn_cfg)}, | 160 | {IWL_PCI_DEVICE(0x0082, 0x1321, iwl6005_2agn_cfg)}, |
| 157 | {IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_2abg_cfg)}, | 161 | {IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_2abg_cfg)}, |
| 162 | {IWL_PCI_DEVICE(0x0082, 0x1328, iwl6005_2agn_cfg)}, | ||
| 158 | {IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)}, | 163 | {IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)}, |
| 164 | {IWL_PCI_DEVICE(0x0085, 0x1318, iwl6005_2agn_cfg)}, | ||
| 159 | {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)}, | 165 | {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)}, |
| 160 | {IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_2agn_sff_cfg)}, | 166 | {IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_2agn_sff_cfg)}, |
| 161 | {IWL_PCI_DEVICE(0x0085, 0xC220, iwl6005_2agn_sff_cfg)}, | 167 | {IWL_PCI_DEVICE(0x0085, 0xC220, iwl6005_2agn_sff_cfg)}, |
| 168 | {IWL_PCI_DEVICE(0x0085, 0xC228, iwl6005_2agn_sff_cfg)}, | ||
| 162 | {IWL_PCI_DEVICE(0x0082, 0x4820, iwl6005_2agn_d_cfg)}, | 169 | {IWL_PCI_DEVICE(0x0082, 0x4820, iwl6005_2agn_d_cfg)}, |
| 163 | {IWL_PCI_DEVICE(0x0082, 0x1304, iwl6005_2agn_mow1_cfg)},/* low 5GHz active */ | 170 | {IWL_PCI_DEVICE(0x0082, 0x1304, iwl6005_2agn_mow1_cfg)},/* low 5GHz active */ |
| 164 | {IWL_PCI_DEVICE(0x0082, 0x1305, iwl6005_2agn_mow2_cfg)},/* high 5GHz active */ | 171 | {IWL_PCI_DEVICE(0x0082, 0x1305, iwl6005_2agn_mow2_cfg)},/* high 5GHz active */ |
| @@ -240,8 +247,11 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { | |||
| 240 | 247 | ||
| 241 | /* 6x35 Series */ | 248 | /* 6x35 Series */ |
| 242 | {IWL_PCI_DEVICE(0x088E, 0x4060, iwl6035_2agn_cfg)}, | 249 | {IWL_PCI_DEVICE(0x088E, 0x4060, iwl6035_2agn_cfg)}, |
| 250 | {IWL_PCI_DEVICE(0x088E, 0x406A, iwl6035_2agn_sff_cfg)}, | ||
| 243 | {IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)}, | 251 | {IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)}, |
| 252 | {IWL_PCI_DEVICE(0x088F, 0x426A, iwl6035_2agn_sff_cfg)}, | ||
| 244 | {IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)}, | 253 | {IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)}, |
| 254 | {IWL_PCI_DEVICE(0x088E, 0x446A, iwl6035_2agn_sff_cfg)}, | ||
| 245 | {IWL_PCI_DEVICE(0x088E, 0x4860, iwl6035_2agn_cfg)}, | 255 | {IWL_PCI_DEVICE(0x088E, 0x4860, iwl6035_2agn_cfg)}, |
| 246 | {IWL_PCI_DEVICE(0x088F, 0x5260, iwl6035_2agn_cfg)}, | 256 | {IWL_PCI_DEVICE(0x088F, 0x5260, iwl6035_2agn_cfg)}, |
| 247 | 257 | ||
| @@ -260,54 +270,86 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { | |||
| 260 | #if IS_ENABLED(CONFIG_IWLMVM) | 270 | #if IS_ENABLED(CONFIG_IWLMVM) |
| 261 | /* 7000 Series */ | 271 | /* 7000 Series */ |
| 262 | {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)}, | 272 | {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)}, |
| 273 | {IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7260_2ac_cfg)}, | ||
| 263 | {IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)}, | 274 | {IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)}, |
| 264 | {IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)}, | 275 | {IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)}, |
| 276 | {IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7260_2n_cfg)}, | ||
| 265 | {IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)}, | 277 | {IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)}, |
| 266 | {IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)}, | 278 | {IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)}, |
| 267 | {IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)}, | 279 | {IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)}, |
| 268 | {IWL_PCI_DEVICE(0x08B2, 0x4270, iwl7260_2ac_cfg)}, | 280 | {IWL_PCI_DEVICE(0x08B2, 0x4270, iwl7260_2ac_cfg)}, |
| 281 | {IWL_PCI_DEVICE(0x08B2, 0x4272, iwl7260_2ac_cfg)}, | ||
| 269 | {IWL_PCI_DEVICE(0x08B2, 0x4260, iwl7260_2n_cfg)}, | 282 | {IWL_PCI_DEVICE(0x08B2, 0x4260, iwl7260_2n_cfg)}, |
| 283 | {IWL_PCI_DEVICE(0x08B2, 0x426A, iwl7260_2n_cfg)}, | ||
| 270 | {IWL_PCI_DEVICE(0x08B2, 0x4262, iwl7260_n_cfg)}, | 284 | {IWL_PCI_DEVICE(0x08B2, 0x4262, iwl7260_n_cfg)}, |
| 271 | {IWL_PCI_DEVICE(0x08B1, 0x4470, iwl7260_2ac_cfg)}, | 285 | {IWL_PCI_DEVICE(0x08B1, 0x4470, iwl7260_2ac_cfg)}, |
| 286 | {IWL_PCI_DEVICE(0x08B1, 0x4472, iwl7260_2ac_cfg)}, | ||
| 272 | {IWL_PCI_DEVICE(0x08B1, 0x4460, iwl7260_2n_cfg)}, | 287 | {IWL_PCI_DEVICE(0x08B1, 0x4460, iwl7260_2n_cfg)}, |
| 288 | {IWL_PCI_DEVICE(0x08B1, 0x446A, iwl7260_2n_cfg)}, | ||
| 273 | {IWL_PCI_DEVICE(0x08B1, 0x4462, iwl7260_n_cfg)}, | 289 | {IWL_PCI_DEVICE(0x08B1, 0x4462, iwl7260_n_cfg)}, |
| 274 | {IWL_PCI_DEVICE(0x08B1, 0x4870, iwl7260_2ac_cfg)}, | 290 | {IWL_PCI_DEVICE(0x08B1, 0x4870, iwl7260_2ac_cfg)}, |
| 275 | {IWL_PCI_DEVICE(0x08B1, 0x486E, iwl7260_2ac_cfg)}, | 291 | {IWL_PCI_DEVICE(0x08B1, 0x486E, iwl7260_2ac_cfg)}, |
| 276 | {IWL_PCI_DEVICE(0x08B1, 0x4A70, iwl7260_2ac_cfg_high_temp)}, | 292 | {IWL_PCI_DEVICE(0x08B1, 0x4A70, iwl7260_2ac_cfg_high_temp)}, |
| 277 | {IWL_PCI_DEVICE(0x08B1, 0x4A6E, iwl7260_2ac_cfg_high_temp)}, | 293 | {IWL_PCI_DEVICE(0x08B1, 0x4A6E, iwl7260_2ac_cfg_high_temp)}, |
| 278 | {IWL_PCI_DEVICE(0x08B1, 0x4A6C, iwl7260_2ac_cfg_high_temp)}, | 294 | {IWL_PCI_DEVICE(0x08B1, 0x4A6C, iwl7260_2ac_cfg_high_temp)}, |
| 295 | {IWL_PCI_DEVICE(0x08B1, 0x4570, iwl7260_2ac_cfg)}, | ||
| 296 | {IWL_PCI_DEVICE(0x08B1, 0x4560, iwl7260_2n_cfg)}, | ||
| 297 | {IWL_PCI_DEVICE(0x08B2, 0x4370, iwl7260_2ac_cfg)}, | ||
| 298 | {IWL_PCI_DEVICE(0x08B2, 0x4360, iwl7260_2n_cfg)}, | ||
| 299 | {IWL_PCI_DEVICE(0x08B1, 0x5070, iwl7260_2ac_cfg)}, | ||
| 279 | {IWL_PCI_DEVICE(0x08B1, 0x4020, iwl7260_2n_cfg)}, | 300 | {IWL_PCI_DEVICE(0x08B1, 0x4020, iwl7260_2n_cfg)}, |
| 301 | {IWL_PCI_DEVICE(0x08B1, 0x402A, iwl7260_2n_cfg)}, | ||
| 280 | {IWL_PCI_DEVICE(0x08B2, 0x4220, iwl7260_2n_cfg)}, | 302 | {IWL_PCI_DEVICE(0x08B2, 0x4220, iwl7260_2n_cfg)}, |
| 281 | {IWL_PCI_DEVICE(0x08B1, 0x4420, iwl7260_2n_cfg)}, | 303 | {IWL_PCI_DEVICE(0x08B1, 0x4420, iwl7260_2n_cfg)}, |
| 282 | {IWL_PCI_DEVICE(0x08B1, 0xC070, iwl7260_2ac_cfg)}, | 304 | {IWL_PCI_DEVICE(0x08B1, 0xC070, iwl7260_2ac_cfg)}, |
| 305 | {IWL_PCI_DEVICE(0x08B1, 0xC072, iwl7260_2ac_cfg)}, | ||
| 283 | {IWL_PCI_DEVICE(0x08B1, 0xC170, iwl7260_2ac_cfg)}, | 306 | {IWL_PCI_DEVICE(0x08B1, 0xC170, iwl7260_2ac_cfg)}, |
| 284 | {IWL_PCI_DEVICE(0x08B1, 0xC060, iwl7260_2n_cfg)}, | 307 | {IWL_PCI_DEVICE(0x08B1, 0xC060, iwl7260_2n_cfg)}, |
| 308 | {IWL_PCI_DEVICE(0x08B1, 0xC06A, iwl7260_2n_cfg)}, | ||
| 285 | {IWL_PCI_DEVICE(0x08B1, 0xC160, iwl7260_2n_cfg)}, | 309 | {IWL_PCI_DEVICE(0x08B1, 0xC160, iwl7260_2n_cfg)}, |
| 286 | {IWL_PCI_DEVICE(0x08B1, 0xC062, iwl7260_n_cfg)}, | 310 | {IWL_PCI_DEVICE(0x08B1, 0xC062, iwl7260_n_cfg)}, |
| 287 | {IWL_PCI_DEVICE(0x08B1, 0xC162, iwl7260_n_cfg)}, | 311 | {IWL_PCI_DEVICE(0x08B1, 0xC162, iwl7260_n_cfg)}, |
| 312 | {IWL_PCI_DEVICE(0x08B1, 0xC770, iwl7260_2ac_cfg)}, | ||
| 313 | {IWL_PCI_DEVICE(0x08B1, 0xC760, iwl7260_2n_cfg)}, | ||
| 288 | {IWL_PCI_DEVICE(0x08B2, 0xC270, iwl7260_2ac_cfg)}, | 314 | {IWL_PCI_DEVICE(0x08B2, 0xC270, iwl7260_2ac_cfg)}, |
| 315 | {IWL_PCI_DEVICE(0x08B2, 0xC272, iwl7260_2ac_cfg)}, | ||
| 289 | {IWL_PCI_DEVICE(0x08B2, 0xC260, iwl7260_2n_cfg)}, | 316 | {IWL_PCI_DEVICE(0x08B2, 0xC260, iwl7260_2n_cfg)}, |
| 317 | {IWL_PCI_DEVICE(0x08B2, 0xC26A, iwl7260_n_cfg)}, | ||
| 290 | {IWL_PCI_DEVICE(0x08B2, 0xC262, iwl7260_n_cfg)}, | 318 | {IWL_PCI_DEVICE(0x08B2, 0xC262, iwl7260_n_cfg)}, |
| 291 | {IWL_PCI_DEVICE(0x08B1, 0xC470, iwl7260_2ac_cfg)}, | 319 | {IWL_PCI_DEVICE(0x08B1, 0xC470, iwl7260_2ac_cfg)}, |
| 320 | {IWL_PCI_DEVICE(0x08B1, 0xC472, iwl7260_2ac_cfg)}, | ||
| 292 | {IWL_PCI_DEVICE(0x08B1, 0xC460, iwl7260_2n_cfg)}, | 321 | {IWL_PCI_DEVICE(0x08B1, 0xC460, iwl7260_2n_cfg)}, |
| 293 | {IWL_PCI_DEVICE(0x08B1, 0xC462, iwl7260_n_cfg)}, | 322 | {IWL_PCI_DEVICE(0x08B1, 0xC462, iwl7260_n_cfg)}, |
| 323 | {IWL_PCI_DEVICE(0x08B1, 0xC570, iwl7260_2ac_cfg)}, | ||
| 324 | {IWL_PCI_DEVICE(0x08B1, 0xC560, iwl7260_2n_cfg)}, | ||
| 325 | {IWL_PCI_DEVICE(0x08B2, 0xC370, iwl7260_2ac_cfg)}, | ||
| 326 | {IWL_PCI_DEVICE(0x08B1, 0xC360, iwl7260_2n_cfg)}, | ||
| 294 | {IWL_PCI_DEVICE(0x08B1, 0xC020, iwl7260_2n_cfg)}, | 327 | {IWL_PCI_DEVICE(0x08B1, 0xC020, iwl7260_2n_cfg)}, |
| 328 | {IWL_PCI_DEVICE(0x08B1, 0xC02A, iwl7260_2n_cfg)}, | ||
| 295 | {IWL_PCI_DEVICE(0x08B2, 0xC220, iwl7260_2n_cfg)}, | 329 | {IWL_PCI_DEVICE(0x08B2, 0xC220, iwl7260_2n_cfg)}, |
| 296 | {IWL_PCI_DEVICE(0x08B1, 0xC420, iwl7260_2n_cfg)}, | 330 | {IWL_PCI_DEVICE(0x08B1, 0xC420, iwl7260_2n_cfg)}, |
| 297 | 331 | ||
| 298 | /* 3160 Series */ | 332 | /* 3160 Series */ |
| 299 | {IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_2ac_cfg)}, | 333 | {IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_2ac_cfg)}, |
| 334 | {IWL_PCI_DEVICE(0x08B3, 0x0072, iwl3160_2ac_cfg)}, | ||
| 300 | {IWL_PCI_DEVICE(0x08B3, 0x0170, iwl3160_2ac_cfg)}, | 335 | {IWL_PCI_DEVICE(0x08B3, 0x0170, iwl3160_2ac_cfg)}, |
| 336 | {IWL_PCI_DEVICE(0x08B3, 0x0172, iwl3160_2ac_cfg)}, | ||
| 301 | {IWL_PCI_DEVICE(0x08B3, 0x0060, iwl3160_2n_cfg)}, | 337 | {IWL_PCI_DEVICE(0x08B3, 0x0060, iwl3160_2n_cfg)}, |
| 302 | {IWL_PCI_DEVICE(0x08B3, 0x0062, iwl3160_n_cfg)}, | 338 | {IWL_PCI_DEVICE(0x08B3, 0x0062, iwl3160_n_cfg)}, |
| 303 | {IWL_PCI_DEVICE(0x08B4, 0x0270, iwl3160_2ac_cfg)}, | 339 | {IWL_PCI_DEVICE(0x08B4, 0x0270, iwl3160_2ac_cfg)}, |
| 340 | {IWL_PCI_DEVICE(0x08B4, 0x0272, iwl3160_2ac_cfg)}, | ||
| 304 | {IWL_PCI_DEVICE(0x08B3, 0x0470, iwl3160_2ac_cfg)}, | 341 | {IWL_PCI_DEVICE(0x08B3, 0x0470, iwl3160_2ac_cfg)}, |
| 342 | {IWL_PCI_DEVICE(0x08B3, 0x0472, iwl3160_2ac_cfg)}, | ||
| 343 | {IWL_PCI_DEVICE(0x08B4, 0x0370, iwl3160_2ac_cfg)}, | ||
| 305 | {IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_2ac_cfg)}, | 344 | {IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_2ac_cfg)}, |
| 345 | {IWL_PCI_DEVICE(0x08B3, 0x8072, iwl3160_2ac_cfg)}, | ||
| 306 | {IWL_PCI_DEVICE(0x08B3, 0x8170, iwl3160_2ac_cfg)}, | 346 | {IWL_PCI_DEVICE(0x08B3, 0x8170, iwl3160_2ac_cfg)}, |
| 347 | {IWL_PCI_DEVICE(0x08B3, 0x8172, iwl3160_2ac_cfg)}, | ||
| 307 | {IWL_PCI_DEVICE(0x08B3, 0x8060, iwl3160_2n_cfg)}, | 348 | {IWL_PCI_DEVICE(0x08B3, 0x8060, iwl3160_2n_cfg)}, |
| 308 | {IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)}, | 349 | {IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)}, |
| 309 | {IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)}, | 350 | {IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)}, |
| 310 | {IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)}, | 351 | {IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)}, |
| 352 | {IWL_PCI_DEVICE(0x08B3, 0x8570, iwl3160_2ac_cfg)}, | ||
| 311 | #endif /* CONFIG_IWLMVM */ | 353 | #endif /* CONFIG_IWLMVM */ |
| 312 | 354 | ||
| 313 | {0} | 355 | {0} |
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c index bad95d28d50d..c3f904d422b0 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c | |||
| @@ -1401,6 +1401,10 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, | |||
| 1401 | spin_lock_init(&trans_pcie->reg_lock); | 1401 | spin_lock_init(&trans_pcie->reg_lock); |
| 1402 | init_waitqueue_head(&trans_pcie->ucode_write_waitq); | 1402 | init_waitqueue_head(&trans_pcie->ucode_write_waitq); |
| 1403 | 1403 | ||
| 1404 | err = pci_enable_device(pdev); | ||
| 1405 | if (err) | ||
| 1406 | goto out_no_pci; | ||
| 1407 | |||
| 1404 | if (!cfg->base_params->pcie_l1_allowed) { | 1408 | if (!cfg->base_params->pcie_l1_allowed) { |
| 1405 | /* | 1409 | /* |
| 1406 | * W/A - seems to solve weird behavior. We need to remove this | 1410 | * W/A - seems to solve weird behavior. We need to remove this |
| @@ -1412,10 +1416,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, | |||
| 1412 | PCIE_LINK_STATE_CLKPM); | 1416 | PCIE_LINK_STATE_CLKPM); |
| 1413 | } | 1417 | } |
| 1414 | 1418 | ||
| 1415 | err = pci_enable_device(pdev); | ||
| 1416 | if (err) | ||
| 1417 | goto out_no_pci; | ||
| 1418 | |||
| 1419 | pci_set_master(pdev); | 1419 | pci_set_master(pdev); |
| 1420 | 1420 | ||
| 1421 | err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36)); | 1421 | err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36)); |
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c index f45eb29c2ede..1424335163b9 100644 --- a/drivers/net/wireless/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/iwlwifi/pcie/tx.c | |||
| @@ -1102,6 +1102,8 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo, | |||
| 1102 | * non-AGG queue. | 1102 | * non-AGG queue. |
| 1103 | */ | 1103 | */ |
| 1104 | iwl_clear_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id)); | 1104 | iwl_clear_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id)); |
| 1105 | |||
| 1106 | ssn = trans_pcie->txq[txq_id].q.read_ptr; | ||
| 1105 | } | 1107 | } |
| 1106 | 1108 | ||
| 1107 | /* Place first TFD at index corresponding to start sequence number. | 1109 | /* Place first TFD at index corresponding to start sequence number. |
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c index 9d7c0e6c4fc7..37f873bb342f 100644 --- a/drivers/net/wireless/mwifiex/join.c +++ b/drivers/net/wireless/mwifiex/join.c | |||
| @@ -1422,13 +1422,19 @@ static int mwifiex_deauthenticate_infra(struct mwifiex_private *priv, u8 *mac) | |||
| 1422 | */ | 1422 | */ |
| 1423 | int mwifiex_deauthenticate(struct mwifiex_private *priv, u8 *mac) | 1423 | int mwifiex_deauthenticate(struct mwifiex_private *priv, u8 *mac) |
| 1424 | { | 1424 | { |
| 1425 | int ret = 0; | ||
| 1426 | |||
| 1425 | if (!priv->media_connected) | 1427 | if (!priv->media_connected) |
| 1426 | return 0; | 1428 | return 0; |
| 1427 | 1429 | ||
| 1428 | switch (priv->bss_mode) { | 1430 | switch (priv->bss_mode) { |
| 1429 | case NL80211_IFTYPE_STATION: | 1431 | case NL80211_IFTYPE_STATION: |
| 1430 | case NL80211_IFTYPE_P2P_CLIENT: | 1432 | case NL80211_IFTYPE_P2P_CLIENT: |
| 1431 | return mwifiex_deauthenticate_infra(priv, mac); | 1433 | ret = mwifiex_deauthenticate_infra(priv, mac); |
| 1434 | if (ret) | ||
| 1435 | cfg80211_disconnected(priv->netdev, 0, NULL, 0, | ||
| 1436 | GFP_KERNEL); | ||
| 1437 | break; | ||
| 1432 | case NL80211_IFTYPE_ADHOC: | 1438 | case NL80211_IFTYPE_ADHOC: |
| 1433 | return mwifiex_send_cmd_sync(priv, | 1439 | return mwifiex_send_cmd_sync(priv, |
| 1434 | HostCmd_CMD_802_11_AD_HOC_STOP, | 1440 | HostCmd_CMD_802_11_AD_HOC_STOP, |
| @@ -1440,7 +1446,7 @@ int mwifiex_deauthenticate(struct mwifiex_private *priv, u8 *mac) | |||
| 1440 | break; | 1446 | break; |
| 1441 | } | 1447 | } |
| 1442 | 1448 | ||
| 1443 | return 0; | 1449 | return ret; |
| 1444 | } | 1450 | } |
| 1445 | EXPORT_SYMBOL_GPL(mwifiex_deauthenticate); | 1451 | EXPORT_SYMBOL_GPL(mwifiex_deauthenticate); |
| 1446 | 1452 | ||
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index fd778337deee..c2b91f566e05 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c | |||
| @@ -358,10 +358,12 @@ process_start: | |||
| 358 | } | 358 | } |
| 359 | } while (true); | 359 | } while (true); |
| 360 | 360 | ||
| 361 | if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter)) | 361 | spin_lock_irqsave(&adapter->main_proc_lock, flags); |
| 362 | if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter)) { | ||
| 363 | spin_unlock_irqrestore(&adapter->main_proc_lock, flags); | ||
| 362 | goto process_start; | 364 | goto process_start; |
| 365 | } | ||
| 363 | 366 | ||
| 364 | spin_lock_irqsave(&adapter->main_proc_lock, flags); | ||
| 365 | adapter->mwifiex_processing = false; | 367 | adapter->mwifiex_processing = false; |
| 366 | spin_unlock_irqrestore(&adapter->main_proc_lock, flags); | 368 | spin_unlock_irqrestore(&adapter->main_proc_lock, flags); |
| 367 | 369 | ||
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c index 8b057524b252..8c351f71f72f 100644 --- a/drivers/net/wireless/mwifiex/sta_event.c +++ b/drivers/net/wireless/mwifiex/sta_event.c | |||
| @@ -118,7 +118,8 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code) | |||
| 118 | dev_dbg(adapter->dev, | 118 | dev_dbg(adapter->dev, |
| 119 | "info: successfully disconnected from %pM: reason code %d\n", | 119 | "info: successfully disconnected from %pM: reason code %d\n", |
| 120 | priv->cfg_bssid, reason_code); | 120 | priv->cfg_bssid, reason_code); |
| 121 | if (priv->bss_mode == NL80211_IFTYPE_STATION) { | 121 | if (priv->bss_mode == NL80211_IFTYPE_STATION || |
| 122 | priv->bss_mode == NL80211_IFTYPE_P2P_CLIENT) { | ||
| 122 | cfg80211_disconnected(priv->netdev, reason_code, NULL, 0, | 123 | cfg80211_disconnected(priv->netdev, reason_code, NULL, 0, |
| 123 | GFP_KERNEL); | 124 | GFP_KERNEL); |
| 124 | } | 125 | } |
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 76d95deb274b..dc49e525ae5e 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c | |||
| @@ -105,13 +105,11 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops) | |||
| 105 | goto exit_release_regions; | 105 | goto exit_release_regions; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | pci_enable_msi(pci_dev); | ||
| 109 | |||
| 110 | hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw); | 108 | hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw); |
| 111 | if (!hw) { | 109 | if (!hw) { |
| 112 | rt2x00_probe_err("Failed to allocate hardware\n"); | 110 | rt2x00_probe_err("Failed to allocate hardware\n"); |
| 113 | retval = -ENOMEM; | 111 | retval = -ENOMEM; |
| 114 | goto exit_disable_msi; | 112 | goto exit_release_regions; |
| 115 | } | 113 | } |
| 116 | 114 | ||
| 117 | pci_set_drvdata(pci_dev, hw); | 115 | pci_set_drvdata(pci_dev, hw); |
| @@ -152,9 +150,6 @@ exit_free_reg: | |||
| 152 | exit_free_device: | 150 | exit_free_device: |
| 153 | ieee80211_free_hw(hw); | 151 | ieee80211_free_hw(hw); |
| 154 | 152 | ||
| 155 | exit_disable_msi: | ||
| 156 | pci_disable_msi(pci_dev); | ||
| 157 | |||
| 158 | exit_release_regions: | 153 | exit_release_regions: |
| 159 | pci_release_regions(pci_dev); | 154 | pci_release_regions(pci_dev); |
| 160 | 155 | ||
| @@ -179,8 +174,6 @@ void rt2x00pci_remove(struct pci_dev *pci_dev) | |||
| 179 | rt2x00pci_free_reg(rt2x00dev); | 174 | rt2x00pci_free_reg(rt2x00dev); |
| 180 | ieee80211_free_hw(hw); | 175 | ieee80211_free_hw(hw); |
| 181 | 176 | ||
| 182 | pci_disable_msi(pci_dev); | ||
| 183 | |||
| 184 | /* | 177 | /* |
| 185 | * Free the PCI device data. | 178 | * Free the PCI device data. |
| 186 | */ | 179 | */ |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c index 763cf1defab5..5a060e537fbe 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | |||
| @@ -343,7 +343,8 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw, | |||
| 343 | (bool)GET_RX_DESC_PAGGR(pdesc)); | 343 | (bool)GET_RX_DESC_PAGGR(pdesc)); |
| 344 | rx_status->mactime = GET_RX_DESC_TSFL(pdesc); | 344 | rx_status->mactime = GET_RX_DESC_TSFL(pdesc); |
| 345 | if (phystatus) { | 345 | if (phystatus) { |
| 346 | p_drvinfo = (struct rx_fwinfo_92c *)(pdesc + RTL_RX_DESC_SIZE); | 346 | p_drvinfo = (struct rx_fwinfo_92c *)(skb->data + |
| 347 | stats->rx_bufshift); | ||
| 347 | rtl92c_translate_rx_signal_stuff(hw, skb, stats, pdesc, | 348 | rtl92c_translate_rx_signal_stuff(hw, skb, stats, pdesc, |
| 348 | p_drvinfo); | 349 | p_drvinfo); |
| 349 | } | 350 | } |
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index b45bce20ad76..1b08d8798372 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c | |||
| @@ -39,11 +39,15 @@ static int connect_rings(struct backend_info *); | |||
| 39 | static void connect(struct backend_info *); | 39 | static void connect(struct backend_info *); |
| 40 | static void backend_create_xenvif(struct backend_info *be); | 40 | static void backend_create_xenvif(struct backend_info *be); |
| 41 | static void unregister_hotplug_status_watch(struct backend_info *be); | 41 | static void unregister_hotplug_status_watch(struct backend_info *be); |
| 42 | static void set_backend_state(struct backend_info *be, | ||
| 43 | enum xenbus_state state); | ||
| 42 | 44 | ||
| 43 | static int netback_remove(struct xenbus_device *dev) | 45 | static int netback_remove(struct xenbus_device *dev) |
| 44 | { | 46 | { |
| 45 | struct backend_info *be = dev_get_drvdata(&dev->dev); | 47 | struct backend_info *be = dev_get_drvdata(&dev->dev); |
| 46 | 48 | ||
| 49 | set_backend_state(be, XenbusStateClosed); | ||
| 50 | |||
| 47 | unregister_hotplug_status_watch(be); | 51 | unregister_hotplug_status_watch(be); |
| 48 | if (be->vif) { | 52 | if (be->vif) { |
| 49 | kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE); | 53 | kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE); |
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 9d2009a9004d..78cc76053328 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig | |||
| @@ -74,10 +74,4 @@ config OF_MTD | |||
| 74 | depends on MTD | 74 | depends on MTD |
| 75 | def_bool y | 75 | def_bool y |
| 76 | 76 | ||
| 77 | config OF_RESERVED_MEM | ||
| 78 | depends on OF_FLATTREE && (DMA_CMA || (HAVE_GENERIC_DMA_COHERENT && HAVE_MEMBLOCK)) | ||
| 79 | def_bool y | ||
| 80 | help | ||
| 81 | Initialization code for DMA reserved memory | ||
| 82 | |||
| 83 | endmenu # OF | 77 | endmenu # OF |
diff --git a/drivers/of/Makefile b/drivers/of/Makefile index ed9660adad77..efd05102c405 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile | |||
| @@ -9,4 +9,3 @@ obj-$(CONFIG_OF_MDIO) += of_mdio.o | |||
| 9 | obj-$(CONFIG_OF_PCI) += of_pci.o | 9 | obj-$(CONFIG_OF_PCI) += of_pci.o |
| 10 | obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o | 10 | obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o |
| 11 | obj-$(CONFIG_OF_MTD) += of_mtd.o | 11 | obj-$(CONFIG_OF_MTD) += of_mtd.o |
| 12 | obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o | ||
diff --git a/drivers/of/base.c b/drivers/of/base.c index 865d3f66c86b..7d4c70f859e3 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c | |||
| @@ -303,10 +303,8 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread) | |||
| 303 | struct device_node *cpun, *cpus; | 303 | struct device_node *cpun, *cpus; |
| 304 | 304 | ||
| 305 | cpus = of_find_node_by_path("/cpus"); | 305 | cpus = of_find_node_by_path("/cpus"); |
| 306 | if (!cpus) { | 306 | if (!cpus) |
| 307 | pr_warn("Missing cpus node, bailing out\n"); | ||
| 308 | return NULL; | 307 | return NULL; |
| 309 | } | ||
| 310 | 308 | ||
| 311 | for_each_child_of_node(cpus, cpun) { | 309 | for_each_child_of_node(cpus, cpun) { |
| 312 | if (of_node_cmp(cpun->type, "cpu")) | 310 | if (of_node_cmp(cpun->type, "cpu")) |
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 229dd9d69e18..a4fa9ad31b8f 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 19 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
| 21 | #include <linux/random.h> | ||
| 22 | 21 | ||
| 23 | #include <asm/setup.h> /* for COMMAND_LINE_SIZE */ | 22 | #include <asm/setup.h> /* for COMMAND_LINE_SIZE */ |
| 24 | #ifdef CONFIG_PPC | 23 | #ifdef CONFIG_PPC |
| @@ -803,14 +802,3 @@ void __init unflatten_device_tree(void) | |||
| 803 | } | 802 | } |
| 804 | 803 | ||
| 805 | #endif /* CONFIG_OF_EARLY_FLATTREE */ | 804 | #endif /* CONFIG_OF_EARLY_FLATTREE */ |
| 806 | |||
| 807 | /* Feed entire flattened device tree into the random pool */ | ||
| 808 | static int __init add_fdt_randomness(void) | ||
| 809 | { | ||
| 810 | if (initial_boot_params) | ||
| 811 | add_device_randomness(initial_boot_params, | ||
| 812 | be32_to_cpu(initial_boot_params->totalsize)); | ||
| 813 | |||
| 814 | return 0; | ||
| 815 | } | ||
| 816 | core_initcall(add_fdt_randomness); | ||
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c deleted file mode 100644 index 0fe40c7d6904..000000000000 --- a/drivers/of/of_reserved_mem.c +++ /dev/null | |||
| @@ -1,173 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Device tree based initialization code for reserved memory. | ||
| 3 | * | ||
| 4 | * Copyright (c) 2013 Samsung Electronics Co., Ltd. | ||
| 5 | * http://www.samsung.com | ||
| 6 | * Author: Marek Szyprowski <m.szyprowski@samsung.com> | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or | ||
| 9 | * modify it under the terms of the GNU General Public License as | ||
| 10 | * published by the Free Software Foundation; either version 2 of the | ||
| 11 | * License or (at your optional) any later version of the license. | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/memblock.h> | ||
| 15 | #include <linux/err.h> | ||
| 16 | #include <linux/of.h> | ||
| 17 | #include <linux/of_fdt.h> | ||
| 18 | #include <linux/of_platform.h> | ||
| 19 | #include <linux/mm.h> | ||
| 20 | #include <linux/sizes.h> | ||
| 21 | #include <linux/mm_types.h> | ||
| 22 | #include <linux/dma-contiguous.h> | ||
| 23 | #include <linux/dma-mapping.h> | ||
| 24 | #include <linux/of_reserved_mem.h> | ||
| 25 | |||
| 26 | #define MAX_RESERVED_REGIONS 16 | ||
| 27 | struct reserved_mem { | ||
| 28 | phys_addr_t base; | ||
| 29 | unsigned long size; | ||
| 30 | struct cma *cma; | ||
| 31 | char name[32]; | ||
| 32 | }; | ||
| 33 | static struct reserved_mem reserved_mem[MAX_RESERVED_REGIONS]; | ||
| 34 | static int reserved_mem_count; | ||
| 35 | |||
| 36 | static int __init fdt_scan_reserved_mem(unsigned long node, const char *uname, | ||
| 37 | int depth, void *data) | ||
| 38 | { | ||
| 39 | struct reserved_mem *rmem = &reserved_mem[reserved_mem_count]; | ||
| 40 | phys_addr_t base, size; | ||
| 41 | int is_cma, is_reserved; | ||
| 42 | unsigned long len; | ||
| 43 | const char *status; | ||
| 44 | __be32 *prop; | ||
| 45 | |||
| 46 | is_cma = IS_ENABLED(CONFIG_DMA_CMA) && | ||
| 47 | of_flat_dt_is_compatible(node, "linux,contiguous-memory-region"); | ||
| 48 | is_reserved = of_flat_dt_is_compatible(node, "reserved-memory-region"); | ||
| 49 | |||
| 50 | if (!is_reserved && !is_cma) { | ||
| 51 | /* ignore node and scan next one */ | ||
| 52 | return 0; | ||
| 53 | } | ||
| 54 | |||
| 55 | status = of_get_flat_dt_prop(node, "status", &len); | ||
| 56 | if (status && strcmp(status, "okay") != 0) { | ||
| 57 | /* ignore disabled node nad scan next one */ | ||
| 58 | return 0; | ||
| 59 | } | ||
| 60 | |||
| 61 | prop = of_get_flat_dt_prop(node, "reg", &len); | ||
| 62 | if (!prop || (len < (dt_root_size_cells + dt_root_addr_cells) * | ||
| 63 | sizeof(__be32))) { | ||
| 64 | pr_err("Reserved mem: node %s, incorrect \"reg\" property\n", | ||
| 65 | uname); | ||
| 66 | /* ignore node and scan next one */ | ||
| 67 | return 0; | ||
| 68 | } | ||
| 69 | base = dt_mem_next_cell(dt_root_addr_cells, &prop); | ||
| 70 | size = dt_mem_next_cell(dt_root_size_cells, &prop); | ||
| 71 | |||
| 72 | if (!size) { | ||
| 73 | /* ignore node and scan next one */ | ||
| 74 | return 0; | ||
| 75 | } | ||
| 76 | |||
| 77 | pr_info("Reserved mem: found %s, memory base %lx, size %ld MiB\n", | ||
| 78 | uname, (unsigned long)base, (unsigned long)size / SZ_1M); | ||
| 79 | |||
| 80 | if (reserved_mem_count == ARRAY_SIZE(reserved_mem)) | ||
| 81 | return -ENOSPC; | ||
| 82 | |||
| 83 | rmem->base = base; | ||
| 84 | rmem->size = size; | ||
| 85 | strlcpy(rmem->name, uname, sizeof(rmem->name)); | ||
| 86 | |||
| 87 | if (is_cma) { | ||
| 88 | struct cma *cma; | ||
| 89 | if (dma_contiguous_reserve_area(size, base, 0, &cma) == 0) { | ||
| 90 | rmem->cma = cma; | ||
| 91 | reserved_mem_count++; | ||
| 92 | if (of_get_flat_dt_prop(node, | ||
| 93 | "linux,default-contiguous-region", | ||
| 94 | NULL)) | ||
| 95 | dma_contiguous_set_default(cma); | ||
| 96 | } | ||
| 97 | } else if (is_reserved) { | ||
| 98 | if (memblock_remove(base, size) == 0) | ||
| 99 | reserved_mem_count++; | ||
| 100 | else | ||
| 101 | pr_err("Failed to reserve memory for %s\n", uname); | ||
| 102 | } | ||
| 103 | |||
| 104 | return 0; | ||
| 105 | } | ||
| 106 | |||
| 107 | static struct reserved_mem *get_dma_memory_region(struct device *dev) | ||
| 108 | { | ||
| 109 | struct device_node *node; | ||
| 110 | const char *name; | ||
| 111 | int i; | ||
| 112 | |||
| 113 | node = of_parse_phandle(dev->of_node, "memory-region", 0); | ||
| 114 | if (!node) | ||
| 115 | return NULL; | ||
| 116 | |||
| 117 | name = kbasename(node->full_name); | ||
| 118 | for (i = 0; i < reserved_mem_count; i++) | ||
| 119 | if (strcmp(name, reserved_mem[i].name) == 0) | ||
| 120 | return &reserved_mem[i]; | ||
| 121 | return NULL; | ||
| 122 | } | ||
| 123 | |||
| 124 | /** | ||
| 125 | * of_reserved_mem_device_init() - assign reserved memory region to given device | ||
| 126 | * | ||
| 127 | * This function assign memory region pointed by "memory-region" device tree | ||
| 128 | * property to the given device. | ||
| 129 | */ | ||
| 130 | void of_reserved_mem_device_init(struct device *dev) | ||
| 131 | { | ||
| 132 | struct reserved_mem *region = get_dma_memory_region(dev); | ||
| 133 | if (!region) | ||
| 134 | return; | ||
| 135 | |||
| 136 | if (region->cma) { | ||
| 137 | dev_set_cma_area(dev, region->cma); | ||
| 138 | pr_info("Assigned CMA %s to %s device\n", region->name, | ||
| 139 | dev_name(dev)); | ||
| 140 | } else { | ||
| 141 | if (dma_declare_coherent_memory(dev, region->base, region->base, | ||
| 142 | region->size, DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE) != 0) | ||
| 143 | pr_info("Declared reserved memory %s to %s device\n", | ||
| 144 | region->name, dev_name(dev)); | ||
| 145 | } | ||
| 146 | } | ||
| 147 | |||
| 148 | /** | ||
| 149 | * of_reserved_mem_device_release() - release reserved memory device structures | ||
| 150 | * | ||
| 151 | * This function releases structures allocated for memory region handling for | ||
| 152 | * the given device. | ||
| 153 | */ | ||
| 154 | void of_reserved_mem_device_release(struct device *dev) | ||
| 155 | { | ||
| 156 | struct reserved_mem *region = get_dma_memory_region(dev); | ||
| 157 | if (!region && !region->cma) | ||
| 158 | dma_release_declared_memory(dev); | ||
| 159 | } | ||
| 160 | |||
| 161 | /** | ||
| 162 | * early_init_dt_scan_reserved_mem() - create reserved memory regions | ||
| 163 | * | ||
| 164 | * This function grabs memory from early allocator for device exclusive use | ||
| 165 | * defined in device tree structures. It should be called by arch specific code | ||
| 166 | * once the early allocator (memblock) has been activated and all other | ||
| 167 | * subsystems have already allocated/reserved memory. | ||
| 168 | */ | ||
| 169 | void __init early_init_dt_scan_reserved_mem(void) | ||
| 170 | { | ||
| 171 | of_scan_flat_dt_by_path("/memory/reserved-memory", | ||
| 172 | fdt_scan_reserved_mem, NULL); | ||
| 173 | } | ||
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 9b439ac63d8e..f6dcde220821 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/of_device.h> | 21 | #include <linux/of_device.h> |
| 22 | #include <linux/of_irq.h> | 22 | #include <linux/of_irq.h> |
| 23 | #include <linux/of_platform.h> | 23 | #include <linux/of_platform.h> |
| 24 | #include <linux/of_reserved_mem.h> | ||
| 25 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 26 | 25 | ||
| 27 | const struct of_device_id of_default_bus_match_table[] = { | 26 | const struct of_device_id of_default_bus_match_table[] = { |
| @@ -219,8 +218,6 @@ static struct platform_device *of_platform_device_create_pdata( | |||
| 219 | dev->dev.bus = &platform_bus_type; | 218 | dev->dev.bus = &platform_bus_type; |
| 220 | dev->dev.platform_data = platform_data; | 219 | dev->dev.platform_data = platform_data; |
| 221 | 220 | ||
| 222 | of_reserved_mem_device_init(&dev->dev); | ||
| 223 | |||
| 224 | /* We do not fill the DMA ops for platform devices by default. | 221 | /* We do not fill the DMA ops for platform devices by default. |
| 225 | * This is currently the responsibility of the platform code | 222 | * This is currently the responsibility of the platform code |
| 226 | * to do such, possibly using a device notifier | 223 | * to do such, possibly using a device notifier |
| @@ -228,7 +225,6 @@ static struct platform_device *of_platform_device_create_pdata( | |||
| 228 | 225 | ||
| 229 | if (of_device_add(dev) != 0) { | 226 | if (of_device_add(dev) != 0) { |
| 230 | platform_device_put(dev); | 227 | platform_device_put(dev); |
| 231 | of_reserved_mem_device_release(&dev->dev); | ||
| 232 | return NULL; | 228 | return NULL; |
| 233 | } | 229 | } |
| 234 | 230 | ||
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c index 2a47e82821da..5440131cd4ee 100644 --- a/drivers/pci/hotplug/acpi_pcihp.c +++ b/drivers/pci/hotplug/acpi_pcihp.c | |||
| @@ -411,13 +411,10 @@ EXPORT_SYMBOL(acpi_get_hp_hw_control_from_firmware); | |||
| 411 | static int pcihp_is_ejectable(acpi_handle handle) | 411 | static int pcihp_is_ejectable(acpi_handle handle) |
| 412 | { | 412 | { |
| 413 | acpi_status status; | 413 | acpi_status status; |
| 414 | acpi_handle tmp; | ||
| 415 | unsigned long long removable; | 414 | unsigned long long removable; |
| 416 | status = acpi_get_handle(handle, "_ADR", &tmp); | 415 | if (!acpi_has_method(handle, "_ADR")) |
| 417 | if (ACPI_FAILURE(status)) | ||
| 418 | return 0; | 416 | return 0; |
| 419 | status = acpi_get_handle(handle, "_EJ0", &tmp); | 417 | if (acpi_has_method(handle, "_EJ0")) |
| 420 | if (ACPI_SUCCESS(status)) | ||
| 421 | return 1; | 418 | return 1; |
| 422 | status = acpi_evaluate_integer(handle, "_RMV", NULL, &removable); | 419 | status = acpi_evaluate_integer(handle, "_RMV", NULL, &removable); |
| 423 | if (ACPI_SUCCESS(status) && removable) | 420 | if (ACPI_SUCCESS(status) && removable) |
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 0b7d23b4ad95..be12fbfcae10 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
| @@ -994,14 +994,16 @@ void acpiphp_enumerate_slots(struct pci_bus *bus) | |||
| 994 | 994 | ||
| 995 | /* | 995 | /* |
| 996 | * This bridge should have been registered as a hotplug function | 996 | * This bridge should have been registered as a hotplug function |
| 997 | * under its parent, so the context has to be there. If not, we | 997 | * under its parent, so the context should be there, unless the |
| 998 | * are in deep goo. | 998 | * parent is going to be handled by pciehp, in which case this |
| 999 | * bridge is not interesting to us either. | ||
| 999 | */ | 1000 | */ |
| 1000 | mutex_lock(&acpiphp_context_lock); | 1001 | mutex_lock(&acpiphp_context_lock); |
| 1001 | context = acpiphp_get_context(handle); | 1002 | context = acpiphp_get_context(handle); |
| 1002 | if (WARN_ON(!context)) { | 1003 | if (!context) { |
| 1003 | mutex_unlock(&acpiphp_context_lock); | 1004 | mutex_unlock(&acpiphp_context_lock); |
| 1004 | put_device(&bus->dev); | 1005 | put_device(&bus->dev); |
| 1006 | pci_dev_put(bridge->pci_dev); | ||
| 1005 | kfree(bridge); | 1007 | kfree(bridge); |
| 1006 | return; | 1008 | return; |
| 1007 | } | 1009 | } |
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index b0299e6d9a3f..dfd1f59de729 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c | |||
| @@ -181,7 +181,6 @@ static bool acpi_pci_power_manageable(struct pci_dev *dev) | |||
| 181 | static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state) | 181 | static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state) |
| 182 | { | 182 | { |
| 183 | acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev); | 183 | acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev); |
| 184 | acpi_handle tmp; | ||
| 185 | static const u8 state_conv[] = { | 184 | static const u8 state_conv[] = { |
| 186 | [PCI_D0] = ACPI_STATE_D0, | 185 | [PCI_D0] = ACPI_STATE_D0, |
| 187 | [PCI_D1] = ACPI_STATE_D1, | 186 | [PCI_D1] = ACPI_STATE_D1, |
| @@ -192,7 +191,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state) | |||
| 192 | int error = -EINVAL; | 191 | int error = -EINVAL; |
| 193 | 192 | ||
| 194 | /* If the ACPI device has _EJ0, ignore the device */ | 193 | /* If the ACPI device has _EJ0, ignore the device */ |
| 195 | if (!handle || ACPI_SUCCESS(acpi_get_handle(handle, "_EJ0", &tmp))) | 194 | if (!handle || acpi_has_method(handle, "_EJ0")) |
| 196 | return -ENODEV; | 195 | return -ENODEV; |
| 197 | 196 | ||
| 198 | switch (state) { | 197 | switch (state) { |
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 96d6b2eef4f2..b51a7460cc49 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
| @@ -504,6 +504,7 @@ config ASUS_WMI | |||
| 504 | depends on BACKLIGHT_CLASS_DEVICE | 504 | depends on BACKLIGHT_CLASS_DEVICE |
| 505 | depends on RFKILL || RFKILL = n | 505 | depends on RFKILL || RFKILL = n |
| 506 | depends on HOTPLUG_PCI | 506 | depends on HOTPLUG_PCI |
| 507 | depends on ACPI_VIDEO || ACPI_VIDEO = n | ||
| 507 | select INPUT_SPARSEKMAP | 508 | select INPUT_SPARSEKMAP |
| 508 | select LEDS_CLASS | 509 | select LEDS_CLASS |
| 509 | select NEW_LEDS | 510 | select NEW_LEDS |
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index a6afd4108beb..aefcc32e5634 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c | |||
| @@ -190,16 +190,10 @@ struct eeepc_laptop { | |||
| 190 | */ | 190 | */ |
| 191 | static int write_acpi_int(acpi_handle handle, const char *method, int val) | 191 | static int write_acpi_int(acpi_handle handle, const char *method, int val) |
| 192 | { | 192 | { |
| 193 | struct acpi_object_list params; | ||
| 194 | union acpi_object in_obj; | ||
| 195 | acpi_status status; | 193 | acpi_status status; |
| 196 | 194 | ||
| 197 | params.count = 1; | 195 | status = acpi_execute_simple_method(handle, (char *)method, val); |
| 198 | params.pointer = &in_obj; | ||
| 199 | in_obj.type = ACPI_TYPE_INTEGER; | ||
| 200 | in_obj.integer.value = val; | ||
| 201 | 196 | ||
| 202 | status = acpi_evaluate_object(handle, (char *)method, ¶ms, NULL); | ||
| 203 | return (status == AE_OK ? 0 : -1); | 197 | return (status == AE_OK ? 0 : -1); |
| 204 | } | 198 | } |
| 205 | 199 | ||
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 52b8a97efde1..9d30d69aa78f 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c | |||
| @@ -219,8 +219,7 @@ static int call_fext_func(int cmd, int arg0, int arg1, int arg2) | |||
| 219 | { .type = ACPI_TYPE_INTEGER } | 219 | { .type = ACPI_TYPE_INTEGER } |
| 220 | }; | 220 | }; |
| 221 | struct acpi_object_list arg_list = { 4, ¶ms[0] }; | 221 | struct acpi_object_list arg_list = { 4, ¶ms[0] }; |
| 222 | struct acpi_buffer output; | 222 | unsigned long long value; |
| 223 | union acpi_object out_obj; | ||
| 224 | acpi_handle handle = NULL; | 223 | acpi_handle handle = NULL; |
| 225 | 224 | ||
| 226 | status = acpi_get_handle(fujitsu_hotkey->acpi_handle, "FUNC", &handle); | 225 | status = acpi_get_handle(fujitsu_hotkey->acpi_handle, "FUNC", &handle); |
| @@ -235,10 +234,7 @@ static int call_fext_func(int cmd, int arg0, int arg1, int arg2) | |||
| 235 | params[2].integer.value = arg1; | 234 | params[2].integer.value = arg1; |
| 236 | params[3].integer.value = arg2; | 235 | params[3].integer.value = arg2; |
| 237 | 236 | ||
| 238 | output.length = sizeof(out_obj); | 237 | status = acpi_evaluate_integer(handle, NULL, &arg_list, &value); |
| 239 | output.pointer = &out_obj; | ||
| 240 | |||
| 241 | status = acpi_evaluate_object(handle, NULL, &arg_list, &output); | ||
| 242 | if (ACPI_FAILURE(status)) { | 238 | if (ACPI_FAILURE(status)) { |
| 243 | vdbg_printk(FUJLAPTOP_DBG_WARN, | 239 | vdbg_printk(FUJLAPTOP_DBG_WARN, |
| 244 | "FUNC 0x%x (args 0x%x, 0x%x, 0x%x) call failed\n", | 240 | "FUNC 0x%x (args 0x%x, 0x%x, 0x%x) call failed\n", |
| @@ -246,18 +242,10 @@ static int call_fext_func(int cmd, int arg0, int arg1, int arg2) | |||
| 246 | return -ENODEV; | 242 | return -ENODEV; |
| 247 | } | 243 | } |
| 248 | 244 | ||
| 249 | if (out_obj.type != ACPI_TYPE_INTEGER) { | ||
| 250 | vdbg_printk(FUJLAPTOP_DBG_WARN, | ||
| 251 | "FUNC 0x%x (args 0x%x, 0x%x, 0x%x) did not " | ||
| 252 | "return an integer\n", | ||
| 253 | cmd, arg0, arg1, arg2); | ||
| 254 | return -ENODEV; | ||
| 255 | } | ||
| 256 | |||
| 257 | vdbg_printk(FUJLAPTOP_DBG_TRACE, | 245 | vdbg_printk(FUJLAPTOP_DBG_TRACE, |
| 258 | "FUNC 0x%x (args 0x%x, 0x%x, 0x%x) returned 0x%x\n", | 246 | "FUNC 0x%x (args 0x%x, 0x%x, 0x%x) returned 0x%x\n", |
| 259 | cmd, arg0, arg1, arg2, (int)out_obj.integer.value); | 247 | cmd, arg0, arg1, arg2, (int)value); |
| 260 | return out_obj.integer.value; | 248 | return value; |
| 261 | } | 249 | } |
| 262 | 250 | ||
| 263 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) | 251 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) |
| @@ -317,8 +305,6 @@ static enum led_brightness kblamps_get(struct led_classdev *cdev) | |||
| 317 | static int set_lcd_level(int level) | 305 | static int set_lcd_level(int level) |
| 318 | { | 306 | { |
| 319 | acpi_status status = AE_OK; | 307 | acpi_status status = AE_OK; |
| 320 | union acpi_object arg0 = { ACPI_TYPE_INTEGER }; | ||
| 321 | struct acpi_object_list arg_list = { 1, &arg0 }; | ||
| 322 | acpi_handle handle = NULL; | 308 | acpi_handle handle = NULL; |
| 323 | 309 | ||
| 324 | vdbg_printk(FUJLAPTOP_DBG_TRACE, "set lcd level via SBLL [%d]\n", | 310 | vdbg_printk(FUJLAPTOP_DBG_TRACE, "set lcd level via SBLL [%d]\n", |
| @@ -333,9 +319,8 @@ static int set_lcd_level(int level) | |||
| 333 | return -ENODEV; | 319 | return -ENODEV; |
| 334 | } | 320 | } |
| 335 | 321 | ||
| 336 | arg0.integer.value = level; | ||
| 337 | 322 | ||
| 338 | status = acpi_evaluate_object(handle, NULL, &arg_list, NULL); | 323 | status = acpi_execute_simple_method(handle, NULL, level); |
| 339 | if (ACPI_FAILURE(status)) | 324 | if (ACPI_FAILURE(status)) |
| 340 | return -ENODEV; | 325 | return -ENODEV; |
| 341 | 326 | ||
| @@ -345,8 +330,6 @@ static int set_lcd_level(int level) | |||
| 345 | static int set_lcd_level_alt(int level) | 330 | static int set_lcd_level_alt(int level) |
| 346 | { | 331 | { |
| 347 | acpi_status status = AE_OK; | 332 | acpi_status status = AE_OK; |
| 348 | union acpi_object arg0 = { ACPI_TYPE_INTEGER }; | ||
| 349 | struct acpi_object_list arg_list = { 1, &arg0 }; | ||
| 350 | acpi_handle handle = NULL; | 333 | acpi_handle handle = NULL; |
| 351 | 334 | ||
| 352 | vdbg_printk(FUJLAPTOP_DBG_TRACE, "set lcd level via SBL2 [%d]\n", | 335 | vdbg_printk(FUJLAPTOP_DBG_TRACE, "set lcd level via SBL2 [%d]\n", |
| @@ -361,9 +344,7 @@ static int set_lcd_level_alt(int level) | |||
| 361 | return -ENODEV; | 344 | return -ENODEV; |
| 362 | } | 345 | } |
| 363 | 346 | ||
| 364 | arg0.integer.value = level; | 347 | status = acpi_execute_simple_method(handle, NULL, level); |
| 365 | |||
| 366 | status = acpi_evaluate_object(handle, NULL, &arg_list, NULL); | ||
| 367 | if (ACPI_FAILURE(status)) | 348 | if (ACPI_FAILURE(status)) |
| 368 | return -ENODEV; | 349 | return -ENODEV; |
| 369 | 350 | ||
| @@ -586,11 +567,10 @@ static struct platform_driver fujitsupf_driver = { | |||
| 586 | 567 | ||
| 587 | static void dmi_check_cb_common(const struct dmi_system_id *id) | 568 | static void dmi_check_cb_common(const struct dmi_system_id *id) |
| 588 | { | 569 | { |
| 589 | acpi_handle handle; | ||
| 590 | pr_info("Identified laptop model '%s'\n", id->ident); | 570 | pr_info("Identified laptop model '%s'\n", id->ident); |
| 591 | if (use_alt_lcd_levels == -1) { | 571 | if (use_alt_lcd_levels == -1) { |
| 592 | if (ACPI_SUCCESS(acpi_get_handle(NULL, | 572 | if (acpi_has_method(NULL, |
| 593 | "\\_SB.PCI0.LPCB.FJEX.SBL2", &handle))) | 573 | "\\_SB.PCI0.LPCB.FJEX.SBL2")) |
| 594 | use_alt_lcd_levels = 1; | 574 | use_alt_lcd_levels = 1; |
| 595 | else | 575 | else |
| 596 | use_alt_lcd_levels = 0; | 576 | use_alt_lcd_levels = 0; |
| @@ -653,7 +633,6 @@ static struct dmi_system_id fujitsu_dmi_table[] = { | |||
| 653 | 633 | ||
| 654 | static int acpi_fujitsu_add(struct acpi_device *device) | 634 | static int acpi_fujitsu_add(struct acpi_device *device) |
| 655 | { | 635 | { |
| 656 | acpi_handle handle; | ||
| 657 | int result = 0; | 636 | int result = 0; |
| 658 | int state = 0; | 637 | int state = 0; |
| 659 | struct input_dev *input; | 638 | struct input_dev *input; |
| @@ -702,8 +681,7 @@ static int acpi_fujitsu_add(struct acpi_device *device) | |||
| 702 | 681 | ||
| 703 | fujitsu->dev = device; | 682 | fujitsu->dev = device; |
| 704 | 683 | ||
| 705 | if (ACPI_SUCCESS | 684 | if (acpi_has_method(device->handle, METHOD_NAME__INI)) { |
| 706 | (acpi_get_handle(device->handle, METHOD_NAME__INI, &handle))) { | ||
| 707 | vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n"); | 685 | vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n"); |
| 708 | if (ACPI_FAILURE | 686 | if (ACPI_FAILURE |
| 709 | (acpi_evaluate_object | 687 | (acpi_evaluate_object |
| @@ -803,7 +781,6 @@ static void acpi_fujitsu_notify(struct acpi_device *device, u32 event) | |||
| 803 | 781 | ||
| 804 | static int acpi_fujitsu_hotkey_add(struct acpi_device *device) | 782 | static int acpi_fujitsu_hotkey_add(struct acpi_device *device) |
| 805 | { | 783 | { |
| 806 | acpi_handle handle; | ||
| 807 | int result = 0; | 784 | int result = 0; |
| 808 | int state = 0; | 785 | int state = 0; |
| 809 | struct input_dev *input; | 786 | struct input_dev *input; |
| @@ -866,8 +843,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device) | |||
| 866 | 843 | ||
| 867 | fujitsu_hotkey->dev = device; | 844 | fujitsu_hotkey->dev = device; |
| 868 | 845 | ||
| 869 | if (ACPI_SUCCESS | 846 | if (acpi_has_method(device->handle, METHOD_NAME__INI)) { |
| 870 | (acpi_get_handle(device->handle, METHOD_NAME__INI, &handle))) { | ||
| 871 | vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n"); | 847 | vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n"); |
| 872 | if (ACPI_FAILURE | 848 | if (ACPI_FAILURE |
| 873 | (acpi_evaluate_object | 849 | (acpi_evaluate_object |
diff --git a/drivers/platform/x86/intel-rst.c b/drivers/platform/x86/intel-rst.c index 41b740cb28bc..a2083a9e5662 100644 --- a/drivers/platform/x86/intel-rst.c +++ b/drivers/platform/x86/intel-rst.c | |||
| @@ -29,24 +29,16 @@ static ssize_t irst_show_wakeup_events(struct device *dev, | |||
| 29 | char *buf) | 29 | char *buf) |
| 30 | { | 30 | { |
| 31 | struct acpi_device *acpi; | 31 | struct acpi_device *acpi; |
| 32 | struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; | 32 | unsigned long long value; |
| 33 | union acpi_object *result; | ||
| 34 | acpi_status status; | 33 | acpi_status status; |
| 35 | 34 | ||
| 36 | acpi = to_acpi_device(dev); | 35 | acpi = to_acpi_device(dev); |
| 37 | 36 | ||
| 38 | status = acpi_evaluate_object(acpi->handle, "GFFS", NULL, &output); | 37 | status = acpi_evaluate_integer(acpi->handle, "GFFS", NULL, &value); |
| 39 | if (!ACPI_SUCCESS(status)) | 38 | if (!ACPI_SUCCESS(status)) |
| 40 | return -EINVAL; | 39 | return -EINVAL; |
| 41 | 40 | ||
| 42 | result = output.pointer; | 41 | return sprintf(buf, "%lld\n", value); |
| 43 | |||
| 44 | if (result->type != ACPI_TYPE_INTEGER) { | ||
| 45 | kfree(result); | ||
| 46 | return -EINVAL; | ||
| 47 | } | ||
| 48 | |||
| 49 | return sprintf(buf, "%lld\n", result->integer.value); | ||
| 50 | } | 42 | } |
| 51 | 43 | ||
| 52 | static ssize_t irst_store_wakeup_events(struct device *dev, | 44 | static ssize_t irst_store_wakeup_events(struct device *dev, |
| @@ -54,8 +46,6 @@ static ssize_t irst_store_wakeup_events(struct device *dev, | |||
| 54 | const char *buf, size_t count) | 46 | const char *buf, size_t count) |
| 55 | { | 47 | { |
| 56 | struct acpi_device *acpi; | 48 | struct acpi_device *acpi; |
| 57 | struct acpi_object_list input; | ||
| 58 | union acpi_object param; | ||
| 59 | acpi_status status; | 49 | acpi_status status; |
| 60 | unsigned long value; | 50 | unsigned long value; |
| 61 | int error; | 51 | int error; |
| @@ -67,13 +57,7 @@ static ssize_t irst_store_wakeup_events(struct device *dev, | |||
| 67 | if (error) | 57 | if (error) |
| 68 | return error; | 58 | return error; |
| 69 | 59 | ||
| 70 | param.type = ACPI_TYPE_INTEGER; | 60 | status = acpi_execute_simple_method(acpi->handle, "SFFS", value); |
| 71 | param.integer.value = value; | ||
| 72 | |||
| 73 | input.count = 1; | ||
| 74 | input.pointer = ¶m; | ||
| 75 | |||
| 76 | status = acpi_evaluate_object(acpi->handle, "SFFS", &input, NULL); | ||
| 77 | 61 | ||
| 78 | if (!ACPI_SUCCESS(status)) | 62 | if (!ACPI_SUCCESS(status)) |
| 79 | return -EINVAL; | 63 | return -EINVAL; |
| @@ -91,24 +75,16 @@ static ssize_t irst_show_wakeup_time(struct device *dev, | |||
| 91 | struct device_attribute *attr, char *buf) | 75 | struct device_attribute *attr, char *buf) |
| 92 | { | 76 | { |
| 93 | struct acpi_device *acpi; | 77 | struct acpi_device *acpi; |
| 94 | struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; | 78 | unsigned long long value; |
| 95 | union acpi_object *result; | ||
| 96 | acpi_status status; | 79 | acpi_status status; |
| 97 | 80 | ||
| 98 | acpi = to_acpi_device(dev); | 81 | acpi = to_acpi_device(dev); |
| 99 | 82 | ||
| 100 | status = acpi_evaluate_object(acpi->handle, "GFTV", NULL, &output); | 83 | status = acpi_evaluate_integer(acpi->handle, "GFTV", NULL, &value); |
| 101 | if (!ACPI_SUCCESS(status)) | 84 | if (!ACPI_SUCCESS(status)) |
| 102 | return -EINVAL; | 85 | return -EINVAL; |
| 103 | 86 | ||
| 104 | result = output.pointer; | 87 | return sprintf(buf, "%lld\n", value); |
| 105 | |||
| 106 | if (result->type != ACPI_TYPE_INTEGER) { | ||
| 107 | kfree(result); | ||
| 108 | return -EINVAL; | ||
| 109 | } | ||
| 110 | |||
| 111 | return sprintf(buf, "%lld\n", result->integer.value); | ||
| 112 | } | 88 | } |
| 113 | 89 | ||
| 114 | static ssize_t irst_store_wakeup_time(struct device *dev, | 90 | static ssize_t irst_store_wakeup_time(struct device *dev, |
| @@ -116,8 +92,6 @@ static ssize_t irst_store_wakeup_time(struct device *dev, | |||
| 116 | const char *buf, size_t count) | 92 | const char *buf, size_t count) |
| 117 | { | 93 | { |
| 118 | struct acpi_device *acpi; | 94 | struct acpi_device *acpi; |
| 119 | struct acpi_object_list input; | ||
| 120 | union acpi_object param; | ||
| 121 | acpi_status status; | 95 | acpi_status status; |
| 122 | unsigned long value; | 96 | unsigned long value; |
| 123 | int error; | 97 | int error; |
| @@ -129,13 +103,7 @@ static ssize_t irst_store_wakeup_time(struct device *dev, | |||
| 129 | if (error) | 103 | if (error) |
| 130 | return error; | 104 | return error; |
| 131 | 105 | ||
| 132 | param.type = ACPI_TYPE_INTEGER; | 106 | status = acpi_execute_simple_method(acpi->handle, "SFTV", value); |
| 133 | param.integer.value = value; | ||
| 134 | |||
| 135 | input.count = 1; | ||
| 136 | input.pointer = ¶m; | ||
| 137 | |||
| 138 | status = acpi_evaluate_object(acpi->handle, "SFTV", &input, NULL); | ||
| 139 | 107 | ||
| 140 | if (!ACPI_SUCCESS(status)) | 108 | if (!ACPI_SUCCESS(status)) |
| 141 | return -EINVAL; | 109 | return -EINVAL; |
diff --git a/drivers/platform/x86/intel-smartconnect.c b/drivers/platform/x86/intel-smartconnect.c index 52259dcabecb..1838400dc036 100644 --- a/drivers/platform/x86/intel-smartconnect.c +++ b/drivers/platform/x86/intel-smartconnect.c | |||
| @@ -25,37 +25,18 @@ MODULE_LICENSE("GPL"); | |||
| 25 | 25 | ||
| 26 | static int smartconnect_acpi_init(struct acpi_device *acpi) | 26 | static int smartconnect_acpi_init(struct acpi_device *acpi) |
| 27 | { | 27 | { |
| 28 | struct acpi_object_list input; | 28 | unsigned long long value; |
| 29 | struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; | ||
| 30 | union acpi_object *result; | ||
| 31 | union acpi_object param; | ||
| 32 | acpi_status status; | 29 | acpi_status status; |
| 33 | 30 | ||
| 34 | status = acpi_evaluate_object(acpi->handle, "GAOS", NULL, &output); | 31 | status = acpi_evaluate_integer(acpi->handle, "GAOS", NULL, &value); |
| 35 | if (!ACPI_SUCCESS(status)) | 32 | if (!ACPI_SUCCESS(status)) |
| 36 | return -EINVAL; | 33 | return -EINVAL; |
| 37 | 34 | ||
| 38 | result = output.pointer; | 35 | if (value & 0x1) { |
| 39 | |||
| 40 | if (result->type != ACPI_TYPE_INTEGER) { | ||
| 41 | kfree(result); | ||
| 42 | return -EINVAL; | ||
| 43 | } | ||
| 44 | |||
| 45 | if (result->integer.value & 0x1) { | ||
| 46 | param.type = ACPI_TYPE_INTEGER; | ||
| 47 | param.integer.value = 0; | ||
| 48 | |||
| 49 | input.count = 1; | ||
| 50 | input.pointer = ¶m; | ||
| 51 | |||
| 52 | dev_info(&acpi->dev, "Disabling Intel Smart Connect\n"); | 36 | dev_info(&acpi->dev, "Disabling Intel Smart Connect\n"); |
| 53 | status = acpi_evaluate_object(acpi->handle, "SAOS", &input, | 37 | status = acpi_execute_simple_method(acpi->handle, "SAOS", 0); |
| 54 | NULL); | ||
| 55 | } | 38 | } |
| 56 | 39 | ||
| 57 | kfree(result); | ||
| 58 | |||
| 59 | return 0; | 40 | return 0; |
| 60 | } | 41 | } |
| 61 | 42 | ||
diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c index d6cfc1558c2f..11244f8703c4 100644 --- a/drivers/platform/x86/intel_menlow.c +++ b/drivers/platform/x86/intel_menlow.c | |||
| @@ -156,19 +156,15 @@ static struct thermal_cooling_device_ops memory_cooling_ops = { | |||
| 156 | static int intel_menlow_memory_add(struct acpi_device *device) | 156 | static int intel_menlow_memory_add(struct acpi_device *device) |
| 157 | { | 157 | { |
| 158 | int result = -ENODEV; | 158 | int result = -ENODEV; |
| 159 | acpi_status status = AE_OK; | ||
| 160 | acpi_handle dummy; | ||
| 161 | struct thermal_cooling_device *cdev; | 159 | struct thermal_cooling_device *cdev; |
| 162 | 160 | ||
| 163 | if (!device) | 161 | if (!device) |
| 164 | return -EINVAL; | 162 | return -EINVAL; |
| 165 | 163 | ||
| 166 | status = acpi_get_handle(device->handle, MEMORY_GET_BANDWIDTH, &dummy); | 164 | if (!acpi_has_method(device->handle, MEMORY_GET_BANDWIDTH)) |
| 167 | if (ACPI_FAILURE(status)) | ||
| 168 | goto end; | 165 | goto end; |
| 169 | 166 | ||
| 170 | status = acpi_get_handle(device->handle, MEMORY_SET_BANDWIDTH, &dummy); | 167 | if (!acpi_has_method(device->handle, MEMORY_SET_BANDWIDTH)) |
| 171 | if (ACPI_FAILURE(status)) | ||
| 172 | goto end; | 168 | goto end; |
| 173 | 169 | ||
| 174 | cdev = thermal_cooling_device_register("Memory controller", device, | 170 | cdev = thermal_cooling_device_register("Memory controller", device, |
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index d3fd52036fd6..47caab0ea7a1 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c | |||
| @@ -127,18 +127,17 @@ MODULE_PARM_DESC(minor, | |||
| 127 | "default is -1 (automatic)"); | 127 | "default is -1 (automatic)"); |
| 128 | #endif | 128 | #endif |
| 129 | 129 | ||
| 130 | static int kbd_backlight = 1; | 130 | static int kbd_backlight = -1; |
| 131 | module_param(kbd_backlight, int, 0444); | 131 | module_param(kbd_backlight, int, 0444); |
| 132 | MODULE_PARM_DESC(kbd_backlight, | 132 | MODULE_PARM_DESC(kbd_backlight, |
| 133 | "set this to 0 to disable keyboard backlight, " | 133 | "set this to 0 to disable keyboard backlight, " |
| 134 | "1 to enable it (default: 0)"); | 134 | "1 to enable it (default: no change from current value)"); |
| 135 | 135 | ||
| 136 | static int kbd_backlight_timeout; /* = 0 */ | 136 | static int kbd_backlight_timeout = -1; |
| 137 | module_param(kbd_backlight_timeout, int, 0444); | 137 | module_param(kbd_backlight_timeout, int, 0444); |
| 138 | MODULE_PARM_DESC(kbd_backlight_timeout, | 138 | MODULE_PARM_DESC(kbd_backlight_timeout, |
| 139 | "set this to 0 to set the default 10 seconds timeout, " | 139 | "meaningful values vary from 0 to 3 and their meaning depends " |
| 140 | "1 for 30 seconds, 2 for 60 seconds and 3 to disable timeout " | 140 | "on the model (default: no change from current value)"); |
| 141 | "(default: 0)"); | ||
| 142 | 141 | ||
| 143 | #ifdef CONFIG_PM_SLEEP | 142 | #ifdef CONFIG_PM_SLEEP |
| 144 | static void sony_nc_kbd_backlight_resume(void); | 143 | static void sony_nc_kbd_backlight_resume(void); |
| @@ -1509,7 +1508,6 @@ static void sony_nc_function_resume(void) | |||
| 1509 | static int sony_nc_resume(struct device *dev) | 1508 | static int sony_nc_resume(struct device *dev) |
| 1510 | { | 1509 | { |
| 1511 | struct sony_nc_value *item; | 1510 | struct sony_nc_value *item; |
| 1512 | acpi_handle handle; | ||
| 1513 | 1511 | ||
| 1514 | for (item = sony_nc_values; item->name; item++) { | 1512 | for (item = sony_nc_values; item->name; item++) { |
| 1515 | int ret; | 1513 | int ret; |
| @@ -1524,15 +1522,13 @@ static int sony_nc_resume(struct device *dev) | |||
| 1524 | } | 1522 | } |
| 1525 | } | 1523 | } |
| 1526 | 1524 | ||
| 1527 | if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "ECON", | 1525 | if (acpi_has_method(sony_nc_acpi_handle, "ECON")) { |
| 1528 | &handle))) { | ||
| 1529 | int arg = 1; | 1526 | int arg = 1; |
| 1530 | if (sony_nc_int_call(sony_nc_acpi_handle, "ECON", &arg, NULL)) | 1527 | if (sony_nc_int_call(sony_nc_acpi_handle, "ECON", &arg, NULL)) |
| 1531 | dprintk("ECON Method failed\n"); | 1528 | dprintk("ECON Method failed\n"); |
| 1532 | } | 1529 | } |
| 1533 | 1530 | ||
| 1534 | if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "SN00", | 1531 | if (acpi_has_method(sony_nc_acpi_handle, "SN00")) |
| 1535 | &handle))) | ||
| 1536 | sony_nc_function_resume(); | 1532 | sony_nc_function_resume(); |
| 1537 | 1533 | ||
| 1538 | return 0; | 1534 | return 0; |
| @@ -1844,6 +1840,8 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd, | |||
| 1844 | if (!kbdbl_ctl) | 1840 | if (!kbdbl_ctl) |
| 1845 | return -ENOMEM; | 1841 | return -ENOMEM; |
| 1846 | 1842 | ||
| 1843 | kbdbl_ctl->mode = kbd_backlight; | ||
| 1844 | kbdbl_ctl->timeout = kbd_backlight_timeout; | ||
| 1847 | kbdbl_ctl->handle = handle; | 1845 | kbdbl_ctl->handle = handle; |
| 1848 | if (handle == 0x0137) | 1846 | if (handle == 0x0137) |
| 1849 | kbdbl_ctl->base = 0x0C00; | 1847 | kbdbl_ctl->base = 0x0C00; |
| @@ -1870,8 +1868,8 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd, | |||
| 1870 | if (ret) | 1868 | if (ret) |
| 1871 | goto outmode; | 1869 | goto outmode; |
| 1872 | 1870 | ||
| 1873 | __sony_nc_kbd_backlight_mode_set(kbd_backlight); | 1871 | __sony_nc_kbd_backlight_mode_set(kbdbl_ctl->mode); |
| 1874 | __sony_nc_kbd_backlight_timeout_set(kbd_backlight_timeout); | 1872 | __sony_nc_kbd_backlight_timeout_set(kbdbl_ctl->timeout); |
| 1875 | 1873 | ||
| 1876 | return 0; | 1874 | return 0; |
| 1877 | 1875 | ||
| @@ -1886,17 +1884,8 @@ outkzalloc: | |||
| 1886 | static void sony_nc_kbd_backlight_cleanup(struct platform_device *pd) | 1884 | static void sony_nc_kbd_backlight_cleanup(struct platform_device *pd) |
| 1887 | { | 1885 | { |
| 1888 | if (kbdbl_ctl) { | 1886 | if (kbdbl_ctl) { |
| 1889 | int result; | ||
| 1890 | |||
| 1891 | device_remove_file(&pd->dev, &kbdbl_ctl->mode_attr); | 1887 | device_remove_file(&pd->dev, &kbdbl_ctl->mode_attr); |
| 1892 | device_remove_file(&pd->dev, &kbdbl_ctl->timeout_attr); | 1888 | device_remove_file(&pd->dev, &kbdbl_ctl->timeout_attr); |
| 1893 | |||
| 1894 | /* restore the default hw behaviour */ | ||
| 1895 | sony_call_snc_handle(kbdbl_ctl->handle, | ||
| 1896 | kbdbl_ctl->base | 0x10000, &result); | ||
| 1897 | sony_call_snc_handle(kbdbl_ctl->handle, | ||
| 1898 | kbdbl_ctl->base + 0x200, &result); | ||
| 1899 | |||
| 1900 | kfree(kbdbl_ctl); | 1889 | kfree(kbdbl_ctl); |
| 1901 | kbdbl_ctl = NULL; | 1890 | kbdbl_ctl = NULL; |
| 1902 | } | 1891 | } |
| @@ -2690,7 +2679,6 @@ static void sony_nc_backlight_ng_read_limits(int handle, | |||
| 2690 | 2679 | ||
| 2691 | static void sony_nc_backlight_setup(void) | 2680 | static void sony_nc_backlight_setup(void) |
| 2692 | { | 2681 | { |
| 2693 | acpi_handle unused; | ||
| 2694 | int max_brightness = 0; | 2682 | int max_brightness = 0; |
| 2695 | const struct backlight_ops *ops = NULL; | 2683 | const struct backlight_ops *ops = NULL; |
| 2696 | struct backlight_properties props; | 2684 | struct backlight_properties props; |
| @@ -2725,8 +2713,7 @@ static void sony_nc_backlight_setup(void) | |||
| 2725 | sony_nc_backlight_ng_read_limits(0x14c, &sony_bl_props); | 2713 | sony_nc_backlight_ng_read_limits(0x14c, &sony_bl_props); |
| 2726 | max_brightness = sony_bl_props.maxlvl - sony_bl_props.offset; | 2714 | max_brightness = sony_bl_props.maxlvl - sony_bl_props.offset; |
| 2727 | 2715 | ||
| 2728 | } else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT", | 2716 | } else if (acpi_has_method(sony_nc_acpi_handle, "GBRT")) { |
| 2729 | &unused))) { | ||
| 2730 | ops = &sony_backlight_ops; | 2717 | ops = &sony_backlight_ops; |
| 2731 | max_brightness = SONY_MAX_BRIGHTNESS - 1; | 2718 | max_brightness = SONY_MAX_BRIGHTNESS - 1; |
| 2732 | 2719 | ||
| @@ -2758,7 +2745,6 @@ static int sony_nc_add(struct acpi_device *device) | |||
| 2758 | { | 2745 | { |
| 2759 | acpi_status status; | 2746 | acpi_status status; |
| 2760 | int result = 0; | 2747 | int result = 0; |
| 2761 | acpi_handle handle; | ||
| 2762 | struct sony_nc_value *item; | 2748 | struct sony_nc_value *item; |
| 2763 | 2749 | ||
| 2764 | pr_info("%s v%s\n", SONY_NC_DRIVER_NAME, SONY_LAPTOP_DRIVER_VERSION); | 2750 | pr_info("%s v%s\n", SONY_NC_DRIVER_NAME, SONY_LAPTOP_DRIVER_VERSION); |
| @@ -2798,15 +2784,13 @@ static int sony_nc_add(struct acpi_device *device) | |||
| 2798 | goto outplatform; | 2784 | goto outplatform; |
| 2799 | } | 2785 | } |
| 2800 | 2786 | ||
| 2801 | if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "ECON", | 2787 | if (acpi_has_method(sony_nc_acpi_handle, "ECON")) { |
| 2802 | &handle))) { | ||
| 2803 | int arg = 1; | 2788 | int arg = 1; |
| 2804 | if (sony_nc_int_call(sony_nc_acpi_handle, "ECON", &arg, NULL)) | 2789 | if (sony_nc_int_call(sony_nc_acpi_handle, "ECON", &arg, NULL)) |
| 2805 | dprintk("ECON Method failed\n"); | 2790 | dprintk("ECON Method failed\n"); |
| 2806 | } | 2791 | } |
| 2807 | 2792 | ||
| 2808 | if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "SN00", | 2793 | if (acpi_has_method(sony_nc_acpi_handle, "SN00")) { |
| 2809 | &handle))) { | ||
| 2810 | dprintk("Doing SNC setup\n"); | 2794 | dprintk("Doing SNC setup\n"); |
| 2811 | /* retrieve the available handles */ | 2795 | /* retrieve the available handles */ |
| 2812 | result = sony_nc_handles_setup(sony_pf_device); | 2796 | result = sony_nc_handles_setup(sony_pf_device); |
| @@ -2829,9 +2813,8 @@ static int sony_nc_add(struct acpi_device *device) | |||
| 2829 | 2813 | ||
| 2830 | /* find the available acpiget as described in the DSDT */ | 2814 | /* find the available acpiget as described in the DSDT */ |
| 2831 | for (; item->acpiget && *item->acpiget; ++item->acpiget) { | 2815 | for (; item->acpiget && *item->acpiget; ++item->acpiget) { |
| 2832 | if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, | 2816 | if (acpi_has_method(sony_nc_acpi_handle, |
| 2833 | *item->acpiget, | 2817 | *item->acpiget)) { |
| 2834 | &handle))) { | ||
| 2835 | dprintk("Found %s getter: %s\n", | 2818 | dprintk("Found %s getter: %s\n", |
| 2836 | item->name, *item->acpiget); | 2819 | item->name, *item->acpiget); |
| 2837 | item->devattr.attr.mode |= S_IRUGO; | 2820 | item->devattr.attr.mode |= S_IRUGO; |
| @@ -2841,9 +2824,8 @@ static int sony_nc_add(struct acpi_device *device) | |||
| 2841 | 2824 | ||
| 2842 | /* find the available acpiset as described in the DSDT */ | 2825 | /* find the available acpiset as described in the DSDT */ |
| 2843 | for (; item->acpiset && *item->acpiset; ++item->acpiset) { | 2826 | for (; item->acpiset && *item->acpiset; ++item->acpiset) { |
| 2844 | if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, | 2827 | if (acpi_has_method(sony_nc_acpi_handle, |
| 2845 | *item->acpiset, | 2828 | *item->acpiset)) { |
| 2846 | &handle))) { | ||
| 2847 | dprintk("Found %s setter: %s\n", | 2829 | dprintk("Found %s setter: %s\n", |
| 2848 | item->name, *item->acpiset); | 2830 | item->name, *item->acpiset); |
| 2849 | item->devattr.attr.mode |= S_IWUSR; | 2831 | item->devattr.attr.mode |= S_IWUSR; |
diff --git a/drivers/platform/x86/topstar-laptop.c b/drivers/platform/x86/topstar-laptop.c index 4ab618c63b45..67897c8740ba 100644 --- a/drivers/platform/x86/topstar-laptop.c +++ b/drivers/platform/x86/topstar-laptop.c | |||
| @@ -80,13 +80,9 @@ static void acpi_topstar_notify(struct acpi_device *device, u32 event) | |||
| 80 | static int acpi_topstar_fncx_switch(struct acpi_device *device, bool state) | 80 | static int acpi_topstar_fncx_switch(struct acpi_device *device, bool state) |
| 81 | { | 81 | { |
| 82 | acpi_status status; | 82 | acpi_status status; |
| 83 | union acpi_object fncx_params[1] = { | ||
| 84 | { .type = ACPI_TYPE_INTEGER } | ||
| 85 | }; | ||
| 86 | struct acpi_object_list fncx_arg_list = { 1, &fncx_params[0] }; | ||
| 87 | 83 | ||
| 88 | fncx_params[0].integer.value = state ? 0x86 : 0x87; | 84 | status = acpi_execute_simple_method(device->handle, "FNCX", |
| 89 | status = acpi_evaluate_object(device->handle, "FNCX", &fncx_arg_list, NULL); | 85 | state ? 0x86 : 0x87); |
| 90 | if (ACPI_FAILURE(status)) { | 86 | if (ACPI_FAILURE(status)) { |
| 91 | pr_err("Unable to switch FNCX notifications\n"); | 87 | pr_err("Unable to switch FNCX notifications\n"); |
| 92 | return -ENODEV; | 88 | return -ENODEV; |
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index eb3467ea6d86..0cfadb65f7c6 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c | |||
| @@ -191,16 +191,9 @@ static __inline__ void _set_bit(u32 * word, u32 mask, int value) | |||
| 191 | 191 | ||
| 192 | static int write_acpi_int(const char *methodName, int val) | 192 | static int write_acpi_int(const char *methodName, int val) |
| 193 | { | 193 | { |
| 194 | struct acpi_object_list params; | ||
| 195 | union acpi_object in_objs[1]; | ||
| 196 | acpi_status status; | 194 | acpi_status status; |
| 197 | 195 | ||
| 198 | params.count = ARRAY_SIZE(in_objs); | 196 | status = acpi_execute_simple_method(NULL, (char *)methodName, val); |
| 199 | params.pointer = in_objs; | ||
| 200 | in_objs[0].type = ACPI_TYPE_INTEGER; | ||
| 201 | in_objs[0].integer.value = val; | ||
| 202 | |||
| 203 | status = acpi_evaluate_object(NULL, (char *)methodName, ¶ms, NULL); | ||
| 204 | return (status == AE_OK) ? 0 : -EIO; | 197 | return (status == AE_OK) ? 0 : -EIO; |
| 205 | } | 198 | } |
| 206 | 199 | ||
| @@ -947,21 +940,17 @@ static void toshiba_acpi_hotkey_work(struct work_struct *work) | |||
| 947 | */ | 940 | */ |
| 948 | static int toshiba_acpi_query_hotkey(struct toshiba_acpi_dev *dev) | 941 | static int toshiba_acpi_query_hotkey(struct toshiba_acpi_dev *dev) |
| 949 | { | 942 | { |
| 950 | struct acpi_buffer buf; | 943 | unsigned long long value; |
| 951 | union acpi_object out_obj; | ||
| 952 | acpi_status status; | 944 | acpi_status status; |
| 953 | 945 | ||
| 954 | buf.pointer = &out_obj; | 946 | status = acpi_evaluate_integer(dev->acpi_dev->handle, "INFO", |
| 955 | buf.length = sizeof(out_obj); | 947 | NULL, &value); |
| 956 | 948 | if (ACPI_FAILURE(status)) { | |
| 957 | status = acpi_evaluate_object(dev->acpi_dev->handle, "INFO", | ||
| 958 | NULL, &buf); | ||
| 959 | if (ACPI_FAILURE(status) || out_obj.type != ACPI_TYPE_INTEGER) { | ||
| 960 | pr_err("ACPI INFO method execution failed\n"); | 949 | pr_err("ACPI INFO method execution failed\n"); |
| 961 | return -EIO; | 950 | return -EIO; |
| 962 | } | 951 | } |
| 963 | 952 | ||
| 964 | return out_obj.integer.value; | 953 | return value; |
| 965 | } | 954 | } |
| 966 | 955 | ||
| 967 | static void toshiba_acpi_report_hotkey(struct toshiba_acpi_dev *dev, | 956 | static void toshiba_acpi_report_hotkey(struct toshiba_acpi_dev *dev, |
| @@ -981,7 +970,7 @@ static void toshiba_acpi_report_hotkey(struct toshiba_acpi_dev *dev, | |||
| 981 | static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev) | 970 | static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev) |
| 982 | { | 971 | { |
| 983 | acpi_status status; | 972 | acpi_status status; |
| 984 | acpi_handle ec_handle, handle; | 973 | acpi_handle ec_handle; |
| 985 | int error; | 974 | int error; |
| 986 | u32 hci_result; | 975 | u32 hci_result; |
| 987 | 976 | ||
| @@ -1008,10 +997,7 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev) | |||
| 1008 | */ | 997 | */ |
| 1009 | status = AE_ERROR; | 998 | status = AE_ERROR; |
| 1010 | ec_handle = ec_get_handle(); | 999 | ec_handle = ec_get_handle(); |
| 1011 | if (ec_handle) | 1000 | if (ec_handle && acpi_has_method(ec_handle, "NTFY")) { |
| 1012 | status = acpi_get_handle(ec_handle, "NTFY", &handle); | ||
| 1013 | |||
| 1014 | if (ACPI_SUCCESS(status)) { | ||
| 1015 | INIT_WORK(&dev->hotkey_work, toshiba_acpi_hotkey_work); | 1001 | INIT_WORK(&dev->hotkey_work, toshiba_acpi_hotkey_work); |
| 1016 | 1002 | ||
| 1017 | error = i8042_install_filter(toshiba_acpi_i8042_filter); | 1003 | error = i8042_install_filter(toshiba_acpi_i8042_filter); |
| @@ -1027,10 +1013,9 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev) | |||
| 1027 | * Determine hotkey query interface. Prefer using the INFO | 1013 | * Determine hotkey query interface. Prefer using the INFO |
| 1028 | * method when it is available. | 1014 | * method when it is available. |
| 1029 | */ | 1015 | */ |
| 1030 | status = acpi_get_handle(dev->acpi_dev->handle, "INFO", &handle); | 1016 | if (acpi_has_method(dev->acpi_dev->handle, "INFO")) |
| 1031 | if (ACPI_SUCCESS(status)) { | ||
| 1032 | dev->info_supported = 1; | 1017 | dev->info_supported = 1; |
| 1033 | } else { | 1018 | else { |
| 1034 | hci_write1(dev, HCI_SYSTEM_EVENT, 1, &hci_result); | 1019 | hci_write1(dev, HCI_SYSTEM_EVENT, 1, &hci_result); |
| 1035 | if (hci_result == HCI_SUCCESS) | 1020 | if (hci_result == HCI_SUCCESS) |
| 1036 | dev->system_event_supported = 1; | 1021 | dev->system_event_supported = 1; |
| @@ -1155,15 +1140,10 @@ static int toshiba_acpi_remove(struct acpi_device *acpi_dev) | |||
| 1155 | 1140 | ||
| 1156 | static const char *find_hci_method(acpi_handle handle) | 1141 | static const char *find_hci_method(acpi_handle handle) |
| 1157 | { | 1142 | { |
| 1158 | acpi_status status; | 1143 | if (acpi_has_method(handle, "GHCI")) |
| 1159 | acpi_handle hci_handle; | ||
| 1160 | |||
| 1161 | status = acpi_get_handle(handle, "GHCI", &hci_handle); | ||
| 1162 | if (ACPI_SUCCESS(status)) | ||
| 1163 | return "GHCI"; | 1144 | return "GHCI"; |
| 1164 | 1145 | ||
| 1165 | status = acpi_get_handle(handle, "SPFC", &hci_handle); | 1146 | if (acpi_has_method(handle, "SPFC")) |
| 1166 | if (ACPI_SUCCESS(status)) | ||
| 1167 | return "SPFC"; | 1147 | return "SPFC"; |
| 1168 | 1148 | ||
| 1169 | return NULL; | 1149 | return NULL; |
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 601ea9512242..62e8c221d01e 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c | |||
| @@ -252,8 +252,6 @@ static acpi_status wmi_method_enable(struct wmi_block *wblock, int enable) | |||
| 252 | { | 252 | { |
| 253 | struct guid_block *block = NULL; | 253 | struct guid_block *block = NULL; |
| 254 | char method[5]; | 254 | char method[5]; |
| 255 | struct acpi_object_list input; | ||
| 256 | union acpi_object params[1]; | ||
| 257 | acpi_status status; | 255 | acpi_status status; |
| 258 | acpi_handle handle; | 256 | acpi_handle handle; |
| 259 | 257 | ||
| @@ -263,13 +261,9 @@ static acpi_status wmi_method_enable(struct wmi_block *wblock, int enable) | |||
| 263 | if (!block) | 261 | if (!block) |
| 264 | return AE_NOT_EXIST; | 262 | return AE_NOT_EXIST; |
| 265 | 263 | ||
| 266 | input.count = 1; | ||
| 267 | input.pointer = params; | ||
| 268 | params[0].type = ACPI_TYPE_INTEGER; | ||
| 269 | params[0].integer.value = enable; | ||
| 270 | 264 | ||
| 271 | snprintf(method, 5, "WE%02X", block->notify_id); | 265 | snprintf(method, 5, "WE%02X", block->notify_id); |
| 272 | status = acpi_evaluate_object(handle, method, &input, NULL); | 266 | status = acpi_execute_simple_method(handle, method, enable); |
| 273 | 267 | ||
| 274 | if (status != AE_OK && status != AE_NOT_FOUND) | 268 | if (status != AE_OK && status != AE_NOT_FOUND) |
| 275 | return status; | 269 | return status; |
| @@ -353,10 +347,10 @@ struct acpi_buffer *out) | |||
| 353 | { | 347 | { |
| 354 | struct guid_block *block = NULL; | 348 | struct guid_block *block = NULL; |
| 355 | struct wmi_block *wblock = NULL; | 349 | struct wmi_block *wblock = NULL; |
| 356 | acpi_handle handle, wc_handle; | 350 | acpi_handle handle; |
| 357 | acpi_status status, wc_status = AE_ERROR; | 351 | acpi_status status, wc_status = AE_ERROR; |
| 358 | struct acpi_object_list input, wc_input; | 352 | struct acpi_object_list input; |
| 359 | union acpi_object wc_params[1], wq_params[1]; | 353 | union acpi_object wq_params[1]; |
| 360 | char method[5]; | 354 | char method[5]; |
| 361 | char wc_method[5] = "WC"; | 355 | char wc_method[5] = "WC"; |
| 362 | 356 | ||
| @@ -386,11 +380,6 @@ struct acpi_buffer *out) | |||
| 386 | * enable collection. | 380 | * enable collection. |
| 387 | */ | 381 | */ |
| 388 | if (block->flags & ACPI_WMI_EXPENSIVE) { | 382 | if (block->flags & ACPI_WMI_EXPENSIVE) { |
| 389 | wc_input.count = 1; | ||
| 390 | wc_input.pointer = wc_params; | ||
| 391 | wc_params[0].type = ACPI_TYPE_INTEGER; | ||
| 392 | wc_params[0].integer.value = 1; | ||
| 393 | |||
| 394 | strncat(wc_method, block->object_id, 2); | 383 | strncat(wc_method, block->object_id, 2); |
| 395 | 384 | ||
| 396 | /* | 385 | /* |
| @@ -398,10 +387,9 @@ struct acpi_buffer *out) | |||
| 398 | * expensive, but have no corresponding WCxx method. So we | 387 | * expensive, but have no corresponding WCxx method. So we |
| 399 | * should not fail if this happens. | 388 | * should not fail if this happens. |
| 400 | */ | 389 | */ |
| 401 | wc_status = acpi_get_handle(handle, wc_method, &wc_handle); | 390 | if (acpi_has_method(handle, wc_method)) |
| 402 | if (ACPI_SUCCESS(wc_status)) | 391 | wc_status = acpi_execute_simple_method(handle, |
| 403 | wc_status = acpi_evaluate_object(handle, wc_method, | 392 | wc_method, 1); |
| 404 | &wc_input, NULL); | ||
| 405 | } | 393 | } |
| 406 | 394 | ||
| 407 | strcpy(method, "WQ"); | 395 | strcpy(method, "WQ"); |
| @@ -414,9 +402,7 @@ struct acpi_buffer *out) | |||
| 414 | * the WQxx method failed - we should disable collection anyway. | 402 | * the WQxx method failed - we should disable collection anyway. |
| 415 | */ | 403 | */ |
| 416 | if ((block->flags & ACPI_WMI_EXPENSIVE) && ACPI_SUCCESS(wc_status)) { | 404 | if ((block->flags & ACPI_WMI_EXPENSIVE) && ACPI_SUCCESS(wc_status)) { |
| 417 | wc_params[0].integer.value = 0; | 405 | status = acpi_execute_simple_method(handle, wc_method, 0); |
| 418 | status = acpi_evaluate_object(handle, | ||
| 419 | wc_method, &wc_input, NULL); | ||
| 420 | } | 406 | } |
| 421 | 407 | ||
| 422 | return status; | 408 | return status; |
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index 34049b0b4c73..747826d99059 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c | |||
| @@ -239,8 +239,6 @@ static char *__init pnpacpi_get_id(struct acpi_device *device) | |||
| 239 | 239 | ||
| 240 | static int __init pnpacpi_add_device(struct acpi_device *device) | 240 | static int __init pnpacpi_add_device(struct acpi_device *device) |
| 241 | { | 241 | { |
| 242 | acpi_handle temp = NULL; | ||
| 243 | acpi_status status; | ||
| 244 | struct pnp_dev *dev; | 242 | struct pnp_dev *dev; |
| 245 | char *pnpid; | 243 | char *pnpid; |
| 246 | struct acpi_hardware_id *id; | 244 | struct acpi_hardware_id *id; |
| @@ -253,8 +251,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device) | |||
| 253 | * If a PnPacpi device is not present , the device | 251 | * If a PnPacpi device is not present , the device |
| 254 | * driver should not be loaded. | 252 | * driver should not be loaded. |
| 255 | */ | 253 | */ |
| 256 | status = acpi_get_handle(device->handle, "_CRS", &temp); | 254 | if (!acpi_has_method(device->handle, "_CRS")) |
| 257 | if (ACPI_FAILURE(status)) | ||
| 258 | return 0; | 255 | return 0; |
| 259 | 256 | ||
| 260 | pnpid = pnpacpi_get_id(device); | 257 | pnpid = pnpacpi_get_id(device); |
| @@ -271,16 +268,14 @@ static int __init pnpacpi_add_device(struct acpi_device *device) | |||
| 271 | dev->data = device; | 268 | dev->data = device; |
| 272 | /* .enabled means the device can decode the resources */ | 269 | /* .enabled means the device can decode the resources */ |
| 273 | dev->active = device->status.enabled; | 270 | dev->active = device->status.enabled; |
| 274 | status = acpi_get_handle(device->handle, "_SRS", &temp); | 271 | if (acpi_has_method(device->handle, "_SRS")) |
| 275 | if (ACPI_SUCCESS(status)) | ||
| 276 | dev->capabilities |= PNP_CONFIGURABLE; | 272 | dev->capabilities |= PNP_CONFIGURABLE; |
| 277 | dev->capabilities |= PNP_READ; | 273 | dev->capabilities |= PNP_READ; |
| 278 | if (device->flags.dynamic_status && (dev->capabilities & PNP_CONFIGURABLE)) | 274 | if (device->flags.dynamic_status && (dev->capabilities & PNP_CONFIGURABLE)) |
| 279 | dev->capabilities |= PNP_WRITE; | 275 | dev->capabilities |= PNP_WRITE; |
| 280 | if (device->flags.removable) | 276 | if (device->flags.removable) |
| 281 | dev->capabilities |= PNP_REMOVABLE; | 277 | dev->capabilities |= PNP_REMOVABLE; |
| 282 | status = acpi_get_handle(device->handle, "_DIS", &temp); | 278 | if (acpi_has_method(device->handle, "_DIS")) |
| 283 | if (ACPI_SUCCESS(status)) | ||
| 284 | dev->capabilities |= PNP_DISABLE; | 279 | dev->capabilities |= PNP_DISABLE; |
| 285 | 280 | ||
| 286 | if (strlen(acpi_device_name(device))) | 281 | if (strlen(acpi_device_name(device))) |
diff --git a/drivers/powercap/Kconfig b/drivers/powercap/Kconfig new file mode 100644 index 000000000000..a7c81b53d88a --- /dev/null +++ b/drivers/powercap/Kconfig | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | # | ||
| 2 | # Generic power capping sysfs interface configuration | ||
| 3 | # | ||
| 4 | |||
| 5 | menuconfig POWERCAP | ||
| 6 | bool "Generic powercap sysfs driver" | ||
| 7 | help | ||
| 8 | The power capping sysfs interface allows kernel subsystems to expose power | ||
| 9 | capping settings to user space in a consistent way. Usually, it consists | ||
| 10 | of multiple control types that determine which settings may be exposed and | ||
| 11 | power zones representing parts of the system that can be subject to power | ||
| 12 | capping. | ||
| 13 | |||
| 14 | If you want this code to be compiled in, say Y here. | ||
| 15 | |||
| 16 | if POWERCAP | ||
| 17 | # Client driver configurations go here. | ||
| 18 | config INTEL_RAPL | ||
| 19 | tristate "Intel RAPL Support" | ||
| 20 | depends on X86 | ||
| 21 | default n | ||
| 22 | ---help--- | ||
| 23 | This enables support for the Intel Running Average Power Limit (RAPL) | ||
| 24 | technology which allows power limits to be enforced and monitored on | ||
| 25 | modern Intel processors (Sandy Bridge and later). | ||
| 26 | |||
| 27 | In RAPL, the platform level settings are divided into domains for | ||
| 28 | fine grained control. These domains include processor package, DRAM | ||
| 29 | controller, CPU core (Power Plance 0), graphics uncore (Power Plane | ||
| 30 | 1), etc. | ||
| 31 | |||
| 32 | endif | ||
diff --git a/drivers/powercap/Makefile b/drivers/powercap/Makefile new file mode 100644 index 000000000000..0a21ef31372b --- /dev/null +++ b/drivers/powercap/Makefile | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | obj-$(CONFIG_POWERCAP) += powercap_sys.o | ||
| 2 | obj-$(CONFIG_INTEL_RAPL) += intel_rapl.o | ||
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c new file mode 100644 index 000000000000..2a786c504460 --- /dev/null +++ b/drivers/powercap/intel_rapl.c | |||
| @@ -0,0 +1,1395 @@ | |||
| 1 | /* | ||
| 2 | * Intel Running Average Power Limit (RAPL) Driver | ||
| 3 | * Copyright (c) 2013, Intel Corporation. | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify it | ||
| 6 | * under the terms and conditions of the GNU General Public License, | ||
| 7 | * version 2, as published by the Free Software Foundation. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
| 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 12 | * more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License along with | ||
| 15 | * this program; if not, write to the Free Software Foundation, Inc. | ||
| 16 | * | ||
| 17 | */ | ||
| 18 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
| 19 | |||
| 20 | #include <linux/kernel.h> | ||
| 21 | #include <linux/module.h> | ||
| 22 | #include <linux/list.h> | ||
| 23 | #include <linux/types.h> | ||
| 24 | #include <linux/device.h> | ||
| 25 | #include <linux/slab.h> | ||
| 26 | #include <linux/log2.h> | ||
| 27 | #include <linux/bitmap.h> | ||
| 28 | #include <linux/delay.h> | ||
| 29 | #include <linux/sysfs.h> | ||
| 30 | #include <linux/cpu.h> | ||
| 31 | #include <linux/powercap.h> | ||
| 32 | |||
| 33 | #include <asm/processor.h> | ||
| 34 | #include <asm/cpu_device_id.h> | ||
| 35 | |||
| 36 | /* bitmasks for RAPL MSRs, used by primitive access functions */ | ||
| 37 | #define ENERGY_STATUS_MASK 0xffffffff | ||
| 38 | |||
| 39 | #define POWER_LIMIT1_MASK 0x7FFF | ||
| 40 | #define POWER_LIMIT1_ENABLE BIT(15) | ||
| 41 | #define POWER_LIMIT1_CLAMP BIT(16) | ||
| 42 | |||
| 43 | #define POWER_LIMIT2_MASK (0x7FFFULL<<32) | ||
| 44 | #define POWER_LIMIT2_ENABLE BIT_ULL(47) | ||
| 45 | #define POWER_LIMIT2_CLAMP BIT_ULL(48) | ||
| 46 | #define POWER_PACKAGE_LOCK BIT_ULL(63) | ||
| 47 | #define POWER_PP_LOCK BIT(31) | ||
| 48 | |||
| 49 | #define TIME_WINDOW1_MASK (0x7FULL<<17) | ||
| 50 | #define TIME_WINDOW2_MASK (0x7FULL<<49) | ||
| 51 | |||
| 52 | #define POWER_UNIT_OFFSET 0 | ||
| 53 | #define POWER_UNIT_MASK 0x0F | ||
| 54 | |||
| 55 | #define ENERGY_UNIT_OFFSET 0x08 | ||
| 56 | #define ENERGY_UNIT_MASK 0x1F00 | ||
| 57 | |||
| 58 | #define TIME_UNIT_OFFSET 0x10 | ||
| 59 | #define TIME_UNIT_MASK 0xF0000 | ||
| 60 | |||
| 61 | #define POWER_INFO_MAX_MASK (0x7fffULL<<32) | ||
| 62 | #define POWER_INFO_MIN_MASK (0x7fffULL<<16) | ||
| 63 | #define POWER_INFO_MAX_TIME_WIN_MASK (0x3fULL<<48) | ||
| 64 | #define POWER_INFO_THERMAL_SPEC_MASK 0x7fff | ||
| 65 | |||
| 66 | #define PERF_STATUS_THROTTLE_TIME_MASK 0xffffffff | ||
| 67 | #define PP_POLICY_MASK 0x1F | ||
| 68 | |||
| 69 | /* Non HW constants */ | ||
| 70 | #define RAPL_PRIMITIVE_DERIVED BIT(1) /* not from raw data */ | ||
| 71 | #define RAPL_PRIMITIVE_DUMMY BIT(2) | ||
| 72 | |||
| 73 | /* scale RAPL units to avoid floating point math inside kernel */ | ||
| 74 | #define POWER_UNIT_SCALE (1000000) | ||
| 75 | #define ENERGY_UNIT_SCALE (1000000) | ||
| 76 | #define TIME_UNIT_SCALE (1000000) | ||
| 77 | |||
| 78 | #define TIME_WINDOW_MAX_MSEC 40000 | ||
| 79 | #define TIME_WINDOW_MIN_MSEC 250 | ||
| 80 | |||
| 81 | enum unit_type { | ||
| 82 | ARBITRARY_UNIT, /* no translation */ | ||
| 83 | POWER_UNIT, | ||
| 84 | ENERGY_UNIT, | ||
| 85 | TIME_UNIT, | ||
| 86 | }; | ||
| 87 | |||
| 88 | enum rapl_domain_type { | ||
| 89 | RAPL_DOMAIN_PACKAGE, /* entire package/socket */ | ||
| 90 | RAPL_DOMAIN_PP0, /* core power plane */ | ||
| 91 | RAPL_DOMAIN_PP1, /* graphics uncore */ | ||
| 92 | RAPL_DOMAIN_DRAM,/* DRAM control_type */ | ||
| 93 | RAPL_DOMAIN_MAX, | ||
| 94 | }; | ||
| 95 | |||
| 96 | enum rapl_domain_msr_id { | ||
| 97 | RAPL_DOMAIN_MSR_LIMIT, | ||
| 98 | RAPL_DOMAIN_MSR_STATUS, | ||
| 99 | RAPL_DOMAIN_MSR_PERF, | ||
| 100 | RAPL_DOMAIN_MSR_POLICY, | ||
| 101 | RAPL_DOMAIN_MSR_INFO, | ||
| 102 | RAPL_DOMAIN_MSR_MAX, | ||
| 103 | }; | ||
| 104 | |||
| 105 | /* per domain data, some are optional */ | ||
| 106 | enum rapl_primitives { | ||
| 107 | ENERGY_COUNTER, | ||
| 108 | POWER_LIMIT1, | ||
| 109 | POWER_LIMIT2, | ||
| 110 | FW_LOCK, | ||
| 111 | |||
| 112 | PL1_ENABLE, /* power limit 1, aka long term */ | ||
| 113 | PL1_CLAMP, /* allow frequency to go below OS request */ | ||
| 114 | PL2_ENABLE, /* power limit 2, aka short term, instantaneous */ | ||
| 115 | PL2_CLAMP, | ||
| 116 | |||
| 117 | TIME_WINDOW1, /* long term */ | ||
| 118 | TIME_WINDOW2, /* short term */ | ||
| 119 | THERMAL_SPEC_POWER, | ||
| 120 | MAX_POWER, | ||
| 121 | |||
| 122 | MIN_POWER, | ||
| 123 | MAX_TIME_WINDOW, | ||
| 124 | THROTTLED_TIME, | ||
| 125 | PRIORITY_LEVEL, | ||
| 126 | |||
| 127 | /* below are not raw primitive data */ | ||
| 128 | AVERAGE_POWER, | ||
| 129 | NR_RAPL_PRIMITIVES, | ||
| 130 | }; | ||
| 131 | |||
| 132 | #define NR_RAW_PRIMITIVES (NR_RAPL_PRIMITIVES - 2) | ||
| 133 | |||
| 134 | /* Can be expanded to include events, etc.*/ | ||
| 135 | struct rapl_domain_data { | ||
| 136 | u64 primitives[NR_RAPL_PRIMITIVES]; | ||
| 137 | unsigned long timestamp; | ||
| 138 | }; | ||
| 139 | |||
| 140 | |||
| 141 | #define DOMAIN_STATE_INACTIVE BIT(0) | ||
| 142 | #define DOMAIN_STATE_POWER_LIMIT_SET BIT(1) | ||
| 143 | #define DOMAIN_STATE_BIOS_LOCKED BIT(2) | ||
| 144 | |||
| 145 | #define NR_POWER_LIMITS (2) | ||
| 146 | struct rapl_power_limit { | ||
| 147 | struct powercap_zone_constraint *constraint; | ||
| 148 | int prim_id; /* primitive ID used to enable */ | ||
| 149 | struct rapl_domain *domain; | ||
| 150 | const char *name; | ||
| 151 | }; | ||
| 152 | |||
| 153 | static const char pl1_name[] = "long_term"; | ||
| 154 | static const char pl2_name[] = "short_term"; | ||
| 155 | |||
| 156 | struct rapl_domain { | ||
| 157 | const char *name; | ||
| 158 | enum rapl_domain_type id; | ||
| 159 | int msrs[RAPL_DOMAIN_MSR_MAX]; | ||
| 160 | struct powercap_zone power_zone; | ||
| 161 | struct rapl_domain_data rdd; | ||
| 162 | struct rapl_power_limit rpl[NR_POWER_LIMITS]; | ||
| 163 | u64 attr_map; /* track capabilities */ | ||
| 164 | unsigned int state; | ||
| 165 | int package_id; | ||
| 166 | }; | ||
| 167 | #define power_zone_to_rapl_domain(_zone) \ | ||
| 168 | container_of(_zone, struct rapl_domain, power_zone) | ||
| 169 | |||
| 170 | |||
| 171 | /* Each physical package contains multiple domains, these are the common | ||
| 172 | * data across RAPL domains within a package. | ||
| 173 | */ | ||
| 174 | struct rapl_package { | ||
| 175 | unsigned int id; /* physical package/socket id */ | ||
| 176 | unsigned int nr_domains; | ||
| 177 | unsigned long domain_map; /* bit map of active domains */ | ||
| 178 | unsigned int power_unit_divisor; | ||
| 179 | unsigned int energy_unit_divisor; | ||
| 180 | unsigned int time_unit_divisor; | ||
| 181 | struct rapl_domain *domains; /* array of domains, sized at runtime */ | ||
| 182 | struct powercap_zone *power_zone; /* keep track of parent zone */ | ||
| 183 | int nr_cpus; /* active cpus on the package, topology info is lost during | ||
| 184 | * cpu hotplug. so we have to track ourselves. | ||
| 185 | */ | ||
| 186 | unsigned long power_limit_irq; /* keep track of package power limit | ||
| 187 | * notify interrupt enable status. | ||
| 188 | */ | ||
| 189 | struct list_head plist; | ||
| 190 | }; | ||
| 191 | #define PACKAGE_PLN_INT_SAVED BIT(0) | ||
| 192 | #define MAX_PRIM_NAME (32) | ||
| 193 | |||
| 194 | /* per domain data. used to describe individual knobs such that access function | ||
| 195 | * can be consolidated into one instead of many inline functions. | ||
| 196 | */ | ||
| 197 | struct rapl_primitive_info { | ||
| 198 | const char *name; | ||
| 199 | u64 mask; | ||
| 200 | int shift; | ||
| 201 | enum rapl_domain_msr_id id; | ||
| 202 | enum unit_type unit; | ||
| 203 | u32 flag; | ||
| 204 | }; | ||
| 205 | |||
| 206 | #define PRIMITIVE_INFO_INIT(p, m, s, i, u, f) { \ | ||
| 207 | .name = #p, \ | ||
| 208 | .mask = m, \ | ||
| 209 | .shift = s, \ | ||
| 210 | .id = i, \ | ||
| 211 | .unit = u, \ | ||
| 212 | .flag = f \ | ||
| 213 | } | ||
| 214 | |||
| 215 | static void rapl_init_domains(struct rapl_package *rp); | ||
| 216 | static int rapl_read_data_raw(struct rapl_domain *rd, | ||
| 217 | enum rapl_primitives prim, | ||
| 218 | bool xlate, u64 *data); | ||
| 219 | static int rapl_write_data_raw(struct rapl_domain *rd, | ||
| 220 | enum rapl_primitives prim, | ||
| 221 | unsigned long long value); | ||
| 222 | static u64 rapl_unit_xlate(int package, enum unit_type type, u64 value, | ||
| 223 | int to_raw); | ||
| 224 | static void package_power_limit_irq_save(int package_id); | ||
| 225 | |||
| 226 | static LIST_HEAD(rapl_packages); /* guarded by CPU hotplug lock */ | ||
| 227 | |||
| 228 | static const char * const rapl_domain_names[] = { | ||
| 229 | "package", | ||
| 230 | "core", | ||
| 231 | "uncore", | ||
| 232 | "dram", | ||
| 233 | }; | ||
| 234 | |||
| 235 | static struct powercap_control_type *control_type; /* PowerCap Controller */ | ||
| 236 | |||
| 237 | /* caller to ensure CPU hotplug lock is held */ | ||
| 238 | static struct rapl_package *find_package_by_id(int id) | ||
| 239 | { | ||
| 240 | struct rapl_package *rp; | ||
| 241 | |||
| 242 | list_for_each_entry(rp, &rapl_packages, plist) { | ||
| 243 | if (rp->id == id) | ||
| 244 | return rp; | ||
| 245 | } | ||
| 246 | |||
| 247 | return NULL; | ||
| 248 | } | ||
| 249 | |||
| 250 | /* caller to ensure CPU hotplug lock is held */ | ||
| 251 | static int find_active_cpu_on_package(int package_id) | ||
| 252 | { | ||
| 253 | int i; | ||
| 254 | |||
| 255 | for_each_online_cpu(i) { | ||
| 256 | if (topology_physical_package_id(i) == package_id) | ||
| 257 | return i; | ||
| 258 | } | ||
| 259 | /* all CPUs on this package are offline */ | ||
| 260 | |||
| 261 | return -ENODEV; | ||
| 262 | } | ||
| 263 | |||
| 264 | /* caller must hold cpu hotplug lock */ | ||
| 265 | static void rapl_cleanup_data(void) | ||
| 266 | { | ||
| 267 | struct rapl_package *p, *tmp; | ||
| 268 | |||
| 269 | list_for_each_entry_safe(p, tmp, &rapl_packages, plist) { | ||
| 270 | kfree(p->domains); | ||
| 271 | list_del(&p->plist); | ||
| 272 | kfree(p); | ||
| 273 | } | ||
| 274 | } | ||
| 275 | |||
| 276 | static int get_energy_counter(struct powercap_zone *power_zone, u64 *energy_raw) | ||
| 277 | { | ||
| 278 | struct rapl_domain *rd; | ||
| 279 | u64 energy_now; | ||
| 280 | |||
| 281 | /* prevent CPU hotplug, make sure the RAPL domain does not go | ||
| 282 | * away while reading the counter. | ||
| 283 | */ | ||
| 284 | get_online_cpus(); | ||
| 285 | rd = power_zone_to_rapl_domain(power_zone); | ||
| 286 | |||
| 287 | if (!rapl_read_data_raw(rd, ENERGY_COUNTER, true, &energy_now)) { | ||
| 288 | *energy_raw = energy_now; | ||
| 289 | put_online_cpus(); | ||
| 290 | |||
| 291 | return 0; | ||
| 292 | } | ||
| 293 | put_online_cpus(); | ||
| 294 | |||
| 295 | return -EIO; | ||
| 296 | } | ||
| 297 | |||
| 298 | static int get_max_energy_counter(struct powercap_zone *pcd_dev, u64 *energy) | ||
| 299 | { | ||
| 300 | *energy = rapl_unit_xlate(0, ENERGY_UNIT, ENERGY_STATUS_MASK, 0); | ||
| 301 | return 0; | ||
| 302 | } | ||
| 303 | |||
| 304 | static int release_zone(struct powercap_zone *power_zone) | ||
| 305 | { | ||
| 306 | struct rapl_domain *rd = power_zone_to_rapl_domain(power_zone); | ||
| 307 | struct rapl_package *rp; | ||
| 308 | |||
| 309 | /* package zone is the last zone of a package, we can free | ||
| 310 | * memory here since all children has been unregistered. | ||
| 311 | */ | ||
| 312 | if (rd->id == RAPL_DOMAIN_PACKAGE) { | ||
| 313 | rp = find_package_by_id(rd->package_id); | ||
| 314 | if (!rp) { | ||
| 315 | dev_warn(&power_zone->dev, "no package id %s\n", | ||
| 316 | rd->name); | ||
| 317 | return -ENODEV; | ||
| 318 | } | ||
| 319 | kfree(rd); | ||
| 320 | rp->domains = NULL; | ||
| 321 | } | ||
| 322 | |||
| 323 | return 0; | ||
| 324 | |||
| 325 | } | ||
| 326 | |||
| 327 | static int find_nr_power_limit(struct rapl_domain *rd) | ||
| 328 | { | ||
| 329 | int i; | ||
| 330 | |||
| 331 | for (i = 0; i < NR_POWER_LIMITS; i++) { | ||
| 332 | if (rd->rpl[i].name == NULL) | ||
| 333 | break; | ||
| 334 | } | ||
| 335 | |||
| 336 | return i; | ||
| 337 | } | ||
| 338 | |||
| 339 | static int set_domain_enable(struct powercap_zone *power_zone, bool mode) | ||
| 340 | { | ||
| 341 | struct rapl_domain *rd = power_zone_to_rapl_domain(power_zone); | ||
| 342 | int nr_powerlimit; | ||
| 343 | |||
| 344 | if (rd->state & DOMAIN_STATE_BIOS_LOCKED) | ||
| 345 | return -EACCES; | ||
| 346 | get_online_cpus(); | ||
| 347 | nr_powerlimit = find_nr_power_limit(rd); | ||
| 348 | /* here we activate/deactivate the hardware for power limiting */ | ||
| 349 | rapl_write_data_raw(rd, PL1_ENABLE, mode); | ||
| 350 | /* always enable clamp such that p-state can go below OS requested | ||
| 351 | * range. power capping priority over guranteed frequency. | ||
| 352 | */ | ||
| 353 | rapl_write_data_raw(rd, PL1_CLAMP, mode); | ||
| 354 | /* some domains have pl2 */ | ||
| 355 | if (nr_powerlimit > 1) { | ||
| 356 | rapl_write_data_raw(rd, PL2_ENABLE, mode); | ||
| 357 | rapl_write_data_raw(rd, PL2_CLAMP, mode); | ||
| 358 | } | ||
| 359 | put_online_cpus(); | ||
| 360 | |||
| 361 | return 0; | ||
| 362 | } | ||
| 363 | |||
| 364 | static int get_domain_enable(struct powercap_zone *power_zone, bool *mode) | ||
| 365 | { | ||
| 366 | struct rapl_domain *rd = power_zone_to_rapl_domain(power_zone); | ||
| 367 | u64 val; | ||
| 368 | |||
| 369 | if (rd->state & DOMAIN_STATE_BIOS_LOCKED) { | ||
| 370 | *mode = false; | ||
| 371 | return 0; | ||
| 372 | } | ||
| 373 | get_online_cpus(); | ||
| 374 | if (rapl_read_data_raw(rd, PL1_ENABLE, true, &val)) { | ||
| 375 | put_online_cpus(); | ||
| 376 | return -EIO; | ||
| 377 | } | ||
| 378 | *mode = val; | ||
| 379 | put_online_cpus(); | ||
| 380 | |||
| 381 | return 0; | ||
| 382 | } | ||
| 383 | |||
| 384 | /* per RAPL domain ops, in the order of rapl_domain_type */ | ||
| 385 | static struct powercap_zone_ops zone_ops[] = { | ||
| 386 | /* RAPL_DOMAIN_PACKAGE */ | ||
| 387 | { | ||
| 388 | .get_energy_uj = get_energy_counter, | ||
| 389 | .get_max_energy_range_uj = get_max_energy_counter, | ||
| 390 | .release = release_zone, | ||
| 391 | .set_enable = set_domain_enable, | ||
| 392 | .get_enable = get_domain_enable, | ||
| 393 | }, | ||
| 394 | /* RAPL_DOMAIN_PP0 */ | ||
| 395 | { | ||
| 396 | .get_energy_uj = get_energy_counter, | ||
| 397 | .get_max_energy_range_uj = get_max_energy_counter, | ||
| 398 | .release = release_zone, | ||
| 399 | .set_enable = set_domain_enable, | ||
| 400 | .get_enable = get_domain_enable, | ||
| 401 | }, | ||
| 402 | /* RAPL_DOMAIN_PP1 */ | ||
| 403 | { | ||
| 404 | .get_energy_uj = get_energy_counter, | ||
| 405 | .get_max_energy_range_uj = get_max_energy_counter, | ||
| 406 | .release = release_zone, | ||
| 407 | .set_enable = set_domain_enable, | ||
| 408 | .get_enable = get_domain_enable, | ||
| 409 | }, | ||
| 410 | /* RAPL_DOMAIN_DRAM */ | ||
| 411 | { | ||
| 412 | .get_energy_uj = get_energy_counter, | ||
| 413 | .get_max_energy_range_uj = get_max_energy_counter, | ||
| 414 | .release = release_zone, | ||
| 415 | .set_enable = set_domain_enable, | ||
| 416 | .get_enable = get_domain_enable, | ||
| 417 | }, | ||
| 418 | }; | ||
| 419 | |||
| 420 | static int set_power_limit(struct powercap_zone *power_zone, int id, | ||
| 421 | u64 power_limit) | ||
| 422 | { | ||
| 423 | struct rapl_domain *rd; | ||
| 424 | struct rapl_package *rp; | ||
| 425 | int ret = 0; | ||
| 426 | |||
| 427 | get_online_cpus(); | ||
| 428 | rd = power_zone_to_rapl_domain(power_zone); | ||
| 429 | rp = find_package_by_id(rd->package_id); | ||
| 430 | if (!rp) { | ||
| 431 | ret = -ENODEV; | ||
| 432 | goto set_exit; | ||
| 433 | } | ||
| 434 | |||
| 435 | if (rd->state & DOMAIN_STATE_BIOS_LOCKED) { | ||
| 436 | dev_warn(&power_zone->dev, "%s locked by BIOS, monitoring only\n", | ||
| 437 | rd->name); | ||
| 438 | ret = -EACCES; | ||
| 439 | goto set_exit; | ||
| 440 | } | ||
| 441 | |||
| 442 | switch (rd->rpl[id].prim_id) { | ||
| 443 | case PL1_ENABLE: | ||
| 444 | rapl_write_data_raw(rd, POWER_LIMIT1, power_limit); | ||
| 445 | break; | ||
| 446 | case PL2_ENABLE: | ||
| 447 | rapl_write_data_raw(rd, POWER_LIMIT2, power_limit); | ||
| 448 | break; | ||
| 449 | default: | ||
| 450 | ret = -EINVAL; | ||
| 451 | } | ||
| 452 | if (!ret) | ||
| 453 | package_power_limit_irq_save(rd->package_id); | ||
| 454 | set_exit: | ||
| 455 | put_online_cpus(); | ||
| 456 | return ret; | ||
| 457 | } | ||
| 458 | |||
| 459 | static int get_current_power_limit(struct powercap_zone *power_zone, int id, | ||
| 460 | u64 *data) | ||
| 461 | { | ||
| 462 | struct rapl_domain *rd; | ||
| 463 | u64 val; | ||
| 464 | int prim; | ||
| 465 | int ret = 0; | ||
| 466 | |||
| 467 | get_online_cpus(); | ||
| 468 | rd = power_zone_to_rapl_domain(power_zone); | ||
| 469 | switch (rd->rpl[id].prim_id) { | ||
| 470 | case PL1_ENABLE: | ||
| 471 | prim = POWER_LIMIT1; | ||
| 472 | break; | ||
| 473 | case PL2_ENABLE: | ||
| 474 | prim = POWER_LIMIT2; | ||
| 475 | break; | ||
| 476 | default: | ||
| 477 | put_online_cpus(); | ||
| 478 | return -EINVAL; | ||
| 479 | } | ||
| 480 | if (rapl_read_data_raw(rd, prim, true, &val)) | ||
| 481 | ret = -EIO; | ||
| 482 | else | ||
| 483 | *data = val; | ||
| 484 | |||
| 485 | put_online_cpus(); | ||
| 486 | |||
| 487 | return ret; | ||
| 488 | } | ||
| 489 | |||
| 490 | static int set_time_window(struct powercap_zone *power_zone, int id, | ||
| 491 | u64 window) | ||
| 492 | { | ||
| 493 | struct rapl_domain *rd; | ||
| 494 | int ret = 0; | ||
| 495 | |||
| 496 | get_online_cpus(); | ||
| 497 | rd = power_zone_to_rapl_domain(power_zone); | ||
| 498 | switch (rd->rpl[id].prim_id) { | ||
| 499 | case PL1_ENABLE: | ||
| 500 | rapl_write_data_raw(rd, TIME_WINDOW1, window); | ||
| 501 | break; | ||
| 502 | case PL2_ENABLE: | ||
| 503 | rapl_write_data_raw(rd, TIME_WINDOW2, window); | ||
| 504 | break; | ||
| 505 | default: | ||
| 506 | ret = -EINVAL; | ||
| 507 | } | ||
| 508 | put_online_cpus(); | ||
| 509 | return ret; | ||
| 510 | } | ||
| 511 | |||
| 512 | static int get_time_window(struct powercap_zone *power_zone, int id, u64 *data) | ||
| 513 | { | ||
| 514 | struct rapl_domain *rd; | ||
| 515 | u64 val; | ||
| 516 | int ret = 0; | ||
| 517 | |||
| 518 | get_online_cpus(); | ||
| 519 | rd = power_zone_to_rapl_domain(power_zone); | ||
| 520 | switch (rd->rpl[id].prim_id) { | ||
| 521 | case PL1_ENABLE: | ||
| 522 | ret = rapl_read_data_raw(rd, TIME_WINDOW1, true, &val); | ||
| 523 | break; | ||
| 524 | case PL2_ENABLE: | ||
| 525 | ret = rapl_read_data_raw(rd, TIME_WINDOW2, true, &val); | ||
| 526 | break; | ||
| 527 | default: | ||
| 528 | put_online_cpus(); | ||
| 529 | return -EINVAL; | ||
| 530 | } | ||
| 531 | if (!ret) | ||
| 532 | *data = val; | ||
| 533 | put_online_cpus(); | ||
| 534 | |||
| 535 | return ret; | ||
| 536 | } | ||
| 537 | |||
| 538 | static const char *get_constraint_name(struct powercap_zone *power_zone, int id) | ||
| 539 | { | ||
| 540 | struct rapl_power_limit *rpl; | ||
| 541 | struct rapl_domain *rd; | ||
| 542 | |||
| 543 | rd = power_zone_to_rapl_domain(power_zone); | ||
| 544 | rpl = (struct rapl_power_limit *) &rd->rpl[id]; | ||
| 545 | |||
| 546 | return rpl->name; | ||
| 547 | } | ||
| 548 | |||
| 549 | |||
| 550 | static int get_max_power(struct powercap_zone *power_zone, int id, | ||
| 551 | u64 *data) | ||
| 552 | { | ||
| 553 | struct rapl_domain *rd; | ||
| 554 | u64 val; | ||
| 555 | int prim; | ||
| 556 | int ret = 0; | ||
| 557 | |||
| 558 | get_online_cpus(); | ||
| 559 | rd = power_zone_to_rapl_domain(power_zone); | ||
| 560 | switch (rd->rpl[id].prim_id) { | ||
| 561 | case PL1_ENABLE: | ||
| 562 | prim = THERMAL_SPEC_POWER; | ||
| 563 | break; | ||
| 564 | case PL2_ENABLE: | ||
| 565 | prim = MAX_POWER; | ||
| 566 | break; | ||
| 567 | default: | ||
| 568 | put_online_cpus(); | ||
| 569 | return -EINVAL; | ||
| 570 | } | ||
| 571 | if (rapl_read_data_raw(rd, prim, true, &val)) | ||
| 572 | ret = -EIO; | ||
| 573 | else | ||
| 574 | *data = val; | ||
| 575 | |||
| 576 | put_online_cpus(); | ||
| 577 | |||
| 578 | return ret; | ||
| 579 | } | ||
| 580 | |||
| 581 | static struct powercap_zone_constraint_ops constraint_ops = { | ||
| 582 | .set_power_limit_uw = set_power_limit, | ||
| 583 | .get_power_limit_uw = get_current_power_limit, | ||
| 584 | .set_time_window_us = set_time_window, | ||
| 585 | .get_time_window_us = get_time_window, | ||
| 586 | .get_max_power_uw = get_max_power, | ||
| 587 | .get_name = get_constraint_name, | ||
| 588 | }; | ||
| 589 | |||
| 590 | /* called after domain detection and package level data are set */ | ||
| 591 | static void rapl_init_domains(struct rapl_package *rp) | ||
| 592 | { | ||
| 593 | int i; | ||
| 594 | struct rapl_domain *rd = rp->domains; | ||
| 595 | |||
| 596 | for (i = 0; i < RAPL_DOMAIN_MAX; i++) { | ||
| 597 | unsigned int mask = rp->domain_map & (1 << i); | ||
| 598 | switch (mask) { | ||
| 599 | case BIT(RAPL_DOMAIN_PACKAGE): | ||
| 600 | rd->name = rapl_domain_names[RAPL_DOMAIN_PACKAGE]; | ||
| 601 | rd->id = RAPL_DOMAIN_PACKAGE; | ||
| 602 | rd->msrs[0] = MSR_PKG_POWER_LIMIT; | ||
| 603 | rd->msrs[1] = MSR_PKG_ENERGY_STATUS; | ||
| 604 | rd->msrs[2] = MSR_PKG_PERF_STATUS; | ||
| 605 | rd->msrs[3] = 0; | ||
| 606 | rd->msrs[4] = MSR_PKG_POWER_INFO; | ||
| 607 | rd->rpl[0].prim_id = PL1_ENABLE; | ||
| 608 | rd->rpl[0].name = pl1_name; | ||
| 609 | rd->rpl[1].prim_id = PL2_ENABLE; | ||
| 610 | rd->rpl[1].name = pl2_name; | ||
| 611 | break; | ||
| 612 | case BIT(RAPL_DOMAIN_PP0): | ||
| 613 | rd->name = rapl_domain_names[RAPL_DOMAIN_PP0]; | ||
| 614 | rd->id = RAPL_DOMAIN_PP0; | ||
| 615 | rd->msrs[0] = MSR_PP0_POWER_LIMIT; | ||
| 616 | rd->msrs[1] = MSR_PP0_ENERGY_STATUS; | ||
| 617 | rd->msrs[2] = 0; | ||
| 618 | rd->msrs[3] = MSR_PP0_POLICY; | ||
| 619 | rd->msrs[4] = 0; | ||
| 620 | rd->rpl[0].prim_id = PL1_ENABLE; | ||
| 621 | rd->rpl[0].name = pl1_name; | ||
| 622 | break; | ||
| 623 | case BIT(RAPL_DOMAIN_PP1): | ||
| 624 | rd->name = rapl_domain_names[RAPL_DOMAIN_PP1]; | ||
| 625 | rd->id = RAPL_DOMAIN_PP1; | ||
| 626 | rd->msrs[0] = MSR_PP1_POWER_LIMIT; | ||
| 627 | rd->msrs[1] = MSR_PP1_ENERGY_STATUS; | ||
| 628 | rd->msrs[2] = 0; | ||
| 629 | rd->msrs[3] = MSR_PP1_POLICY; | ||
| 630 | rd->msrs[4] = 0; | ||
| 631 | rd->rpl[0].prim_id = PL1_ENABLE; | ||
| 632 | rd->rpl[0].name = pl1_name; | ||
| 633 | break; | ||
| 634 | case BIT(RAPL_DOMAIN_DRAM): | ||
| 635 | rd->name = rapl_domain_names[RAPL_DOMAIN_DRAM]; | ||
| 636 | rd->id = RAPL_DOMAIN_DRAM; | ||
| 637 | rd->msrs[0] = MSR_DRAM_POWER_LIMIT; | ||
| 638 | rd->msrs[1] = MSR_DRAM_ENERGY_STATUS; | ||
| 639 | rd->msrs[2] = MSR_DRAM_PERF_STATUS; | ||
| 640 | rd->msrs[3] = 0; | ||
| 641 | rd->msrs[4] = MSR_DRAM_POWER_INFO; | ||
| 642 | rd->rpl[0].prim_id = PL1_ENABLE; | ||
| 643 | rd->rpl[0].name = pl1_name; | ||
| 644 | break; | ||
| 645 | } | ||
| 646 | if (mask) { | ||
| 647 | rd->package_id = rp->id; | ||
| 648 | rd++; | ||
| 649 | } | ||
| 650 | } | ||
| 651 | } | ||
| 652 | |||
| 653 | static u64 rapl_unit_xlate(int package, enum unit_type type, u64 value, | ||
| 654 | int to_raw) | ||
| 655 | { | ||
| 656 | u64 divisor = 1; | ||
| 657 | int scale = 1; /* scale to user friendly data without floating point */ | ||
| 658 | u64 f, y; /* fraction and exp. used for time unit */ | ||
| 659 | struct rapl_package *rp; | ||
| 660 | |||
| 661 | rp = find_package_by_id(package); | ||
| 662 | if (!rp) | ||
| 663 | return value; | ||
| 664 | |||
| 665 | switch (type) { | ||
| 666 | case POWER_UNIT: | ||
| 667 | divisor = rp->power_unit_divisor; | ||
| 668 | scale = POWER_UNIT_SCALE; | ||
| 669 | break; | ||
| 670 | case ENERGY_UNIT: | ||
| 671 | scale = ENERGY_UNIT_SCALE; | ||
| 672 | divisor = rp->energy_unit_divisor; | ||
| 673 | break; | ||
| 674 | case TIME_UNIT: | ||
| 675 | divisor = rp->time_unit_divisor; | ||
| 676 | scale = TIME_UNIT_SCALE; | ||
| 677 | /* special processing based on 2^Y*(1+F)/4 = val/divisor, refer | ||
| 678 | * to Intel Software Developer's manual Vol. 3a, CH 14.7.4. | ||
| 679 | */ | ||
| 680 | if (!to_raw) { | ||
| 681 | f = (value & 0x60) >> 5; | ||
| 682 | y = value & 0x1f; | ||
| 683 | value = (1 << y) * (4 + f) * scale / 4; | ||
| 684 | return div64_u64(value, divisor); | ||
| 685 | } else { | ||
| 686 | do_div(value, scale); | ||
| 687 | value *= divisor; | ||
| 688 | y = ilog2(value); | ||
| 689 | f = div64_u64(4 * (value - (1 << y)), 1 << y); | ||
| 690 | value = (y & 0x1f) | ((f & 0x3) << 5); | ||
| 691 | return value; | ||
| 692 | } | ||
| 693 | break; | ||
| 694 | case ARBITRARY_UNIT: | ||
| 695 | default: | ||
| 696 | return value; | ||
| 697 | }; | ||
| 698 | |||
| 699 | if (to_raw) | ||
| 700 | return div64_u64(value * divisor, scale); | ||
| 701 | else | ||
| 702 | return div64_u64(value * scale, divisor); | ||
| 703 | } | ||
| 704 | |||
| 705 | /* in the order of enum rapl_primitives */ | ||
| 706 | static struct rapl_primitive_info rpi[] = { | ||
| 707 | /* name, mask, shift, msr index, unit divisor */ | ||
| 708 | PRIMITIVE_INFO_INIT(ENERGY_COUNTER, ENERGY_STATUS_MASK, 0, | ||
| 709 | RAPL_DOMAIN_MSR_STATUS, ENERGY_UNIT, 0), | ||
| 710 | PRIMITIVE_INFO_INIT(POWER_LIMIT1, POWER_LIMIT1_MASK, 0, | ||
| 711 | RAPL_DOMAIN_MSR_LIMIT, POWER_UNIT, 0), | ||
| 712 | PRIMITIVE_INFO_INIT(POWER_LIMIT2, POWER_LIMIT2_MASK, 32, | ||
| 713 | RAPL_DOMAIN_MSR_LIMIT, POWER_UNIT, 0), | ||
| 714 | PRIMITIVE_INFO_INIT(FW_LOCK, POWER_PP_LOCK, 31, | ||
| 715 | RAPL_DOMAIN_MSR_LIMIT, ARBITRARY_UNIT, 0), | ||
| 716 | PRIMITIVE_INFO_INIT(PL1_ENABLE, POWER_LIMIT1_ENABLE, 15, | ||
| 717 | RAPL_DOMAIN_MSR_LIMIT, ARBITRARY_UNIT, 0), | ||
| 718 | PRIMITIVE_INFO_INIT(PL1_CLAMP, POWER_LIMIT1_CLAMP, 16, | ||
| 719 | RAPL_DOMAIN_MSR_LIMIT, ARBITRARY_UNIT, 0), | ||
| 720 | PRIMITIVE_INFO_INIT(PL2_ENABLE, POWER_LIMIT2_ENABLE, 47, | ||
| 721 | RAPL_DOMAIN_MSR_LIMIT, ARBITRARY_UNIT, 0), | ||
| 722 | PRIMITIVE_INFO_INIT(PL2_CLAMP, POWER_LIMIT2_CLAMP, 48, | ||
| 723 | RAPL_DOMAIN_MSR_LIMIT, ARBITRARY_UNIT, 0), | ||
| 724 | PRIMITIVE_INFO_INIT(TIME_WINDOW1, TIME_WINDOW1_MASK, 17, | ||
| 725 | RAPL_DOMAIN_MSR_LIMIT, TIME_UNIT, 0), | ||
| 726 | PRIMITIVE_INFO_INIT(TIME_WINDOW2, TIME_WINDOW2_MASK, 49, | ||
| 727 | RAPL_DOMAIN_MSR_LIMIT, TIME_UNIT, 0), | ||
| 728 | PRIMITIVE_INFO_INIT(THERMAL_SPEC_POWER, POWER_INFO_THERMAL_SPEC_MASK, | ||
| 729 | 0, RAPL_DOMAIN_MSR_INFO, POWER_UNIT, 0), | ||
| 730 | PRIMITIVE_INFO_INIT(MAX_POWER, POWER_INFO_MAX_MASK, 32, | ||
| 731 | RAPL_DOMAIN_MSR_INFO, POWER_UNIT, 0), | ||
| 732 | PRIMITIVE_INFO_INIT(MIN_POWER, POWER_INFO_MIN_MASK, 16, | ||
| 733 | RAPL_DOMAIN_MSR_INFO, POWER_UNIT, 0), | ||
| 734 | PRIMITIVE_INFO_INIT(MAX_TIME_WINDOW, POWER_INFO_MAX_TIME_WIN_MASK, 48, | ||
| 735 | RAPL_DOMAIN_MSR_INFO, TIME_UNIT, 0), | ||
| 736 | PRIMITIVE_INFO_INIT(THROTTLED_TIME, PERF_STATUS_THROTTLE_TIME_MASK, 0, | ||
| 737 | RAPL_DOMAIN_MSR_PERF, TIME_UNIT, 0), | ||
| 738 | PRIMITIVE_INFO_INIT(PRIORITY_LEVEL, PP_POLICY_MASK, 0, | ||
| 739 | RAPL_DOMAIN_MSR_POLICY, ARBITRARY_UNIT, 0), | ||
| 740 | /* non-hardware */ | ||
| 741 | PRIMITIVE_INFO_INIT(AVERAGE_POWER, 0, 0, 0, POWER_UNIT, | ||
| 742 | RAPL_PRIMITIVE_DERIVED), | ||
| 743 | {NULL, 0, 0, 0}, | ||
| 744 | }; | ||
| 745 | |||
| 746 | /* Read primitive data based on its related struct rapl_primitive_info. | ||
| 747 | * if xlate flag is set, return translated data based on data units, i.e. | ||
| 748 | * time, energy, and power. | ||
| 749 | * RAPL MSRs are non-architectual and are laid out not consistently across | ||
| 750 | * domains. Here we use primitive info to allow writing consolidated access | ||
| 751 | * functions. | ||
| 752 | * For a given primitive, it is processed by MSR mask and shift. Unit conversion | ||
| 753 | * is pre-assigned based on RAPL unit MSRs read at init time. | ||
| 754 | * 63-------------------------- 31--------------------------- 0 | ||
| 755 | * | xxxxx (mask) | | ||
| 756 | * | |<- shift ----------------| | ||
| 757 | * 63-------------------------- 31--------------------------- 0 | ||
| 758 | */ | ||
| 759 | static int rapl_read_data_raw(struct rapl_domain *rd, | ||
| 760 | enum rapl_primitives prim, | ||
| 761 | bool xlate, u64 *data) | ||
| 762 | { | ||
| 763 | u64 value, final; | ||
| 764 | u32 msr; | ||
| 765 | struct rapl_primitive_info *rp = &rpi[prim]; | ||
| 766 | int cpu; | ||
| 767 | |||
| 768 | if (!rp->name || rp->flag & RAPL_PRIMITIVE_DUMMY) | ||
| 769 | return -EINVAL; | ||
| 770 | |||
| 771 | msr = rd->msrs[rp->id]; | ||
| 772 | if (!msr) | ||
| 773 | return -EINVAL; | ||
| 774 | /* use physical package id to look up active cpus */ | ||
| 775 | cpu = find_active_cpu_on_package(rd->package_id); | ||
| 776 | if (cpu < 0) | ||
| 777 | return cpu; | ||
| 778 | |||
| 779 | /* special-case package domain, which uses a different bit*/ | ||
| 780 | if (prim == FW_LOCK && rd->id == RAPL_DOMAIN_PACKAGE) { | ||
| 781 | rp->mask = POWER_PACKAGE_LOCK; | ||
| 782 | rp->shift = 63; | ||
| 783 | } | ||
| 784 | /* non-hardware data are collected by the polling thread */ | ||
| 785 | if (rp->flag & RAPL_PRIMITIVE_DERIVED) { | ||
| 786 | *data = rd->rdd.primitives[prim]; | ||
| 787 | return 0; | ||
| 788 | } | ||
| 789 | |||
| 790 | if (rdmsrl_safe_on_cpu(cpu, msr, &value)) { | ||
| 791 | pr_debug("failed to read msr 0x%x on cpu %d\n", msr, cpu); | ||
| 792 | return -EIO; | ||
| 793 | } | ||
| 794 | |||
| 795 | final = value & rp->mask; | ||
| 796 | final = final >> rp->shift; | ||
| 797 | if (xlate) | ||
| 798 | *data = rapl_unit_xlate(rd->package_id, rp->unit, final, 0); | ||
| 799 | else | ||
| 800 | *data = final; | ||
| 801 | |||
| 802 | return 0; | ||
| 803 | } | ||
| 804 | |||
| 805 | /* Similar use of primitive info in the read counterpart */ | ||
| 806 | static int rapl_write_data_raw(struct rapl_domain *rd, | ||
| 807 | enum rapl_primitives prim, | ||
| 808 | unsigned long long value) | ||
| 809 | { | ||
| 810 | u64 msr_val; | ||
| 811 | u32 msr; | ||
| 812 | struct rapl_primitive_info *rp = &rpi[prim]; | ||
| 813 | int cpu; | ||
| 814 | |||
| 815 | cpu = find_active_cpu_on_package(rd->package_id); | ||
| 816 | if (cpu < 0) | ||
| 817 | return cpu; | ||
| 818 | msr = rd->msrs[rp->id]; | ||
| 819 | if (rdmsrl_safe_on_cpu(cpu, msr, &msr_val)) { | ||
| 820 | dev_dbg(&rd->power_zone.dev, | ||
| 821 | "failed to read msr 0x%x on cpu %d\n", msr, cpu); | ||
| 822 | return -EIO; | ||
| 823 | } | ||
| 824 | value = rapl_unit_xlate(rd->package_id, rp->unit, value, 1); | ||
| 825 | msr_val &= ~rp->mask; | ||
| 826 | msr_val |= value << rp->shift; | ||
| 827 | if (wrmsrl_safe_on_cpu(cpu, msr, msr_val)) { | ||
| 828 | dev_dbg(&rd->power_zone.dev, | ||
| 829 | "failed to write msr 0x%x on cpu %d\n", msr, cpu); | ||
| 830 | return -EIO; | ||
| 831 | } | ||
| 832 | |||
| 833 | return 0; | ||
| 834 | } | ||
| 835 | |||
| 836 | static int rapl_check_unit(struct rapl_package *rp, int cpu) | ||
| 837 | { | ||
| 838 | u64 msr_val; | ||
| 839 | u32 value; | ||
| 840 | |||
| 841 | if (rdmsrl_safe_on_cpu(cpu, MSR_RAPL_POWER_UNIT, &msr_val)) { | ||
| 842 | pr_err("Failed to read power unit MSR 0x%x on CPU %d, exit.\n", | ||
| 843 | MSR_RAPL_POWER_UNIT, cpu); | ||
| 844 | return -ENODEV; | ||
| 845 | } | ||
| 846 | |||
| 847 | /* Raw RAPL data stored in MSRs are in certain scales. We need to | ||
| 848 | * convert them into standard units based on the divisors reported in | ||
| 849 | * the RAPL unit MSRs. | ||
| 850 | * i.e. | ||
| 851 | * energy unit: 1/enery_unit_divisor Joules | ||
| 852 | * power unit: 1/power_unit_divisor Watts | ||
| 853 | * time unit: 1/time_unit_divisor Seconds | ||
| 854 | */ | ||
| 855 | value = (msr_val & ENERGY_UNIT_MASK) >> ENERGY_UNIT_OFFSET; | ||
| 856 | rp->energy_unit_divisor = 1 << value; | ||
| 857 | |||
| 858 | |||
| 859 | value = (msr_val & POWER_UNIT_MASK) >> POWER_UNIT_OFFSET; | ||
| 860 | rp->power_unit_divisor = 1 << value; | ||
| 861 | |||
| 862 | value = (msr_val & TIME_UNIT_MASK) >> TIME_UNIT_OFFSET; | ||
| 863 | rp->time_unit_divisor = 1 << value; | ||
| 864 | |||
| 865 | pr_debug("Physical package %d units: energy=%d, time=%d, power=%d\n", | ||
| 866 | rp->id, | ||
| 867 | rp->energy_unit_divisor, | ||
| 868 | rp->time_unit_divisor, | ||
| 869 | rp->power_unit_divisor); | ||
| 870 | |||
| 871 | return 0; | ||
| 872 | } | ||
| 873 | |||
| 874 | /* REVISIT: | ||
| 875 | * When package power limit is set artificially low by RAPL, LVT | ||
| 876 | * thermal interrupt for package power limit should be ignored | ||
| 877 | * since we are not really exceeding the real limit. The intention | ||
| 878 | * is to avoid excessive interrupts while we are trying to save power. | ||
| 879 | * A useful feature might be routing the package_power_limit interrupt | ||
| 880 | * to userspace via eventfd. once we have a usecase, this is simple | ||
| 881 | * to do by adding an atomic notifier. | ||
| 882 | */ | ||
| 883 | |||
| 884 | static void package_power_limit_irq_save(int package_id) | ||
| 885 | { | ||
| 886 | u32 l, h = 0; | ||
| 887 | int cpu; | ||
| 888 | struct rapl_package *rp; | ||
| 889 | |||
| 890 | rp = find_package_by_id(package_id); | ||
| 891 | if (!rp) | ||
| 892 | return; | ||
| 893 | |||
| 894 | if (!boot_cpu_has(X86_FEATURE_PTS) || !boot_cpu_has(X86_FEATURE_PLN)) | ||
| 895 | return; | ||
| 896 | |||
| 897 | cpu = find_active_cpu_on_package(package_id); | ||
| 898 | if (cpu < 0) | ||
| 899 | return; | ||
| 900 | /* save the state of PLN irq mask bit before disabling it */ | ||
| 901 | rdmsr_safe_on_cpu(cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, &l, &h); | ||
| 902 | if (!(rp->power_limit_irq & PACKAGE_PLN_INT_SAVED)) { | ||
| 903 | rp->power_limit_irq = l & PACKAGE_THERM_INT_PLN_ENABLE; | ||
| 904 | rp->power_limit_irq |= PACKAGE_PLN_INT_SAVED; | ||
| 905 | } | ||
| 906 | l &= ~PACKAGE_THERM_INT_PLN_ENABLE; | ||
| 907 | wrmsr_on_cpu(cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, l, h); | ||
| 908 | } | ||
| 909 | |||
| 910 | /* restore per package power limit interrupt enable state */ | ||
| 911 | static void package_power_limit_irq_restore(int package_id) | ||
| 912 | { | ||
| 913 | u32 l, h; | ||
| 914 | int cpu; | ||
| 915 | struct rapl_package *rp; | ||
| 916 | |||
| 917 | rp = find_package_by_id(package_id); | ||
| 918 | if (!rp) | ||
| 919 | return; | ||
| 920 | |||
| 921 | if (!boot_cpu_has(X86_FEATURE_PTS) || !boot_cpu_has(X86_FEATURE_PLN)) | ||
| 922 | return; | ||
| 923 | |||
| 924 | cpu = find_active_cpu_on_package(package_id); | ||
| 925 | if (cpu < 0) | ||
| 926 | return; | ||
| 927 | |||
| 928 | /* irq enable state not saved, nothing to restore */ | ||
| 929 | if (!(rp->power_limit_irq & PACKAGE_PLN_INT_SAVED)) | ||
| 930 | return; | ||
| 931 | rdmsr_safe_on_cpu(cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, &l, &h); | ||
| 932 | |||
| 933 | if (rp->power_limit_irq & PACKAGE_THERM_INT_PLN_ENABLE) | ||
| 934 | l |= PACKAGE_THERM_INT_PLN_ENABLE; | ||
| 935 | else | ||
| 936 | l &= ~PACKAGE_THERM_INT_PLN_ENABLE; | ||
| 937 | |||
| 938 | wrmsr_on_cpu(cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, l, h); | ||
| 939 | } | ||
| 940 | |||
| 941 | static const struct x86_cpu_id rapl_ids[] = { | ||
| 942 | { X86_VENDOR_INTEL, 6, 0x2a},/* SNB */ | ||
| 943 | { X86_VENDOR_INTEL, 6, 0x2d},/* SNB EP */ | ||
| 944 | { X86_VENDOR_INTEL, 6, 0x3a},/* IVB */ | ||
| 945 | { X86_VENDOR_INTEL, 6, 0x45},/* HSW */ | ||
| 946 | /* TODO: Add more CPU IDs after testing */ | ||
| 947 | {} | ||
| 948 | }; | ||
| 949 | MODULE_DEVICE_TABLE(x86cpu, rapl_ids); | ||
| 950 | |||
| 951 | /* read once for all raw primitive data for all packages, domains */ | ||
| 952 | static void rapl_update_domain_data(void) | ||
| 953 | { | ||
| 954 | int dmn, prim; | ||
| 955 | u64 val; | ||
| 956 | struct rapl_package *rp; | ||
| 957 | |||
| 958 | list_for_each_entry(rp, &rapl_packages, plist) { | ||
| 959 | for (dmn = 0; dmn < rp->nr_domains; dmn++) { | ||
| 960 | pr_debug("update package %d domain %s data\n", rp->id, | ||
| 961 | rp->domains[dmn].name); | ||
| 962 | /* exclude non-raw primitives */ | ||
| 963 | for (prim = 0; prim < NR_RAW_PRIMITIVES; prim++) | ||
| 964 | if (!rapl_read_data_raw(&rp->domains[dmn], prim, | ||
| 965 | rpi[prim].unit, | ||
| 966 | &val)) | ||
| 967 | rp->domains[dmn].rdd.primitives[prim] = | ||
| 968 | val; | ||
| 969 | } | ||
| 970 | } | ||
| 971 | |||
| 972 | } | ||
| 973 | |||
| 974 | static int rapl_unregister_powercap(void) | ||
| 975 | { | ||
| 976 | struct rapl_package *rp; | ||
| 977 | struct rapl_domain *rd, *rd_package = NULL; | ||
| 978 | |||
| 979 | /* unregister all active rapl packages from the powercap layer, | ||
| 980 | * hotplug lock held | ||
| 981 | */ | ||
| 982 | list_for_each_entry(rp, &rapl_packages, plist) { | ||
| 983 | package_power_limit_irq_restore(rp->id); | ||
| 984 | |||
| 985 | for (rd = rp->domains; rd < rp->domains + rp->nr_domains; | ||
| 986 | rd++) { | ||
| 987 | pr_debug("remove package, undo power limit on %d: %s\n", | ||
| 988 | rp->id, rd->name); | ||
| 989 | rapl_write_data_raw(rd, PL1_ENABLE, 0); | ||
| 990 | rapl_write_data_raw(rd, PL2_ENABLE, 0); | ||
| 991 | rapl_write_data_raw(rd, PL1_CLAMP, 0); | ||
| 992 | rapl_write_data_raw(rd, PL2_CLAMP, 0); | ||
| 993 | if (rd->id == RAPL_DOMAIN_PACKAGE) { | ||
| 994 | rd_package = rd; | ||
| 995 | continue; | ||
| 996 | } | ||
| 997 | powercap_unregister_zone(control_type, &rd->power_zone); | ||
| 998 | } | ||
| 999 | /* do the package zone last */ | ||
| 1000 | if (rd_package) | ||
| 1001 | powercap_unregister_zone(control_type, | ||
| 1002 | &rd_package->power_zone); | ||
| 1003 | } | ||
| 1004 | powercap_unregister_control_type(control_type); | ||
| 1005 | |||
| 1006 | return 0; | ||
| 1007 | } | ||
| 1008 | |||
| 1009 | static int rapl_package_register_powercap(struct rapl_package *rp) | ||
| 1010 | { | ||
| 1011 | struct rapl_domain *rd; | ||
| 1012 | int ret = 0; | ||
| 1013 | char dev_name[17]; /* max domain name = 7 + 1 + 8 for int + 1 for null*/ | ||
| 1014 | struct powercap_zone *power_zone = NULL; | ||
| 1015 | int nr_pl; | ||
| 1016 | |||
| 1017 | /* first we register package domain as the parent zone*/ | ||
| 1018 | for (rd = rp->domains; rd < rp->domains + rp->nr_domains; rd++) { | ||
| 1019 | if (rd->id == RAPL_DOMAIN_PACKAGE) { | ||
| 1020 | nr_pl = find_nr_power_limit(rd); | ||
| 1021 | pr_debug("register socket %d package domain %s\n", | ||
| 1022 | rp->id, rd->name); | ||
| 1023 | memset(dev_name, 0, sizeof(dev_name)); | ||
| 1024 | snprintf(dev_name, sizeof(dev_name), "%s-%d", | ||
| 1025 | rd->name, rp->id); | ||
| 1026 | power_zone = powercap_register_zone(&rd->power_zone, | ||
| 1027 | control_type, | ||
| 1028 | dev_name, NULL, | ||
| 1029 | &zone_ops[rd->id], | ||
| 1030 | nr_pl, | ||
| 1031 | &constraint_ops); | ||
| 1032 | if (IS_ERR(power_zone)) { | ||
| 1033 | pr_debug("failed to register package, %d\n", | ||
| 1034 | rp->id); | ||
| 1035 | ret = PTR_ERR(power_zone); | ||
| 1036 | goto exit_package; | ||
| 1037 | } | ||
| 1038 | /* track parent zone in per package/socket data */ | ||
| 1039 | rp->power_zone = power_zone; | ||
| 1040 | /* done, only one package domain per socket */ | ||
| 1041 | break; | ||
| 1042 | } | ||
| 1043 | } | ||
| 1044 | if (!power_zone) { | ||
| 1045 | pr_err("no package domain found, unknown topology!\n"); | ||
| 1046 | ret = -ENODEV; | ||
| 1047 | goto exit_package; | ||
| 1048 | } | ||
| 1049 | /* now register domains as children of the socket/package*/ | ||
| 1050 | for (rd = rp->domains; rd < rp->domains + rp->nr_domains; rd++) { | ||
| 1051 | if (rd->id == RAPL_DOMAIN_PACKAGE) | ||
| 1052 | continue; | ||
| 1053 | /* number of power limits per domain varies */ | ||
| 1054 | nr_pl = find_nr_power_limit(rd); | ||
| 1055 | power_zone = powercap_register_zone(&rd->power_zone, | ||
| 1056 | control_type, rd->name, | ||
| 1057 | rp->power_zone, | ||
| 1058 | &zone_ops[rd->id], nr_pl, | ||
| 1059 | &constraint_ops); | ||
| 1060 | |||
| 1061 | if (IS_ERR(power_zone)) { | ||
| 1062 | pr_debug("failed to register power_zone, %d:%s:%s\n", | ||
| 1063 | rp->id, rd->name, dev_name); | ||
| 1064 | ret = PTR_ERR(power_zone); | ||
| 1065 | goto err_cleanup; | ||
| 1066 | } | ||
| 1067 | } | ||
| 1068 | |||
| 1069 | exit_package: | ||
| 1070 | return ret; | ||
| 1071 | err_cleanup: | ||
| 1072 | /* clean up previously initialized domains within the package if we | ||
| 1073 | * failed after the first domain setup. | ||
| 1074 | */ | ||
| 1075 | while (--rd >= rp->domains) { | ||
| 1076 | pr_debug("unregister package %d domain %s\n", rp->id, rd->name); | ||
| 1077 | powercap_unregister_zone(control_type, &rd->power_zone); | ||
| 1078 | } | ||
| 1079 | |||
| 1080 | return ret; | ||
| 1081 | } | ||
| 1082 | |||
| 1083 | static int rapl_register_powercap(void) | ||
| 1084 | { | ||
| 1085 | struct rapl_domain *rd; | ||
| 1086 | struct rapl_package *rp; | ||
| 1087 | int ret = 0; | ||
| 1088 | |||
| 1089 | control_type = powercap_register_control_type(NULL, "intel-rapl", NULL); | ||
| 1090 | if (IS_ERR(control_type)) { | ||
| 1091 | pr_debug("failed to register powercap control_type.\n"); | ||
| 1092 | return PTR_ERR(control_type); | ||
| 1093 | } | ||
| 1094 | /* read the initial data */ | ||
| 1095 | rapl_update_domain_data(); | ||
| 1096 | list_for_each_entry(rp, &rapl_packages, plist) | ||
| 1097 | if (rapl_package_register_powercap(rp)) | ||
| 1098 | goto err_cleanup_package; | ||
| 1099 | return ret; | ||
| 1100 | |||
| 1101 | err_cleanup_package: | ||
| 1102 | /* clean up previously initialized packages */ | ||
| 1103 | list_for_each_entry_continue_reverse(rp, &rapl_packages, plist) { | ||
| 1104 | for (rd = rp->domains; rd < rp->domains + rp->nr_domains; | ||
| 1105 | rd++) { | ||
| 1106 | pr_debug("unregister zone/package %d, %s domain\n", | ||
| 1107 | rp->id, rd->name); | ||
| 1108 | powercap_unregister_zone(control_type, &rd->power_zone); | ||
| 1109 | } | ||
| 1110 | } | ||
| 1111 | |||
| 1112 | return ret; | ||
| 1113 | } | ||
| 1114 | |||
| 1115 | static int rapl_check_domain(int cpu, int domain) | ||
| 1116 | { | ||
| 1117 | unsigned msr; | ||
| 1118 | u64 val1, val2 = 0; | ||
| 1119 | int retry = 0; | ||
| 1120 | |||
| 1121 | switch (domain) { | ||
| 1122 | case RAPL_DOMAIN_PACKAGE: | ||
| 1123 | msr = MSR_PKG_ENERGY_STATUS; | ||
| 1124 | break; | ||
| 1125 | case RAPL_DOMAIN_PP0: | ||
| 1126 | msr = MSR_PP0_ENERGY_STATUS; | ||
| 1127 | break; | ||
| 1128 | case RAPL_DOMAIN_PP1: | ||
| 1129 | msr = MSR_PP1_ENERGY_STATUS; | ||
| 1130 | break; | ||
| 1131 | case RAPL_DOMAIN_DRAM: | ||
| 1132 | msr = MSR_DRAM_ENERGY_STATUS; | ||
| 1133 | break; | ||
| 1134 | default: | ||
| 1135 | pr_err("invalid domain id %d\n", domain); | ||
| 1136 | return -EINVAL; | ||
| 1137 | } | ||
| 1138 | if (rdmsrl_safe_on_cpu(cpu, msr, &val1)) | ||
| 1139 | return -ENODEV; | ||
| 1140 | |||
| 1141 | /* energy counters roll slowly on some domains */ | ||
| 1142 | while (++retry < 10) { | ||
| 1143 | usleep_range(10000, 15000); | ||
| 1144 | rdmsrl_safe_on_cpu(cpu, msr, &val2); | ||
| 1145 | if ((val1 & ENERGY_STATUS_MASK) != (val2 & ENERGY_STATUS_MASK)) | ||
| 1146 | return 0; | ||
| 1147 | } | ||
| 1148 | /* if energy counter does not change, report as bad domain */ | ||
| 1149 | pr_info("domain %s energy ctr %llu:%llu not working, skip\n", | ||
| 1150 | rapl_domain_names[domain], val1, val2); | ||
| 1151 | |||
| 1152 | return -ENODEV; | ||
| 1153 | } | ||
| 1154 | |||
| 1155 | /* Detect active and valid domains for the given CPU, caller must | ||
| 1156 | * ensure the CPU belongs to the targeted package and CPU hotlug is disabled. | ||
| 1157 | */ | ||
| 1158 | static int rapl_detect_domains(struct rapl_package *rp, int cpu) | ||
| 1159 | { | ||
| 1160 | int i; | ||
| 1161 | int ret = 0; | ||
| 1162 | struct rapl_domain *rd; | ||
| 1163 | u64 locked; | ||
| 1164 | |||
| 1165 | for (i = 0; i < RAPL_DOMAIN_MAX; i++) { | ||
| 1166 | /* use physical package id to read counters */ | ||
| 1167 | if (!rapl_check_domain(cpu, i)) | ||
| 1168 | rp->domain_map |= 1 << i; | ||
| 1169 | } | ||
| 1170 | rp->nr_domains = bitmap_weight(&rp->domain_map, RAPL_DOMAIN_MAX); | ||
| 1171 | if (!rp->nr_domains) { | ||
| 1172 | pr_err("no valid rapl domains found in package %d\n", rp->id); | ||
| 1173 | ret = -ENODEV; | ||
| 1174 | goto done; | ||
| 1175 | } | ||
| 1176 | pr_debug("found %d domains on package %d\n", rp->nr_domains, rp->id); | ||
| 1177 | |||
| 1178 | rp->domains = kcalloc(rp->nr_domains + 1, sizeof(struct rapl_domain), | ||
| 1179 | GFP_KERNEL); | ||
| 1180 | if (!rp->domains) { | ||
| 1181 | ret = -ENOMEM; | ||
| 1182 | goto done; | ||
| 1183 | } | ||
| 1184 | rapl_init_domains(rp); | ||
| 1185 | |||
| 1186 | for (rd = rp->domains; rd < rp->domains + rp->nr_domains; rd++) { | ||
| 1187 | /* check if the domain is locked by BIOS */ | ||
| 1188 | if (rapl_read_data_raw(rd, FW_LOCK, false, &locked)) { | ||
| 1189 | pr_info("RAPL package %d domain %s locked by BIOS\n", | ||
| 1190 | rp->id, rd->name); | ||
| 1191 | rd->state |= DOMAIN_STATE_BIOS_LOCKED; | ||
| 1192 | } | ||
| 1193 | } | ||
| 1194 | |||
| 1195 | |||
| 1196 | done: | ||
| 1197 | return ret; | ||
| 1198 | } | ||
| 1199 | |||
| 1200 | static bool is_package_new(int package) | ||
| 1201 | { | ||
| 1202 | struct rapl_package *rp; | ||
| 1203 | |||
| 1204 | /* caller prevents cpu hotplug, there will be no new packages added | ||
| 1205 | * or deleted while traversing the package list, no need for locking. | ||
| 1206 | */ | ||
| 1207 | list_for_each_entry(rp, &rapl_packages, plist) | ||
| 1208 | if (package == rp->id) | ||
| 1209 | return false; | ||
| 1210 | |||
| 1211 | return true; | ||
| 1212 | } | ||
| 1213 | |||
| 1214 | /* RAPL interface can be made of a two-level hierarchy: package level and domain | ||
| 1215 | * level. We first detect the number of packages then domains of each package. | ||
| 1216 | * We have to consider the possiblity of CPU online/offline due to hotplug and | ||
| 1217 | * other scenarios. | ||
| 1218 | */ | ||
| 1219 | static int rapl_detect_topology(void) | ||
| 1220 | { | ||
| 1221 | int i; | ||
| 1222 | int phy_package_id; | ||
| 1223 | struct rapl_package *new_package, *rp; | ||
| 1224 | |||
| 1225 | for_each_online_cpu(i) { | ||
| 1226 | phy_package_id = topology_physical_package_id(i); | ||
| 1227 | if (is_package_new(phy_package_id)) { | ||
| 1228 | new_package = kzalloc(sizeof(*rp), GFP_KERNEL); | ||
| 1229 | if (!new_package) { | ||
| 1230 | rapl_cleanup_data(); | ||
| 1231 | return -ENOMEM; | ||
| 1232 | } | ||
| 1233 | /* add the new package to the list */ | ||
| 1234 | new_package->id = phy_package_id; | ||
| 1235 | new_package->nr_cpus = 1; | ||
| 1236 | |||
| 1237 | /* check if the package contains valid domains */ | ||
| 1238 | if (rapl_detect_domains(new_package, i) || | ||
| 1239 | rapl_check_unit(new_package, i)) { | ||
| 1240 | kfree(new_package->domains); | ||
| 1241 | kfree(new_package); | ||
| 1242 | /* free up the packages already initialized */ | ||
| 1243 | rapl_cleanup_data(); | ||
| 1244 | return -ENODEV; | ||
| 1245 | } | ||
| 1246 | INIT_LIST_HEAD(&new_package->plist); | ||
| 1247 | list_add(&new_package->plist, &rapl_packages); | ||
| 1248 | } else { | ||
| 1249 | rp = find_package_by_id(phy_package_id); | ||
| 1250 | if (rp) | ||
| 1251 | ++rp->nr_cpus; | ||
| 1252 | } | ||
| 1253 | } | ||
| 1254 | |||
| 1255 | return 0; | ||
| 1256 | } | ||
| 1257 | |||
| 1258 | /* called from CPU hotplug notifier, hotplug lock held */ | ||
| 1259 | static void rapl_remove_package(struct rapl_package *rp) | ||
| 1260 | { | ||
| 1261 | struct rapl_domain *rd, *rd_package = NULL; | ||
| 1262 | |||
| 1263 | for (rd = rp->domains; rd < rp->domains + rp->nr_domains; rd++) { | ||
| 1264 | if (rd->id == RAPL_DOMAIN_PACKAGE) { | ||
| 1265 | rd_package = rd; | ||
| 1266 | continue; | ||
| 1267 | } | ||
| 1268 | pr_debug("remove package %d, %s domain\n", rp->id, rd->name); | ||
| 1269 | powercap_unregister_zone(control_type, &rd->power_zone); | ||
| 1270 | } | ||
| 1271 | /* do parent zone last */ | ||
| 1272 | powercap_unregister_zone(control_type, &rd_package->power_zone); | ||
| 1273 | list_del(&rp->plist); | ||
| 1274 | kfree(rp); | ||
| 1275 | } | ||
| 1276 | |||
| 1277 | /* called from CPU hotplug notifier, hotplug lock held */ | ||
| 1278 | static int rapl_add_package(int cpu) | ||
| 1279 | { | ||
| 1280 | int ret = 0; | ||
| 1281 | int phy_package_id; | ||
| 1282 | struct rapl_package *rp; | ||
| 1283 | |||
| 1284 | phy_package_id = topology_physical_package_id(cpu); | ||
| 1285 | rp = kzalloc(sizeof(struct rapl_package), GFP_KERNEL); | ||
| 1286 | if (!rp) | ||
| 1287 | return -ENOMEM; | ||
| 1288 | |||
| 1289 | /* add the new package to the list */ | ||
| 1290 | rp->id = phy_package_id; | ||
| 1291 | rp->nr_cpus = 1; | ||
| 1292 | /* check if the package contains valid domains */ | ||
| 1293 | if (rapl_detect_domains(rp, cpu) || | ||
| 1294 | rapl_check_unit(rp, cpu)) { | ||
| 1295 | ret = -ENODEV; | ||
| 1296 | goto err_free_package; | ||
| 1297 | } | ||
| 1298 | if (!rapl_package_register_powercap(rp)) { | ||
| 1299 | INIT_LIST_HEAD(&rp->plist); | ||
| 1300 | list_add(&rp->plist, &rapl_packages); | ||
| 1301 | return ret; | ||
| 1302 | } | ||
| 1303 | |||
| 1304 | err_free_package: | ||
| 1305 | kfree(rp->domains); | ||
| 1306 | kfree(rp); | ||
| 1307 | |||
| 1308 | return ret; | ||
| 1309 | } | ||
| 1310 | |||
| 1311 | /* Handles CPU hotplug on multi-socket systems. | ||
| 1312 | * If a CPU goes online as the first CPU of the physical package | ||
| 1313 | * we add the RAPL package to the system. Similarly, when the last | ||
| 1314 | * CPU of the package is removed, we remove the RAPL package and its | ||
| 1315 | * associated domains. Cooling devices are handled accordingly at | ||
| 1316 | * per-domain level. | ||
| 1317 | */ | ||
| 1318 | static int rapl_cpu_callback(struct notifier_block *nfb, | ||
| 1319 | unsigned long action, void *hcpu) | ||
| 1320 | { | ||
| 1321 | unsigned long cpu = (unsigned long)hcpu; | ||
| 1322 | int phy_package_id; | ||
| 1323 | struct rapl_package *rp; | ||
| 1324 | |||
| 1325 | phy_package_id = topology_physical_package_id(cpu); | ||
| 1326 | switch (action) { | ||
| 1327 | case CPU_ONLINE: | ||
| 1328 | case CPU_ONLINE_FROZEN: | ||
| 1329 | case CPU_DOWN_FAILED: | ||
| 1330 | case CPU_DOWN_FAILED_FROZEN: | ||
| 1331 | rp = find_package_by_id(phy_package_id); | ||
| 1332 | if (rp) | ||
| 1333 | ++rp->nr_cpus; | ||
| 1334 | else | ||
| 1335 | rapl_add_package(cpu); | ||
| 1336 | break; | ||
| 1337 | case CPU_DOWN_PREPARE: | ||
| 1338 | case CPU_DOWN_PREPARE_FROZEN: | ||
| 1339 | rp = find_package_by_id(phy_package_id); | ||
| 1340 | if (!rp) | ||
| 1341 | break; | ||
| 1342 | if (--rp->nr_cpus == 0) | ||
| 1343 | rapl_remove_package(rp); | ||
| 1344 | } | ||
| 1345 | |||
| 1346 | return NOTIFY_OK; | ||
| 1347 | } | ||
| 1348 | |||
| 1349 | static struct notifier_block rapl_cpu_notifier = { | ||
| 1350 | .notifier_call = rapl_cpu_callback, | ||
| 1351 | }; | ||
| 1352 | |||
| 1353 | static int __init rapl_init(void) | ||
| 1354 | { | ||
| 1355 | int ret = 0; | ||
| 1356 | |||
| 1357 | if (!x86_match_cpu(rapl_ids)) { | ||
| 1358 | pr_err("driver does not support CPU family %d model %d\n", | ||
| 1359 | boot_cpu_data.x86, boot_cpu_data.x86_model); | ||
| 1360 | |||
| 1361 | return -ENODEV; | ||
| 1362 | } | ||
| 1363 | /* prevent CPU hotplug during detection */ | ||
| 1364 | get_online_cpus(); | ||
| 1365 | ret = rapl_detect_topology(); | ||
| 1366 | if (ret) | ||
| 1367 | goto done; | ||
| 1368 | |||
| 1369 | if (rapl_register_powercap()) { | ||
| 1370 | rapl_cleanup_data(); | ||
| 1371 | ret = -ENODEV; | ||
| 1372 | goto done; | ||
| 1373 | } | ||
| 1374 | register_hotcpu_notifier(&rapl_cpu_notifier); | ||
| 1375 | done: | ||
| 1376 | put_online_cpus(); | ||
| 1377 | |||
| 1378 | return ret; | ||
| 1379 | } | ||
| 1380 | |||
| 1381 | static void __exit rapl_exit(void) | ||
| 1382 | { | ||
| 1383 | get_online_cpus(); | ||
| 1384 | unregister_hotcpu_notifier(&rapl_cpu_notifier); | ||
| 1385 | rapl_unregister_powercap(); | ||
| 1386 | rapl_cleanup_data(); | ||
| 1387 | put_online_cpus(); | ||
| 1388 | } | ||
| 1389 | |||
| 1390 | module_init(rapl_init); | ||
| 1391 | module_exit(rapl_exit); | ||
| 1392 | |||
| 1393 | MODULE_DESCRIPTION("Driver for Intel RAPL (Running Average Power Limit)"); | ||
| 1394 | MODULE_AUTHOR("Jacob Pan <jacob.jun.pan@intel.com>"); | ||
| 1395 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c new file mode 100644 index 000000000000..21814f90a44b --- /dev/null +++ b/drivers/powercap/powercap_sys.c | |||
| @@ -0,0 +1,685 @@ | |||
| 1 | /* | ||
| 2 | * Power capping class | ||
| 3 | * Copyright (c) 2013, Intel Corporation. | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify it | ||
| 6 | * under the terms and conditions of the GNU General Public License, | ||
| 7 | * version 2, as published by the Free Software Foundation. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
| 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 12 | * more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License along with | ||
| 15 | * this program; if not, write to the Free Software Foundation, Inc. | ||
| 16 | * | ||
| 17 | */ | ||
| 18 | |||
| 19 | #include <linux/module.h> | ||
| 20 | #include <linux/device.h> | ||
| 21 | #include <linux/err.h> | ||
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/powercap.h> | ||
| 24 | |||
| 25 | #define to_powercap_zone(n) container_of(n, struct powercap_zone, dev) | ||
| 26 | #define to_powercap_control_type(n) \ | ||
| 27 | container_of(n, struct powercap_control_type, dev) | ||
| 28 | |||
| 29 | /* Power zone show function */ | ||
| 30 | #define define_power_zone_show(_attr) \ | ||
| 31 | static ssize_t _attr##_show(struct device *dev, \ | ||
| 32 | struct device_attribute *dev_attr,\ | ||
| 33 | char *buf) \ | ||
| 34 | { \ | ||
| 35 | u64 value; \ | ||
| 36 | ssize_t len = -EINVAL; \ | ||
| 37 | struct powercap_zone *power_zone = to_powercap_zone(dev); \ | ||
| 38 | \ | ||
| 39 | if (power_zone->ops->get_##_attr) { \ | ||
| 40 | if (!power_zone->ops->get_##_attr(power_zone, &value)) \ | ||
| 41 | len = sprintf(buf, "%lld\n", value); \ | ||
| 42 | } \ | ||
| 43 | \ | ||
| 44 | return len; \ | ||
| 45 | } | ||
| 46 | |||
| 47 | /* The only meaningful input is 0 (reset), others are silently ignored */ | ||
| 48 | #define define_power_zone_store(_attr) \ | ||
| 49 | static ssize_t _attr##_store(struct device *dev,\ | ||
| 50 | struct device_attribute *dev_attr, \ | ||
| 51 | const char *buf, size_t count) \ | ||
| 52 | { \ | ||
| 53 | int err; \ | ||
| 54 | struct powercap_zone *power_zone = to_powercap_zone(dev); \ | ||
| 55 | u64 value; \ | ||
| 56 | \ | ||
| 57 | err = kstrtoull(buf, 10, &value); \ | ||
| 58 | if (err) \ | ||
| 59 | return -EINVAL; \ | ||
| 60 | if (value) \ | ||
| 61 | return count; \ | ||
| 62 | if (power_zone->ops->reset_##_attr) { \ | ||
| 63 | if (!power_zone->ops->reset_##_attr(power_zone)) \ | ||
| 64 | return count; \ | ||
| 65 | } \ | ||
| 66 | \ | ||
| 67 | return -EINVAL; \ | ||
| 68 | } | ||
| 69 | |||
| 70 | /* Power zone constraint show function */ | ||
| 71 | #define define_power_zone_constraint_show(_attr) \ | ||
| 72 | static ssize_t show_constraint_##_attr(struct device *dev, \ | ||
| 73 | struct device_attribute *dev_attr,\ | ||
| 74 | char *buf) \ | ||
| 75 | { \ | ||
| 76 | u64 value; \ | ||
| 77 | ssize_t len = -ENODATA; \ | ||
| 78 | struct powercap_zone *power_zone = to_powercap_zone(dev); \ | ||
| 79 | int id; \ | ||
| 80 | struct powercap_zone_constraint *pconst;\ | ||
| 81 | \ | ||
| 82 | if (!sscanf(dev_attr->attr.name, "constraint_%d_", &id)) \ | ||
| 83 | return -EINVAL; \ | ||
| 84 | if (id >= power_zone->const_id_cnt) \ | ||
| 85 | return -EINVAL; \ | ||
| 86 | pconst = &power_zone->constraints[id]; \ | ||
| 87 | if (pconst && pconst->ops && pconst->ops->get_##_attr) { \ | ||
| 88 | if (!pconst->ops->get_##_attr(power_zone, id, &value)) \ | ||
| 89 | len = sprintf(buf, "%lld\n", value); \ | ||
| 90 | } \ | ||
| 91 | \ | ||
| 92 | return len; \ | ||
| 93 | } | ||
| 94 | |||
| 95 | /* Power zone constraint store function */ | ||
| 96 | #define define_power_zone_constraint_store(_attr) \ | ||
| 97 | static ssize_t store_constraint_##_attr(struct device *dev,\ | ||
| 98 | struct device_attribute *dev_attr, \ | ||
| 99 | const char *buf, size_t count) \ | ||
| 100 | { \ | ||
| 101 | int err; \ | ||
| 102 | u64 value; \ | ||
| 103 | struct powercap_zone *power_zone = to_powercap_zone(dev); \ | ||
| 104 | int id; \ | ||
| 105 | struct powercap_zone_constraint *pconst;\ | ||
| 106 | \ | ||
| 107 | if (!sscanf(dev_attr->attr.name, "constraint_%d_", &id)) \ | ||
| 108 | return -EINVAL; \ | ||
| 109 | if (id >= power_zone->const_id_cnt) \ | ||
| 110 | return -EINVAL; \ | ||
| 111 | pconst = &power_zone->constraints[id]; \ | ||
| 112 | err = kstrtoull(buf, 10, &value); \ | ||
| 113 | if (err) \ | ||
| 114 | return -EINVAL; \ | ||
| 115 | if (pconst && pconst->ops && pconst->ops->set_##_attr) { \ | ||
| 116 | if (!pconst->ops->set_##_attr(power_zone, id, value)) \ | ||
| 117 | return count; \ | ||
| 118 | } \ | ||
| 119 | \ | ||
| 120 | return -ENODATA; \ | ||
| 121 | } | ||
| 122 | |||
| 123 | /* Power zone information callbacks */ | ||
| 124 | define_power_zone_show(power_uw); | ||
| 125 | define_power_zone_show(max_power_range_uw); | ||
| 126 | define_power_zone_show(energy_uj); | ||
| 127 | define_power_zone_store(energy_uj); | ||
| 128 | define_power_zone_show(max_energy_range_uj); | ||
| 129 | |||
| 130 | /* Power zone attributes */ | ||
| 131 | static DEVICE_ATTR_RO(max_power_range_uw); | ||
| 132 | static DEVICE_ATTR_RO(power_uw); | ||
| 133 | static DEVICE_ATTR_RO(max_energy_range_uj); | ||
| 134 | static DEVICE_ATTR_RW(energy_uj); | ||
| 135 | |||
| 136 | /* Power zone constraint attributes callbacks */ | ||
| 137 | define_power_zone_constraint_show(power_limit_uw); | ||
| 138 | define_power_zone_constraint_store(power_limit_uw); | ||
| 139 | define_power_zone_constraint_show(time_window_us); | ||
| 140 | define_power_zone_constraint_store(time_window_us); | ||
| 141 | define_power_zone_constraint_show(max_power_uw); | ||
| 142 | define_power_zone_constraint_show(min_power_uw); | ||
| 143 | define_power_zone_constraint_show(max_time_window_us); | ||
| 144 | define_power_zone_constraint_show(min_time_window_us); | ||
| 145 | |||
| 146 | /* For one time seeding of constraint device attributes */ | ||
| 147 | struct powercap_constraint_attr { | ||
| 148 | struct device_attribute power_limit_attr; | ||
| 149 | struct device_attribute time_window_attr; | ||
| 150 | struct device_attribute max_power_attr; | ||
| 151 | struct device_attribute min_power_attr; | ||
| 152 | struct device_attribute max_time_window_attr; | ||
| 153 | struct device_attribute min_time_window_attr; | ||
| 154 | struct device_attribute name_attr; | ||
| 155 | }; | ||
| 156 | |||
| 157 | static struct powercap_constraint_attr | ||
| 158 | constraint_attrs[MAX_CONSTRAINTS_PER_ZONE]; | ||
| 159 | |||
| 160 | /* A list of powercap control_types */ | ||
| 161 | static LIST_HEAD(powercap_cntrl_list); | ||
| 162 | /* Mutex to protect list of powercap control_types */ | ||
| 163 | static DEFINE_MUTEX(powercap_cntrl_list_lock); | ||
| 164 | |||
| 165 | #define POWERCAP_CONSTRAINT_NAME_LEN 30 /* Some limit to avoid overflow */ | ||
| 166 | static ssize_t show_constraint_name(struct device *dev, | ||
| 167 | struct device_attribute *dev_attr, | ||
| 168 | char *buf) | ||
| 169 | { | ||
| 170 | const char *name; | ||
| 171 | struct powercap_zone *power_zone = to_powercap_zone(dev); | ||
| 172 | int id; | ||
| 173 | ssize_t len = -ENODATA; | ||
| 174 | struct powercap_zone_constraint *pconst; | ||
| 175 | |||
| 176 | if (!sscanf(dev_attr->attr.name, "constraint_%d_", &id)) | ||
| 177 | return -EINVAL; | ||
| 178 | if (id >= power_zone->const_id_cnt) | ||
| 179 | return -EINVAL; | ||
| 180 | pconst = &power_zone->constraints[id]; | ||
| 181 | |||
| 182 | if (pconst && pconst->ops && pconst->ops->get_name) { | ||
| 183 | name = pconst->ops->get_name(power_zone, id); | ||
| 184 | if (name) { | ||
| 185 | snprintf(buf, POWERCAP_CONSTRAINT_NAME_LEN, | ||
| 186 | "%s\n", name); | ||
| 187 | buf[POWERCAP_CONSTRAINT_NAME_LEN] = '\0'; | ||
| 188 | len = strlen(buf); | ||
| 189 | } | ||
| 190 | } | ||
| 191 | |||
| 192 | return len; | ||
| 193 | } | ||
| 194 | |||
| 195 | static int create_constraint_attribute(int id, const char *name, | ||
| 196 | int mode, | ||
| 197 | struct device_attribute *dev_attr, | ||
| 198 | ssize_t (*show)(struct device *, | ||
| 199 | struct device_attribute *, char *), | ||
| 200 | ssize_t (*store)(struct device *, | ||
| 201 | struct device_attribute *, | ||
| 202 | const char *, size_t) | ||
| 203 | ) | ||
| 204 | { | ||
| 205 | |||
| 206 | dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s", | ||
| 207 | id, name); | ||
| 208 | if (!dev_attr->attr.name) | ||
| 209 | return -ENOMEM; | ||
| 210 | dev_attr->attr.mode = mode; | ||
| 211 | dev_attr->show = show; | ||
| 212 | dev_attr->store = store; | ||
| 213 | |||
| 214 | return 0; | ||
| 215 | } | ||
| 216 | |||
| 217 | static void free_constraint_attributes(void) | ||
| 218 | { | ||
| 219 | int i; | ||
| 220 | |||
| 221 | for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) { | ||
| 222 | kfree(constraint_attrs[i].power_limit_attr.attr.name); | ||
| 223 | kfree(constraint_attrs[i].time_window_attr.attr.name); | ||
| 224 | kfree(constraint_attrs[i].name_attr.attr.name); | ||
| 225 | kfree(constraint_attrs[i].max_power_attr.attr.name); | ||
| 226 | kfree(constraint_attrs[i].min_power_attr.attr.name); | ||
| 227 | kfree(constraint_attrs[i].max_time_window_attr.attr.name); | ||
| 228 | kfree(constraint_attrs[i].min_time_window_attr.attr.name); | ||
| 229 | } | ||
| 230 | } | ||
| 231 | |||
| 232 | static int seed_constraint_attributes(void) | ||
| 233 | { | ||
| 234 | int i; | ||
| 235 | int ret; | ||
| 236 | |||
| 237 | for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) { | ||
| 238 | ret = create_constraint_attribute(i, "power_limit_uw", | ||
| 239 | S_IWUSR | S_IRUGO, | ||
| 240 | &constraint_attrs[i].power_limit_attr, | ||
| 241 | show_constraint_power_limit_uw, | ||
| 242 | store_constraint_power_limit_uw); | ||
| 243 | if (ret) | ||
| 244 | goto err_alloc; | ||
| 245 | ret = create_constraint_attribute(i, "time_window_us", | ||
| 246 | S_IWUSR | S_IRUGO, | ||
| 247 | &constraint_attrs[i].time_window_attr, | ||
| 248 | show_constraint_time_window_us, | ||
| 249 | store_constraint_time_window_us); | ||
| 250 | if (ret) | ||
| 251 | goto err_alloc; | ||
| 252 | ret = create_constraint_attribute(i, "name", S_IRUGO, | ||
| 253 | &constraint_attrs[i].name_attr, | ||
| 254 | show_constraint_name, | ||
| 255 | NULL); | ||
| 256 | if (ret) | ||
| 257 | goto err_alloc; | ||
| 258 | ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO, | ||
| 259 | &constraint_attrs[i].max_power_attr, | ||
| 260 | show_constraint_max_power_uw, | ||
| 261 | NULL); | ||
| 262 | if (ret) | ||
| 263 | goto err_alloc; | ||
| 264 | ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO, | ||
| 265 | &constraint_attrs[i].min_power_attr, | ||
| 266 | show_constraint_min_power_uw, | ||
| 267 | NULL); | ||
| 268 | if (ret) | ||
| 269 | goto err_alloc; | ||
| 270 | ret = create_constraint_attribute(i, "max_time_window_us", | ||
| 271 | S_IRUGO, | ||
| 272 | &constraint_attrs[i].max_time_window_attr, | ||
| 273 | show_constraint_max_time_window_us, | ||
| 274 | NULL); | ||
| 275 | if (ret) | ||
| 276 | goto err_alloc; | ||
| 277 | ret = create_constraint_attribute(i, "min_time_window_us", | ||
| 278 | S_IRUGO, | ||
| 279 | &constraint_attrs[i].min_time_window_attr, | ||
| 280 | show_constraint_min_time_window_us, | ||
| 281 | NULL); | ||
| 282 | if (ret) | ||
| 283 | goto err_alloc; | ||
| 284 | |||
| 285 | } | ||
| 286 | |||
| 287 | return 0; | ||
| 288 | |||
| 289 | err_alloc: | ||
| 290 | free_constraint_attributes(); | ||
| 291 | |||
| 292 | return ret; | ||
| 293 | } | ||
| 294 | |||
| 295 | static int create_constraints(struct powercap_zone *power_zone, | ||
| 296 | int nr_constraints, | ||
| 297 | struct powercap_zone_constraint_ops *const_ops) | ||
| 298 | { | ||
| 299 | int i; | ||
| 300 | int ret = 0; | ||
| 301 | int count; | ||
| 302 | struct powercap_zone_constraint *pconst; | ||
| 303 | |||
| 304 | if (!power_zone || !const_ops || !const_ops->get_power_limit_uw || | ||
| 305 | !const_ops->set_power_limit_uw || | ||
| 306 | !const_ops->get_time_window_us || | ||
| 307 | !const_ops->set_time_window_us) | ||
| 308 | return -EINVAL; | ||
| 309 | |||
| 310 | count = power_zone->zone_attr_count; | ||
| 311 | for (i = 0; i < nr_constraints; ++i) { | ||
| 312 | pconst = &power_zone->constraints[i]; | ||
| 313 | pconst->ops = const_ops; | ||
| 314 | pconst->id = power_zone->const_id_cnt; | ||
| 315 | power_zone->const_id_cnt++; | ||
| 316 | power_zone->zone_dev_attrs[count++] = | ||
| 317 | &constraint_attrs[i].power_limit_attr.attr; | ||
| 318 | power_zone->zone_dev_attrs[count++] = | ||
| 319 | &constraint_attrs[i].time_window_attr.attr; | ||
| 320 | if (pconst->ops->get_name) | ||
| 321 | power_zone->zone_dev_attrs[count++] = | ||
| 322 | &constraint_attrs[i].name_attr.attr; | ||
| 323 | if (pconst->ops->get_max_power_uw) | ||
| 324 | power_zone->zone_dev_attrs[count++] = | ||
| 325 | &constraint_attrs[i].max_power_attr.attr; | ||
| 326 | if (pconst->ops->get_min_power_uw) | ||
| 327 | power_zone->zone_dev_attrs[count++] = | ||
| 328 | &constraint_attrs[i].min_power_attr.attr; | ||
| 329 | if (pconst->ops->get_max_time_window_us) | ||
| 330 | power_zone->zone_dev_attrs[count++] = | ||
| 331 | &constraint_attrs[i].max_time_window_attr.attr; | ||
| 332 | if (pconst->ops->get_min_time_window_us) | ||
| 333 | power_zone->zone_dev_attrs[count++] = | ||
| 334 | &constraint_attrs[i].min_time_window_attr.attr; | ||
| 335 | } | ||
| 336 | power_zone->zone_attr_count = count; | ||
| 337 | |||
| 338 | return ret; | ||
| 339 | } | ||
| 340 | |||
| 341 | static bool control_type_valid(void *control_type) | ||
| 342 | { | ||
| 343 | struct powercap_control_type *pos = NULL; | ||
| 344 | bool found = false; | ||
| 345 | |||
| 346 | mutex_lock(&powercap_cntrl_list_lock); | ||
| 347 | |||
| 348 | list_for_each_entry(pos, &powercap_cntrl_list, node) { | ||
| 349 | if (pos == control_type) { | ||
| 350 | found = true; | ||
| 351 | break; | ||
| 352 | } | ||
| 353 | } | ||
| 354 | mutex_unlock(&powercap_cntrl_list_lock); | ||
| 355 | |||
| 356 | return found; | ||
| 357 | } | ||
| 358 | |||
| 359 | static ssize_t name_show(struct device *dev, | ||
| 360 | struct device_attribute *attr, | ||
| 361 | char *buf) | ||
| 362 | { | ||
| 363 | struct powercap_zone *power_zone = to_powercap_zone(dev); | ||
| 364 | |||
| 365 | return sprintf(buf, "%s\n", power_zone->name); | ||
| 366 | } | ||
| 367 | |||
| 368 | static DEVICE_ATTR_RO(name); | ||
| 369 | |||
| 370 | /* Create zone and attributes in sysfs */ | ||
| 371 | static void create_power_zone_common_attributes( | ||
| 372 | struct powercap_zone *power_zone) | ||
| 373 | { | ||
| 374 | int count = 0; | ||
| 375 | |||
| 376 | power_zone->zone_dev_attrs[count++] = &dev_attr_name.attr; | ||
| 377 | if (power_zone->ops->get_max_energy_range_uj) | ||
| 378 | power_zone->zone_dev_attrs[count++] = | ||
| 379 | &dev_attr_max_energy_range_uj.attr; | ||
| 380 | if (power_zone->ops->get_energy_uj) | ||
| 381 | power_zone->zone_dev_attrs[count++] = | ||
| 382 | &dev_attr_energy_uj.attr; | ||
| 383 | if (power_zone->ops->get_power_uw) | ||
| 384 | power_zone->zone_dev_attrs[count++] = | ||
| 385 | &dev_attr_power_uw.attr; | ||
| 386 | if (power_zone->ops->get_max_power_range_uw) | ||
| 387 | power_zone->zone_dev_attrs[count++] = | ||
| 388 | &dev_attr_max_power_range_uw.attr; | ||
| 389 | power_zone->zone_dev_attrs[count] = NULL; | ||
| 390 | power_zone->zone_attr_count = count; | ||
| 391 | } | ||
| 392 | |||
| 393 | static void powercap_release(struct device *dev) | ||
| 394 | { | ||
| 395 | bool allocated; | ||
| 396 | |||
| 397 | if (dev->parent) { | ||
| 398 | struct powercap_zone *power_zone = to_powercap_zone(dev); | ||
| 399 | |||
| 400 | /* Store flag as the release() may free memory */ | ||
| 401 | allocated = power_zone->allocated; | ||
| 402 | /* Remove id from parent idr struct */ | ||
| 403 | idr_remove(power_zone->parent_idr, power_zone->id); | ||
| 404 | /* Destroy idrs allocated for this zone */ | ||
| 405 | idr_destroy(&power_zone->idr); | ||
| 406 | kfree(power_zone->name); | ||
| 407 | kfree(power_zone->zone_dev_attrs); | ||
| 408 | kfree(power_zone->constraints); | ||
| 409 | if (power_zone->ops->release) | ||
| 410 | power_zone->ops->release(power_zone); | ||
| 411 | if (allocated) | ||
| 412 | kfree(power_zone); | ||
| 413 | } else { | ||
| 414 | struct powercap_control_type *control_type = | ||
| 415 | to_powercap_control_type(dev); | ||
| 416 | |||
| 417 | /* Store flag as the release() may free memory */ | ||
| 418 | allocated = control_type->allocated; | ||
| 419 | idr_destroy(&control_type->idr); | ||
| 420 | mutex_destroy(&control_type->lock); | ||
| 421 | if (control_type->ops && control_type->ops->release) | ||
| 422 | control_type->ops->release(control_type); | ||
| 423 | if (allocated) | ||
| 424 | kfree(control_type); | ||
| 425 | } | ||
| 426 | } | ||
| 427 | |||
| 428 | static ssize_t enabled_show(struct device *dev, | ||
| 429 | struct device_attribute *attr, | ||
| 430 | char *buf) | ||
| 431 | { | ||
| 432 | bool mode = true; | ||
| 433 | |||
| 434 | /* Default is enabled */ | ||
| 435 | if (dev->parent) { | ||
| 436 | struct powercap_zone *power_zone = to_powercap_zone(dev); | ||
| 437 | if (power_zone->ops->get_enable) | ||
| 438 | if (power_zone->ops->get_enable(power_zone, &mode)) | ||
| 439 | mode = false; | ||
| 440 | } else { | ||
| 441 | struct powercap_control_type *control_type = | ||
| 442 | to_powercap_control_type(dev); | ||
| 443 | if (control_type->ops && control_type->ops->get_enable) | ||
| 444 | if (control_type->ops->get_enable(control_type, &mode)) | ||
| 445 | mode = false; | ||
| 446 | } | ||
| 447 | |||
| 448 | return sprintf(buf, "%d\n", mode); | ||
| 449 | } | ||
| 450 | |||
| 451 | static ssize_t enabled_store(struct device *dev, | ||
| 452 | struct device_attribute *attr, | ||
| 453 | const char *buf, size_t len) | ||
| 454 | { | ||
| 455 | bool mode; | ||
| 456 | |||
| 457 | if (strtobool(buf, &mode)) | ||
| 458 | return -EINVAL; | ||
| 459 | if (dev->parent) { | ||
| 460 | struct powercap_zone *power_zone = to_powercap_zone(dev); | ||
| 461 | if (power_zone->ops->set_enable) | ||
| 462 | if (!power_zone->ops->set_enable(power_zone, mode)) | ||
| 463 | return len; | ||
| 464 | } else { | ||
| 465 | struct powercap_control_type *control_type = | ||
| 466 | to_powercap_control_type(dev); | ||
| 467 | if (control_type->ops && control_type->ops->set_enable) | ||
| 468 | if (!control_type->ops->set_enable(control_type, mode)) | ||
| 469 | return len; | ||
| 470 | } | ||
| 471 | |||
| 472 | return -ENOSYS; | ||
| 473 | } | ||
| 474 | |||
| 475 | static DEVICE_ATTR_RW(enabled); | ||
| 476 | |||
| 477 | static struct attribute *powercap_attrs[] = { | ||
| 478 | &dev_attr_enabled.attr, | ||
| 479 | NULL, | ||
| 480 | }; | ||
| 481 | ATTRIBUTE_GROUPS(powercap); | ||
| 482 | |||
| 483 | static struct class powercap_class = { | ||
| 484 | .name = "powercap", | ||
| 485 | .dev_release = powercap_release, | ||
| 486 | .dev_groups = powercap_groups, | ||
| 487 | }; | ||
| 488 | |||
| 489 | struct powercap_zone *powercap_register_zone( | ||
| 490 | struct powercap_zone *power_zone, | ||
| 491 | struct powercap_control_type *control_type, | ||
| 492 | const char *name, | ||
| 493 | struct powercap_zone *parent, | ||
| 494 | const struct powercap_zone_ops *ops, | ||
| 495 | int nr_constraints, | ||
| 496 | struct powercap_zone_constraint_ops *const_ops) | ||
| 497 | { | ||
| 498 | int result; | ||
| 499 | int nr_attrs; | ||
| 500 | |||
| 501 | if (!name || !control_type || !ops || | ||
| 502 | nr_constraints > MAX_CONSTRAINTS_PER_ZONE || | ||
| 503 | (!ops->get_energy_uj && !ops->get_power_uw) || | ||
| 504 | !control_type_valid(control_type)) | ||
| 505 | return ERR_PTR(-EINVAL); | ||
| 506 | |||
| 507 | if (power_zone) { | ||
| 508 | if (!ops->release) | ||
| 509 | return ERR_PTR(-EINVAL); | ||
| 510 | memset(power_zone, 0, sizeof(*power_zone)); | ||
| 511 | } else { | ||
| 512 | power_zone = kzalloc(sizeof(*power_zone), GFP_KERNEL); | ||
| 513 | if (!power_zone) | ||
| 514 | return ERR_PTR(-ENOMEM); | ||
| 515 | power_zone->allocated = true; | ||
| 516 | } | ||
| 517 | power_zone->ops = ops; | ||
| 518 | power_zone->control_type_inst = control_type; | ||
| 519 | if (!parent) { | ||
| 520 | power_zone->dev.parent = &control_type->dev; | ||
| 521 | power_zone->parent_idr = &control_type->idr; | ||
| 522 | } else { | ||
| 523 | power_zone->dev.parent = &parent->dev; | ||
| 524 | power_zone->parent_idr = &parent->idr; | ||
| 525 | } | ||
| 526 | power_zone->dev.class = &powercap_class; | ||
| 527 | |||
| 528 | mutex_lock(&control_type->lock); | ||
| 529 | /* Using idr to get the unique id */ | ||
| 530 | result = idr_alloc(power_zone->parent_idr, NULL, 0, 0, GFP_KERNEL); | ||
| 531 | if (result < 0) | ||
| 532 | goto err_idr_alloc; | ||
| 533 | |||
| 534 | power_zone->id = result; | ||
| 535 | idr_init(&power_zone->idr); | ||
| 536 | power_zone->name = kstrdup(name, GFP_KERNEL); | ||
| 537 | if (!power_zone->name) | ||
| 538 | goto err_name_alloc; | ||
| 539 | dev_set_name(&power_zone->dev, "%s:%x", | ||
| 540 | dev_name(power_zone->dev.parent), | ||
| 541 | power_zone->id); | ||
| 542 | power_zone->constraints = kzalloc(sizeof(*power_zone->constraints) * | ||
| 543 | nr_constraints, GFP_KERNEL); | ||
| 544 | if (!power_zone->constraints) | ||
| 545 | goto err_const_alloc; | ||
| 546 | |||
| 547 | nr_attrs = nr_constraints * POWERCAP_CONSTRAINTS_ATTRS + | ||
| 548 | POWERCAP_ZONE_MAX_ATTRS + 1; | ||
| 549 | power_zone->zone_dev_attrs = kzalloc(sizeof(void *) * | ||
| 550 | nr_attrs, GFP_KERNEL); | ||
| 551 | if (!power_zone->zone_dev_attrs) | ||
| 552 | goto err_attr_alloc; | ||
| 553 | create_power_zone_common_attributes(power_zone); | ||
| 554 | result = create_constraints(power_zone, nr_constraints, const_ops); | ||
| 555 | if (result) | ||
| 556 | goto err_dev_ret; | ||
| 557 | |||
| 558 | power_zone->zone_dev_attrs[power_zone->zone_attr_count] = NULL; | ||
| 559 | power_zone->dev_zone_attr_group.attrs = power_zone->zone_dev_attrs; | ||
| 560 | power_zone->dev_attr_groups[0] = &power_zone->dev_zone_attr_group; | ||
| 561 | power_zone->dev_attr_groups[1] = NULL; | ||
| 562 | power_zone->dev.groups = power_zone->dev_attr_groups; | ||
| 563 | result = device_register(&power_zone->dev); | ||
| 564 | if (result) | ||
| 565 | goto err_dev_ret; | ||
| 566 | |||
| 567 | control_type->nr_zones++; | ||
| 568 | mutex_unlock(&control_type->lock); | ||
| 569 | |||
| 570 | return power_zone; | ||
| 571 | |||
| 572 | err_dev_ret: | ||
| 573 | kfree(power_zone->zone_dev_attrs); | ||
| 574 | err_attr_alloc: | ||
| 575 | kfree(power_zone->constraints); | ||
| 576 | err_const_alloc: | ||
| 577 | kfree(power_zone->name); | ||
| 578 | err_name_alloc: | ||
| 579 | idr_remove(power_zone->parent_idr, power_zone->id); | ||
| 580 | err_idr_alloc: | ||
| 581 | if (power_zone->allocated) | ||
| 582 | kfree(power_zone); | ||
| 583 | mutex_unlock(&control_type->lock); | ||
| 584 | |||
| 585 | return ERR_PTR(result); | ||
| 586 | } | ||
| 587 | EXPORT_SYMBOL_GPL(powercap_register_zone); | ||
| 588 | |||
| 589 | int powercap_unregister_zone(struct powercap_control_type *control_type, | ||
| 590 | struct powercap_zone *power_zone) | ||
| 591 | { | ||
| 592 | if (!power_zone || !control_type) | ||
| 593 | return -EINVAL; | ||
| 594 | |||
| 595 | mutex_lock(&control_type->lock); | ||
| 596 | control_type->nr_zones--; | ||
| 597 | mutex_unlock(&control_type->lock); | ||
| 598 | |||
| 599 | device_unregister(&power_zone->dev); | ||
| 600 | |||
| 601 | return 0; | ||
| 602 | } | ||
| 603 | EXPORT_SYMBOL_GPL(powercap_unregister_zone); | ||
| 604 | |||
| 605 | struct powercap_control_type *powercap_register_control_type( | ||
| 606 | struct powercap_control_type *control_type, | ||
| 607 | const char *name, | ||
| 608 | const struct powercap_control_type_ops *ops) | ||
| 609 | { | ||
| 610 | int result; | ||
| 611 | |||
| 612 | if (!name) | ||
| 613 | return ERR_PTR(-EINVAL); | ||
| 614 | if (control_type) { | ||
| 615 | if (!ops || !ops->release) | ||
| 616 | return ERR_PTR(-EINVAL); | ||
| 617 | memset(control_type, 0, sizeof(*control_type)); | ||
| 618 | } else { | ||
| 619 | control_type = kzalloc(sizeof(*control_type), GFP_KERNEL); | ||
| 620 | if (!control_type) | ||
| 621 | return ERR_PTR(-ENOMEM); | ||
| 622 | control_type->allocated = true; | ||
| 623 | } | ||
| 624 | mutex_init(&control_type->lock); | ||
| 625 | control_type->ops = ops; | ||
| 626 | INIT_LIST_HEAD(&control_type->node); | ||
| 627 | control_type->dev.class = &powercap_class; | ||
| 628 | dev_set_name(&control_type->dev, name); | ||
| 629 | result = device_register(&control_type->dev); | ||
| 630 | if (result) { | ||
| 631 | if (control_type->allocated) | ||
| 632 | kfree(control_type); | ||
| 633 | return ERR_PTR(result); | ||
| 634 | } | ||
| 635 | idr_init(&control_type->idr); | ||
| 636 | |||
| 637 | mutex_lock(&powercap_cntrl_list_lock); | ||
| 638 | list_add_tail(&control_type->node, &powercap_cntrl_list); | ||
| 639 | mutex_unlock(&powercap_cntrl_list_lock); | ||
| 640 | |||
| 641 | return control_type; | ||
| 642 | } | ||
| 643 | EXPORT_SYMBOL_GPL(powercap_register_control_type); | ||
| 644 | |||
| 645 | int powercap_unregister_control_type(struct powercap_control_type *control_type) | ||
| 646 | { | ||
| 647 | struct powercap_control_type *pos = NULL; | ||
| 648 | |||
| 649 | if (control_type->nr_zones) { | ||
| 650 | dev_err(&control_type->dev, "Zones of this type still not freed\n"); | ||
| 651 | return -EINVAL; | ||
| 652 | } | ||
| 653 | mutex_lock(&powercap_cntrl_list_lock); | ||
| 654 | list_for_each_entry(pos, &powercap_cntrl_list, node) { | ||
| 655 | if (pos == control_type) { | ||
| 656 | list_del(&control_type->node); | ||
| 657 | mutex_unlock(&powercap_cntrl_list_lock); | ||
| 658 | device_unregister(&control_type->dev); | ||
| 659 | return 0; | ||
| 660 | } | ||
| 661 | } | ||
| 662 | mutex_unlock(&powercap_cntrl_list_lock); | ||
| 663 | |||
| 664 | return -ENODEV; | ||
| 665 | } | ||
| 666 | EXPORT_SYMBOL_GPL(powercap_unregister_control_type); | ||
| 667 | |||
| 668 | static int __init powercap_init(void) | ||
| 669 | { | ||
| 670 | int result = 0; | ||
| 671 | |||
| 672 | result = seed_constraint_attributes(); | ||
| 673 | if (result) | ||
| 674 | return result; | ||
| 675 | |||
| 676 | result = class_register(&powercap_class); | ||
| 677 | |||
| 678 | return result; | ||
| 679 | } | ||
| 680 | |||
| 681 | device_initcall(powercap_init); | ||
| 682 | |||
| 683 | MODULE_DESCRIPTION("PowerCap sysfs Driver"); | ||
| 684 | MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>"); | ||
| 685 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index 5adb2042e824..cee7e2708a1f 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c | |||
| @@ -2077,6 +2077,7 @@ dasd_eckd_build_format(struct dasd_device *base, | |||
| 2077 | int intensity = 0; | 2077 | int intensity = 0; |
| 2078 | int r0_perm; | 2078 | int r0_perm; |
| 2079 | int nr_tracks; | 2079 | int nr_tracks; |
| 2080 | int use_prefix; | ||
| 2080 | 2081 | ||
| 2081 | startdev = dasd_alias_get_start_dev(base); | 2082 | startdev = dasd_alias_get_start_dev(base); |
| 2082 | if (!startdev) | 2083 | if (!startdev) |
| @@ -2106,28 +2107,46 @@ dasd_eckd_build_format(struct dasd_device *base, | |||
| 2106 | intensity = fdata->intensity; | 2107 | intensity = fdata->intensity; |
| 2107 | } | 2108 | } |
| 2108 | 2109 | ||
| 2110 | use_prefix = base_priv->features.feature[8] & 0x01; | ||
| 2111 | |||
| 2109 | switch (intensity) { | 2112 | switch (intensity) { |
| 2110 | case 0x00: /* Normal format */ | 2113 | case 0x00: /* Normal format */ |
| 2111 | case 0x08: /* Normal format, use cdl. */ | 2114 | case 0x08: /* Normal format, use cdl. */ |
| 2112 | cplength = 2 + (rpt*nr_tracks); | 2115 | cplength = 2 + (rpt*nr_tracks); |
| 2113 | datasize = sizeof(struct PFX_eckd_data) + | 2116 | if (use_prefix) |
| 2114 | sizeof(struct LO_eckd_data) + | 2117 | datasize = sizeof(struct PFX_eckd_data) + |
| 2115 | rpt * nr_tracks * sizeof(struct eckd_count); | 2118 | sizeof(struct LO_eckd_data) + |
| 2119 | rpt * nr_tracks * sizeof(struct eckd_count); | ||
| 2120 | else | ||
| 2121 | datasize = sizeof(struct DE_eckd_data) + | ||
| 2122 | sizeof(struct LO_eckd_data) + | ||
| 2123 | rpt * nr_tracks * sizeof(struct eckd_count); | ||
| 2116 | break; | 2124 | break; |
| 2117 | case 0x01: /* Write record zero and format track. */ | 2125 | case 0x01: /* Write record zero and format track. */ |
| 2118 | case 0x09: /* Write record zero and format track, use cdl. */ | 2126 | case 0x09: /* Write record zero and format track, use cdl. */ |
| 2119 | cplength = 2 + rpt * nr_tracks; | 2127 | cplength = 2 + rpt * nr_tracks; |
| 2120 | datasize = sizeof(struct PFX_eckd_data) + | 2128 | if (use_prefix) |
| 2121 | sizeof(struct LO_eckd_data) + | 2129 | datasize = sizeof(struct PFX_eckd_data) + |
| 2122 | sizeof(struct eckd_count) + | 2130 | sizeof(struct LO_eckd_data) + |
| 2123 | rpt * nr_tracks * sizeof(struct eckd_count); | 2131 | sizeof(struct eckd_count) + |
| 2132 | rpt * nr_tracks * sizeof(struct eckd_count); | ||
| 2133 | else | ||
| 2134 | datasize = sizeof(struct DE_eckd_data) + | ||
| 2135 | sizeof(struct LO_eckd_data) + | ||
| 2136 | sizeof(struct eckd_count) + | ||
| 2137 | rpt * nr_tracks * sizeof(struct eckd_count); | ||
| 2124 | break; | 2138 | break; |
| 2125 | case 0x04: /* Invalidate track. */ | 2139 | case 0x04: /* Invalidate track. */ |
| 2126 | case 0x0c: /* Invalidate track, use cdl. */ | 2140 | case 0x0c: /* Invalidate track, use cdl. */ |
| 2127 | cplength = 3; | 2141 | cplength = 3; |
| 2128 | datasize = sizeof(struct PFX_eckd_data) + | 2142 | if (use_prefix) |
| 2129 | sizeof(struct LO_eckd_data) + | 2143 | datasize = sizeof(struct PFX_eckd_data) + |
| 2130 | sizeof(struct eckd_count); | 2144 | sizeof(struct LO_eckd_data) + |
| 2145 | sizeof(struct eckd_count); | ||
| 2146 | else | ||
| 2147 | datasize = sizeof(struct DE_eckd_data) + | ||
| 2148 | sizeof(struct LO_eckd_data) + | ||
| 2149 | sizeof(struct eckd_count); | ||
| 2131 | break; | 2150 | break; |
| 2132 | default: | 2151 | default: |
| 2133 | dev_warn(&startdev->cdev->dev, | 2152 | dev_warn(&startdev->cdev->dev, |
| @@ -2147,14 +2166,25 @@ dasd_eckd_build_format(struct dasd_device *base, | |||
| 2147 | 2166 | ||
| 2148 | switch (intensity & ~0x08) { | 2167 | switch (intensity & ~0x08) { |
| 2149 | case 0x00: /* Normal format. */ | 2168 | case 0x00: /* Normal format. */ |
| 2150 | prefix(ccw++, (struct PFX_eckd_data *) data, | 2169 | if (use_prefix) { |
| 2151 | fdata->start_unit, fdata->stop_unit, | 2170 | prefix(ccw++, (struct PFX_eckd_data *) data, |
| 2152 | DASD_ECKD_CCW_WRITE_CKD, base, startdev); | 2171 | fdata->start_unit, fdata->stop_unit, |
| 2153 | /* grant subsystem permission to format R0 */ | 2172 | DASD_ECKD_CCW_WRITE_CKD, base, startdev); |
| 2154 | if (r0_perm) | 2173 | /* grant subsystem permission to format R0 */ |
| 2155 | ((struct PFX_eckd_data *)data) | 2174 | if (r0_perm) |
| 2156 | ->define_extent.ga_extended |= 0x04; | 2175 | ((struct PFX_eckd_data *)data) |
| 2157 | data += sizeof(struct PFX_eckd_data); | 2176 | ->define_extent.ga_extended |= 0x04; |
| 2177 | data += sizeof(struct PFX_eckd_data); | ||
| 2178 | } else { | ||
| 2179 | define_extent(ccw++, (struct DE_eckd_data *) data, | ||
| 2180 | fdata->start_unit, fdata->stop_unit, | ||
| 2181 | DASD_ECKD_CCW_WRITE_CKD, startdev); | ||
| 2182 | /* grant subsystem permission to format R0 */ | ||
| 2183 | if (r0_perm) | ||
| 2184 | ((struct DE_eckd_data *) data) | ||
| 2185 | ->ga_extended |= 0x04; | ||
| 2186 | data += sizeof(struct DE_eckd_data); | ||
| 2187 | } | ||
| 2158 | ccw[-1].flags |= CCW_FLAG_CC; | 2188 | ccw[-1].flags |= CCW_FLAG_CC; |
| 2159 | locate_record(ccw++, (struct LO_eckd_data *) data, | 2189 | locate_record(ccw++, (struct LO_eckd_data *) data, |
| 2160 | fdata->start_unit, 0, rpt*nr_tracks, | 2190 | fdata->start_unit, 0, rpt*nr_tracks, |
| @@ -2163,11 +2193,18 @@ dasd_eckd_build_format(struct dasd_device *base, | |||
| 2163 | data += sizeof(struct LO_eckd_data); | 2193 | data += sizeof(struct LO_eckd_data); |
| 2164 | break; | 2194 | break; |
| 2165 | case 0x01: /* Write record zero + format track. */ | 2195 | case 0x01: /* Write record zero + format track. */ |
| 2166 | prefix(ccw++, (struct PFX_eckd_data *) data, | 2196 | if (use_prefix) { |
| 2167 | fdata->start_unit, fdata->stop_unit, | 2197 | prefix(ccw++, (struct PFX_eckd_data *) data, |
| 2168 | DASD_ECKD_CCW_WRITE_RECORD_ZERO, | 2198 | fdata->start_unit, fdata->stop_unit, |
| 2169 | base, startdev); | 2199 | DASD_ECKD_CCW_WRITE_RECORD_ZERO, |
| 2170 | data += sizeof(struct PFX_eckd_data); | 2200 | base, startdev); |
| 2201 | data += sizeof(struct PFX_eckd_data); | ||
| 2202 | } else { | ||
| 2203 | define_extent(ccw++, (struct DE_eckd_data *) data, | ||
| 2204 | fdata->start_unit, fdata->stop_unit, | ||
| 2205 | DASD_ECKD_CCW_WRITE_RECORD_ZERO, startdev); | ||
| 2206 | data += sizeof(struct DE_eckd_data); | ||
| 2207 | } | ||
| 2171 | ccw[-1].flags |= CCW_FLAG_CC; | 2208 | ccw[-1].flags |= CCW_FLAG_CC; |
| 2172 | locate_record(ccw++, (struct LO_eckd_data *) data, | 2209 | locate_record(ccw++, (struct LO_eckd_data *) data, |
| 2173 | fdata->start_unit, 0, rpt * nr_tracks + 1, | 2210 | fdata->start_unit, 0, rpt * nr_tracks + 1, |
| @@ -2176,10 +2213,17 @@ dasd_eckd_build_format(struct dasd_device *base, | |||
| 2176 | data += sizeof(struct LO_eckd_data); | 2213 | data += sizeof(struct LO_eckd_data); |
| 2177 | break; | 2214 | break; |
| 2178 | case 0x04: /* Invalidate track. */ | 2215 | case 0x04: /* Invalidate track. */ |
| 2179 | prefix(ccw++, (struct PFX_eckd_data *) data, | 2216 | if (use_prefix) { |
| 2180 | fdata->start_unit, fdata->stop_unit, | 2217 | prefix(ccw++, (struct PFX_eckd_data *) data, |
| 2181 | DASD_ECKD_CCW_WRITE_CKD, base, startdev); | 2218 | fdata->start_unit, fdata->stop_unit, |
| 2182 | data += sizeof(struct PFX_eckd_data); | 2219 | DASD_ECKD_CCW_WRITE_CKD, base, startdev); |
| 2220 | data += sizeof(struct PFX_eckd_data); | ||
| 2221 | } else { | ||
| 2222 | define_extent(ccw++, (struct DE_eckd_data *) data, | ||
| 2223 | fdata->start_unit, fdata->stop_unit, | ||
| 2224 | DASD_ECKD_CCW_WRITE_CKD, startdev); | ||
| 2225 | data += sizeof(struct DE_eckd_data); | ||
| 2226 | } | ||
| 2183 | ccw[-1].flags |= CCW_FLAG_CC; | 2227 | ccw[-1].flags |= CCW_FLAG_CC; |
| 2184 | locate_record(ccw++, (struct LO_eckd_data *) data, | 2228 | locate_record(ccw++, (struct LO_eckd_data *) data, |
| 2185 | fdata->start_unit, 0, 1, | 2229 | fdata->start_unit, 0, 1, |
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c index a3aa374799dc..1fe264379e0d 100644 --- a/drivers/s390/char/sclp.c +++ b/drivers/s390/char/sclp.c | |||
| @@ -486,7 +486,7 @@ sclp_sync_wait(void) | |||
| 486 | timeout = 0; | 486 | timeout = 0; |
| 487 | if (timer_pending(&sclp_request_timer)) { | 487 | if (timer_pending(&sclp_request_timer)) { |
| 488 | /* Get timeout TOD value */ | 488 | /* Get timeout TOD value */ |
| 489 | timeout = get_tod_clock() + | 489 | timeout = get_tod_clock_fast() + |
| 490 | sclp_tod_from_jiffies(sclp_request_timer.expires - | 490 | sclp_tod_from_jiffies(sclp_request_timer.expires - |
| 491 | jiffies); | 491 | jiffies); |
| 492 | } | 492 | } |
| @@ -508,7 +508,7 @@ sclp_sync_wait(void) | |||
| 508 | while (sclp_running_state != sclp_running_state_idle) { | 508 | while (sclp_running_state != sclp_running_state_idle) { |
| 509 | /* Check for expired request timer */ | 509 | /* Check for expired request timer */ |
| 510 | if (timer_pending(&sclp_request_timer) && | 510 | if (timer_pending(&sclp_request_timer) && |
| 511 | get_tod_clock() > timeout && | 511 | get_tod_clock_fast() > timeout && |
| 512 | del_timer(&sclp_request_timer)) | 512 | del_timer(&sclp_request_timer)) |
| 513 | sclp_request_timer.function(sclp_request_timer.data); | 513 | sclp_request_timer.function(sclp_request_timer.data); |
| 514 | cpu_relax(); | 514 | cpu_relax(); |
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c index 8cd34bf644b3..77df9cb00688 100644 --- a/drivers/s390/char/sclp_cmd.c +++ b/drivers/s390/char/sclp_cmd.c | |||
| @@ -145,9 +145,11 @@ bool __init sclp_has_linemode(void) | |||
| 145 | 145 | ||
| 146 | if (sccb->header.response_code != 0x20) | 146 | if (sccb->header.response_code != 0x20) |
| 147 | return 0; | 147 | return 0; |
| 148 | if (sccb->sclp_send_mask & (EVTYP_MSG_MASK | EVTYP_PMSGCMD_MASK)) | 148 | if (!(sccb->sclp_send_mask & (EVTYP_OPCMD_MASK | EVTYP_PMSGCMD_MASK))) |
| 149 | return 1; | 149 | return 0; |
| 150 | return 0; | 150 | if (!(sccb->sclp_receive_mask & (EVTYP_MSG_MASK | EVTYP_PMSGCMD_MASK))) |
| 151 | return 0; | ||
| 152 | return 1; | ||
| 151 | } | 153 | } |
| 152 | 154 | ||
| 153 | bool __init sclp_has_vt220(void) | 155 | bool __init sclp_has_vt220(void) |
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index a0f47c83fd62..3f4ca4e09a4c 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c | |||
| @@ -810,7 +810,7 @@ static void tty3270_resize_work(struct work_struct *work) | |||
| 810 | struct winsize ws; | 810 | struct winsize ws; |
| 811 | 811 | ||
| 812 | screen = tty3270_alloc_screen(tp->n_rows, tp->n_cols); | 812 | screen = tty3270_alloc_screen(tp->n_rows, tp->n_cols); |
| 813 | if (!screen) | 813 | if (IS_ERR(screen)) |
| 814 | return; | 814 | return; |
| 815 | /* Switch to new output size */ | 815 | /* Switch to new output size */ |
| 816 | spin_lock_bh(&tp->view.lock); | 816 | spin_lock_bh(&tp->view.lock); |
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c index 9b3a24e8d3a0..cf31d3321dab 100644 --- a/drivers/s390/char/vmlogrdr.c +++ b/drivers/s390/char/vmlogrdr.c | |||
| @@ -313,7 +313,7 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp) | |||
| 313 | int ret; | 313 | int ret; |
| 314 | 314 | ||
| 315 | dev_num = iminor(inode); | 315 | dev_num = iminor(inode); |
| 316 | if (dev_num > MAXMINOR) | 316 | if (dev_num >= MAXMINOR) |
| 317 | return -ENODEV; | 317 | return -ENODEV; |
| 318 | logptr = &sys_ser[dev_num]; | 318 | logptr = &sys_ser[dev_num]; |
| 319 | 319 | ||
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index d7da67a31c77..88e35d85d205 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c | |||
| @@ -878,9 +878,9 @@ static void css_reset(void) | |||
| 878 | atomic_inc(&chpid_reset_count); | 878 | atomic_inc(&chpid_reset_count); |
| 879 | } | 879 | } |
| 880 | /* Wait for machine check for all channel paths. */ | 880 | /* Wait for machine check for all channel paths. */ |
| 881 | timeout = get_tod_clock() + (RCHP_TIMEOUT << 12); | 881 | timeout = get_tod_clock_fast() + (RCHP_TIMEOUT << 12); |
| 882 | while (atomic_read(&chpid_reset_count) != 0) { | 882 | while (atomic_read(&chpid_reset_count) != 0) { |
| 883 | if (get_tod_clock() > timeout) | 883 | if (get_tod_clock_fast() > timeout) |
| 884 | break; | 884 | break; |
| 885 | cpu_relax(); | 885 | cpu_relax(); |
| 886 | } | 886 | } |
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c index 8ed52aa49122..bbd3e511c771 100644 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c | |||
| @@ -338,10 +338,10 @@ again: | |||
| 338 | retries++; | 338 | retries++; |
| 339 | 339 | ||
| 340 | if (!start_time) { | 340 | if (!start_time) { |
| 341 | start_time = get_tod_clock(); | 341 | start_time = get_tod_clock_fast(); |
| 342 | goto again; | 342 | goto again; |
| 343 | } | 343 | } |
| 344 | if ((get_tod_clock() - start_time) < QDIO_BUSY_BIT_PATIENCE) | 344 | if (get_tod_clock_fast() - start_time < QDIO_BUSY_BIT_PATIENCE) |
| 345 | goto again; | 345 | goto again; |
| 346 | } | 346 | } |
| 347 | if (retries) { | 347 | if (retries) { |
| @@ -504,7 +504,7 @@ static int get_inbound_buffer_frontier(struct qdio_q *q) | |||
| 504 | int count, stop; | 504 | int count, stop; |
| 505 | unsigned char state = 0; | 505 | unsigned char state = 0; |
| 506 | 506 | ||
| 507 | q->timestamp = get_tod_clock(); | 507 | q->timestamp = get_tod_clock_fast(); |
| 508 | 508 | ||
| 509 | /* | 509 | /* |
| 510 | * Don't check 128 buffers, as otherwise qdio_inbound_q_moved | 510 | * Don't check 128 buffers, as otherwise qdio_inbound_q_moved |
| @@ -595,7 +595,7 @@ static inline int qdio_inbound_q_done(struct qdio_q *q) | |||
| 595 | * At this point we know, that inbound first_to_check | 595 | * At this point we know, that inbound first_to_check |
| 596 | * has (probably) not moved (see qdio_inbound_processing). | 596 | * has (probably) not moved (see qdio_inbound_processing). |
| 597 | */ | 597 | */ |
| 598 | if (get_tod_clock() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) { | 598 | if (get_tod_clock_fast() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) { |
| 599 | DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in done:%02x", | 599 | DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in done:%02x", |
| 600 | q->first_to_check); | 600 | q->first_to_check); |
| 601 | return 1; | 601 | return 1; |
| @@ -728,7 +728,7 @@ static int get_outbound_buffer_frontier(struct qdio_q *q) | |||
| 728 | int count, stop; | 728 | int count, stop; |
| 729 | unsigned char state = 0; | 729 | unsigned char state = 0; |
| 730 | 730 | ||
| 731 | q->timestamp = get_tod_clock(); | 731 | q->timestamp = get_tod_clock_fast(); |
| 732 | 732 | ||
| 733 | if (need_siga_sync(q)) | 733 | if (need_siga_sync(q)) |
| 734 | if (((queue_type(q) != QDIO_IQDIO_QFMT) && | 734 | if (((queue_type(q) != QDIO_IQDIO_QFMT) && |
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c index feab3a5e50b5..757eb0716d45 100644 --- a/drivers/scsi/BusLogic.c +++ b/drivers/scsi/BusLogic.c | |||
| @@ -696,7 +696,7 @@ static int __init blogic_init_mm_probeinfo(struct blogic_adapter *adapter) | |||
| 696 | while ((pci_device = pci_get_device(PCI_VENDOR_ID_BUSLOGIC, | 696 | while ((pci_device = pci_get_device(PCI_VENDOR_ID_BUSLOGIC, |
| 697 | PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER, | 697 | PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER, |
| 698 | pci_device)) != NULL) { | 698 | pci_device)) != NULL) { |
| 699 | struct blogic_adapter *adapter = adapter; | 699 | struct blogic_adapter *host_adapter = adapter; |
| 700 | struct blogic_adapter_info adapter_info; | 700 | struct blogic_adapter_info adapter_info; |
| 701 | enum blogic_isa_ioport mod_ioaddr_req; | 701 | enum blogic_isa_ioport mod_ioaddr_req; |
| 702 | unsigned char bus; | 702 | unsigned char bus; |
| @@ -744,9 +744,9 @@ static int __init blogic_init_mm_probeinfo(struct blogic_adapter *adapter) | |||
| 744 | known and enabled, note that the particular Standard ISA I/O | 744 | known and enabled, note that the particular Standard ISA I/O |
| 745 | Address should not be probed. | 745 | Address should not be probed. |
| 746 | */ | 746 | */ |
| 747 | adapter->io_addr = io_addr; | 747 | host_adapter->io_addr = io_addr; |
| 748 | blogic_intreset(adapter); | 748 | blogic_intreset(host_adapter); |
| 749 | if (blogic_cmd(adapter, BLOGIC_INQ_PCI_INFO, NULL, 0, | 749 | if (blogic_cmd(host_adapter, BLOGIC_INQ_PCI_INFO, NULL, 0, |
| 750 | &adapter_info, sizeof(adapter_info)) == | 750 | &adapter_info, sizeof(adapter_info)) == |
| 751 | sizeof(adapter_info)) { | 751 | sizeof(adapter_info)) { |
| 752 | if (adapter_info.isa_port < 6) | 752 | if (adapter_info.isa_port < 6) |
| @@ -762,7 +762,7 @@ static int __init blogic_init_mm_probeinfo(struct blogic_adapter *adapter) | |||
| 762 | I/O Address assigned at system initialization. | 762 | I/O Address assigned at system initialization. |
| 763 | */ | 763 | */ |
| 764 | mod_ioaddr_req = BLOGIC_IO_DISABLE; | 764 | mod_ioaddr_req = BLOGIC_IO_DISABLE; |
| 765 | blogic_cmd(adapter, BLOGIC_MOD_IOADDR, &mod_ioaddr_req, | 765 | blogic_cmd(host_adapter, BLOGIC_MOD_IOADDR, &mod_ioaddr_req, |
| 766 | sizeof(mod_ioaddr_req), NULL, 0); | 766 | sizeof(mod_ioaddr_req), NULL, 0); |
| 767 | /* | 767 | /* |
| 768 | For the first MultiMaster Host Adapter enumerated, | 768 | For the first MultiMaster Host Adapter enumerated, |
| @@ -779,12 +779,12 @@ static int __init blogic_init_mm_probeinfo(struct blogic_adapter *adapter) | |||
| 779 | 779 | ||
| 780 | fetch_localram.offset = BLOGIC_AUTOSCSI_BASE + 45; | 780 | fetch_localram.offset = BLOGIC_AUTOSCSI_BASE + 45; |
| 781 | fetch_localram.count = sizeof(autoscsi_byte45); | 781 | fetch_localram.count = sizeof(autoscsi_byte45); |
| 782 | blogic_cmd(adapter, BLOGIC_FETCH_LOCALRAM, | 782 | blogic_cmd(host_adapter, BLOGIC_FETCH_LOCALRAM, |
| 783 | &fetch_localram, sizeof(fetch_localram), | 783 | &fetch_localram, sizeof(fetch_localram), |
| 784 | &autoscsi_byte45, | 784 | &autoscsi_byte45, |
| 785 | sizeof(autoscsi_byte45)); | 785 | sizeof(autoscsi_byte45)); |
| 786 | blogic_cmd(adapter, BLOGIC_GET_BOARD_ID, NULL, 0, &id, | 786 | blogic_cmd(host_adapter, BLOGIC_GET_BOARD_ID, NULL, 0, |
| 787 | sizeof(id)); | 787 | &id, sizeof(id)); |
| 788 | if (id.fw_ver_digit1 == '5') | 788 | if (id.fw_ver_digit1 == '5') |
| 789 | force_scan_order = | 789 | force_scan_order = |
| 790 | autoscsi_byte45.force_scan_order; | 790 | autoscsi_byte45.force_scan_order; |
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index 2ef497ebadc0..ee5c1833eb73 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | * | Device Discovery | 0x2095 | 0x2020-0x2022, | | 20 | * | Device Discovery | 0x2095 | 0x2020-0x2022, | |
| 21 | * | | | 0x2011-0x2012, | | 21 | * | | | 0x2011-0x2012, | |
| 22 | * | | | 0x2016 | | 22 | * | | | 0x2016 | |
| 23 | * | Queue Command and IO tracing | 0x3058 | 0x3006-0x300b | | 23 | * | Queue Command and IO tracing | 0x3059 | 0x3006-0x300b | |
| 24 | * | | | 0x3027-0x3028 | | 24 | * | | | 0x3027-0x3028 | |
| 25 | * | | | 0x303d-0x3041 | | 25 | * | | | 0x303d-0x3041 | |
| 26 | * | | | 0x302d,0x3033 | | 26 | * | | | 0x302d,0x3033 | |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index df1b30ba938c..ff9c86b1a0d8 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
| @@ -1957,6 +1957,15 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) | |||
| 1957 | que = MSW(sts->handle); | 1957 | que = MSW(sts->handle); |
| 1958 | req = ha->req_q_map[que]; | 1958 | req = ha->req_q_map[que]; |
| 1959 | 1959 | ||
| 1960 | /* Check for invalid queue pointer */ | ||
| 1961 | if (req == NULL || | ||
| 1962 | que >= find_first_zero_bit(ha->req_qid_map, ha->max_req_queues)) { | ||
| 1963 | ql_dbg(ql_dbg_io, vha, 0x3059, | ||
| 1964 | "Invalid status handle (0x%x): Bad req pointer. req=%p, " | ||
| 1965 | "que=%u.\n", sts->handle, req, que); | ||
| 1966 | return; | ||
| 1967 | } | ||
| 1968 | |||
| 1960 | /* Validate handle. */ | 1969 | /* Validate handle. */ |
| 1961 | if (handle < req->num_outstanding_cmds) | 1970 | if (handle < req->num_outstanding_cmds) |
| 1962 | sp = req->outstanding_cmds[handle]; | 1971 | sp = req->outstanding_cmds[handle]; |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index e62d17d41d4e..5693f6d7eddb 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -2854,6 +2854,7 @@ static void sd_probe_async(void *data, async_cookie_t cookie) | |||
| 2854 | gd->events |= DISK_EVENT_MEDIA_CHANGE; | 2854 | gd->events |= DISK_EVENT_MEDIA_CHANGE; |
| 2855 | } | 2855 | } |
| 2856 | 2856 | ||
| 2857 | blk_pm_runtime_init(sdp->request_queue, dev); | ||
| 2857 | add_disk(gd); | 2858 | add_disk(gd); |
| 2858 | if (sdkp->capacity) | 2859 | if (sdkp->capacity) |
| 2859 | sd_dif_config_host(sdkp); | 2860 | sd_dif_config_host(sdkp); |
| @@ -2862,7 +2863,6 @@ static void sd_probe_async(void *data, async_cookie_t cookie) | |||
| 2862 | 2863 | ||
| 2863 | sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", | 2864 | sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", |
| 2864 | sdp->removable ? "removable " : ""); | 2865 | sdp->removable ? "removable " : ""); |
| 2865 | blk_pm_runtime_init(sdp->request_queue, dev); | ||
| 2866 | scsi_autopm_put_device(sdp); | 2866 | scsi_autopm_put_device(sdp); |
| 2867 | put_device(&sdkp->dev); | 2867 | put_device(&sdkp->dev); |
| 2868 | } | 2868 | } |
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index fd7cc566095a..d4ac60b4a56e 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c | |||
| @@ -1583,7 +1583,7 @@ static int atmel_spi_probe(struct platform_device *pdev) | |||
| 1583 | /* Initialize the hardware */ | 1583 | /* Initialize the hardware */ |
| 1584 | ret = clk_prepare_enable(clk); | 1584 | ret = clk_prepare_enable(clk); |
| 1585 | if (ret) | 1585 | if (ret) |
| 1586 | goto out_unmap_regs; | 1586 | goto out_free_irq; |
| 1587 | spi_writel(as, CR, SPI_BIT(SWRST)); | 1587 | spi_writel(as, CR, SPI_BIT(SWRST)); |
| 1588 | spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */ | 1588 | spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */ |
| 1589 | if (as->caps.has_wdrbt) { | 1589 | if (as->caps.has_wdrbt) { |
| @@ -1614,6 +1614,7 @@ out_free_dma: | |||
| 1614 | spi_writel(as, CR, SPI_BIT(SWRST)); | 1614 | spi_writel(as, CR, SPI_BIT(SWRST)); |
| 1615 | spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */ | 1615 | spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */ |
| 1616 | clk_disable_unprepare(clk); | 1616 | clk_disable_unprepare(clk); |
| 1617 | out_free_irq: | ||
| 1617 | free_irq(irq, master); | 1618 | free_irq(irq, master); |
| 1618 | out_unmap_regs: | 1619 | out_unmap_regs: |
| 1619 | iounmap(as->regs); | 1620 | iounmap(as->regs); |
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c index 5655acf55bfe..6416798828e7 100644 --- a/drivers/spi/spi-clps711x.c +++ b/drivers/spi/spi-clps711x.c | |||
| @@ -226,7 +226,6 @@ static int spi_clps711x_probe(struct platform_device *pdev) | |||
| 226 | dev_name(&pdev->dev), hw); | 226 | dev_name(&pdev->dev), hw); |
| 227 | if (ret) { | 227 | if (ret) { |
| 228 | dev_err(&pdev->dev, "Can't request IRQ\n"); | 228 | dev_err(&pdev->dev, "Can't request IRQ\n"); |
| 229 | clk_put(hw->spi_clk); | ||
| 230 | goto clk_out; | 229 | goto clk_out; |
| 231 | } | 230 | } |
| 232 | 231 | ||
| @@ -247,7 +246,6 @@ err_out: | |||
| 247 | gpio_free(hw->chipselect[i]); | 246 | gpio_free(hw->chipselect[i]); |
| 248 | 247 | ||
| 249 | spi_master_put(master); | 248 | spi_master_put(master); |
| 250 | kfree(master); | ||
| 251 | 249 | ||
| 252 | return ret; | 250 | return ret; |
| 253 | } | 251 | } |
| @@ -263,7 +261,6 @@ static int spi_clps711x_remove(struct platform_device *pdev) | |||
| 263 | gpio_free(hw->chipselect[i]); | 261 | gpio_free(hw->chipselect[i]); |
| 264 | 262 | ||
| 265 | spi_unregister_master(master); | 263 | spi_unregister_master(master); |
| 266 | kfree(master); | ||
| 267 | 264 | ||
| 268 | return 0; | 265 | return 0; |
| 269 | } | 266 | } |
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 6cd07d13ecab..4e44575bd87a 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c | |||
| @@ -476,15 +476,9 @@ static int dspi_probe(struct platform_device *pdev) | |||
| 476 | master->bus_num = bus_num; | 476 | master->bus_num = bus_num; |
| 477 | 477 | ||
| 478 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 478 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 479 | if (!res) { | ||
| 480 | dev_err(&pdev->dev, "can't get platform resource\n"); | ||
| 481 | ret = -EINVAL; | ||
| 482 | goto out_master_put; | ||
| 483 | } | ||
| 484 | |||
| 485 | dspi->base = devm_ioremap_resource(&pdev->dev, res); | 479 | dspi->base = devm_ioremap_resource(&pdev->dev, res); |
| 486 | if (!dspi->base) { | 480 | if (IS_ERR(dspi->base)) { |
| 487 | ret = -EINVAL; | 481 | ret = PTR_ERR(dspi->base); |
| 488 | goto out_master_put; | 482 | goto out_master_put; |
| 489 | } | 483 | } |
| 490 | 484 | ||
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c index dbc5e999a1f5..6adf4e35816d 100644 --- a/drivers/spi/spi-mpc512x-psc.c +++ b/drivers/spi/spi-mpc512x-psc.c | |||
| @@ -522,8 +522,10 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, | |||
| 522 | psc_num = master->bus_num; | 522 | psc_num = master->bus_num; |
| 523 | snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num); | 523 | snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num); |
| 524 | clk = devm_clk_get(dev, clk_name); | 524 | clk = devm_clk_get(dev, clk_name); |
| 525 | if (IS_ERR(clk)) | 525 | if (IS_ERR(clk)) { |
| 526 | ret = PTR_ERR(clk); | ||
| 526 | goto free_irq; | 527 | goto free_irq; |
| 528 | } | ||
| 527 | ret = clk_prepare_enable(clk); | 529 | ret = clk_prepare_enable(clk); |
| 528 | if (ret) | 530 | if (ret) |
| 529 | goto free_irq; | 531 | goto free_irq; |
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 2eb06ee0b326..c1a50674c1e3 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c | |||
| @@ -546,8 +546,17 @@ static irqreturn_t ssp_int(int irq, void *dev_id) | |||
| 546 | if (pm_runtime_suspended(&drv_data->pdev->dev)) | 546 | if (pm_runtime_suspended(&drv_data->pdev->dev)) |
| 547 | return IRQ_NONE; | 547 | return IRQ_NONE; |
| 548 | 548 | ||
| 549 | sccr1_reg = read_SSCR1(reg); | 549 | /* |
| 550 | * If the device is not yet in RPM suspended state and we get an | ||
| 551 | * interrupt that is meant for another device, check if status bits | ||
| 552 | * are all set to one. That means that the device is already | ||
| 553 | * powered off. | ||
| 554 | */ | ||
| 550 | status = read_SSSR(reg); | 555 | status = read_SSSR(reg); |
| 556 | if (status == ~0) | ||
| 557 | return IRQ_NONE; | ||
| 558 | |||
| 559 | sccr1_reg = read_SSCR1(reg); | ||
| 551 | 560 | ||
| 552 | /* Ignore possible writes if we don't need to write */ | 561 | /* Ignore possible writes if we don't need to write */ |
| 553 | if (!(sccr1_reg & SSCR1_TIE)) | 562 | if (!(sccr1_reg & SSCR1_TIE)) |
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 512b8893893b..a80376dc3a10 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c | |||
| @@ -1428,6 +1428,8 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) | |||
| 1428 | S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN, | 1428 | S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN, |
| 1429 | sdd->regs + S3C64XX_SPI_INT_EN); | 1429 | sdd->regs + S3C64XX_SPI_INT_EN); |
| 1430 | 1430 | ||
| 1431 | pm_runtime_enable(&pdev->dev); | ||
| 1432 | |||
| 1431 | if (spi_register_master(master)) { | 1433 | if (spi_register_master(master)) { |
| 1432 | dev_err(&pdev->dev, "cannot register SPI master\n"); | 1434 | dev_err(&pdev->dev, "cannot register SPI master\n"); |
| 1433 | ret = -EBUSY; | 1435 | ret = -EBUSY; |
| @@ -1440,8 +1442,6 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) | |||
| 1440 | mem_res, | 1442 | mem_res, |
| 1441 | sdd->rx_dma.dmach, sdd->tx_dma.dmach); | 1443 | sdd->rx_dma.dmach, sdd->tx_dma.dmach); |
| 1442 | 1444 | ||
| 1443 | pm_runtime_enable(&pdev->dev); | ||
| 1444 | |||
| 1445 | return 0; | 1445 | return 0; |
| 1446 | 1446 | ||
| 1447 | err3: | 1447 | err3: |
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c index 0b68cb592fa4..e488a90a98b8 100644 --- a/drivers/spi/spi-sh-hspi.c +++ b/drivers/spi/spi-sh-hspi.c | |||
| @@ -296,6 +296,8 @@ static int hspi_probe(struct platform_device *pdev) | |||
| 296 | goto error1; | 296 | goto error1; |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | pm_runtime_enable(&pdev->dev); | ||
| 300 | |||
| 299 | master->num_chipselect = 1; | 301 | master->num_chipselect = 1; |
| 300 | master->bus_num = pdev->id; | 302 | master->bus_num = pdev->id; |
| 301 | master->setup = hspi_setup; | 303 | master->setup = hspi_setup; |
| @@ -309,8 +311,6 @@ static int hspi_probe(struct platform_device *pdev) | |||
| 309 | goto error1; | 311 | goto error1; |
| 310 | } | 312 | } |
| 311 | 313 | ||
| 312 | pm_runtime_enable(&pdev->dev); | ||
| 313 | |||
| 314 | return 0; | 314 | return 0; |
| 315 | 315 | ||
| 316 | error1: | 316 | error1: |
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9e039c60c068..740f9ddda227 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
| @@ -240,15 +240,27 @@ EXPORT_SYMBOL_GPL(spi_bus_type); | |||
| 240 | static int spi_drv_probe(struct device *dev) | 240 | static int spi_drv_probe(struct device *dev) |
| 241 | { | 241 | { |
| 242 | const struct spi_driver *sdrv = to_spi_driver(dev->driver); | 242 | const struct spi_driver *sdrv = to_spi_driver(dev->driver); |
| 243 | struct spi_device *spi = to_spi_device(dev); | ||
| 244 | int ret; | ||
| 245 | |||
| 246 | acpi_dev_pm_attach(&spi->dev, true); | ||
| 247 | ret = sdrv->probe(spi); | ||
| 248 | if (ret) | ||
| 249 | acpi_dev_pm_detach(&spi->dev, true); | ||
| 243 | 250 | ||
| 244 | return sdrv->probe(to_spi_device(dev)); | 251 | return ret; |
| 245 | } | 252 | } |
| 246 | 253 | ||
| 247 | static int spi_drv_remove(struct device *dev) | 254 | static int spi_drv_remove(struct device *dev) |
| 248 | { | 255 | { |
| 249 | const struct spi_driver *sdrv = to_spi_driver(dev->driver); | 256 | const struct spi_driver *sdrv = to_spi_driver(dev->driver); |
| 257 | struct spi_device *spi = to_spi_device(dev); | ||
| 258 | int ret; | ||
| 259 | |||
| 260 | ret = sdrv->remove(spi); | ||
| 261 | acpi_dev_pm_detach(&spi->dev, true); | ||
| 250 | 262 | ||
| 251 | return sdrv->remove(to_spi_device(dev)); | 263 | return ret; |
| 252 | } | 264 | } |
| 253 | 265 | ||
| 254 | static void spi_drv_shutdown(struct device *dev) | 266 | static void spi_drv_shutdown(struct device *dev) |
| @@ -1025,8 +1037,10 @@ static acpi_status acpi_spi_add_device(acpi_handle handle, u32 level, | |||
| 1025 | return AE_OK; | 1037 | return AE_OK; |
| 1026 | } | 1038 | } |
| 1027 | 1039 | ||
| 1040 | adev->power.flags.ignore_parent = true; | ||
| 1028 | strlcpy(spi->modalias, dev_name(&adev->dev), sizeof(spi->modalias)); | 1041 | strlcpy(spi->modalias, dev_name(&adev->dev), sizeof(spi->modalias)); |
| 1029 | if (spi_add_device(spi)) { | 1042 | if (spi_add_device(spi)) { |
| 1043 | adev->power.flags.ignore_parent = false; | ||
| 1030 | dev_err(&master->dev, "failed to add SPI device %s from ACPI\n", | 1044 | dev_err(&master->dev, "failed to add SPI device %s from ACPI\n", |
| 1031 | dev_name(&adev->dev)); | 1045 | dev_name(&adev->dev)); |
| 1032 | spi_dev_put(spi); | 1046 | spi_dev_put(spi); |
diff --git a/drivers/staging/media/msi3101/Kconfig b/drivers/staging/media/msi3101/Kconfig index b94a95a597d6..76d5bbd4d93c 100644 --- a/drivers/staging/media/msi3101/Kconfig +++ b/drivers/staging/media/msi3101/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | config USB_MSI3101 | 1 | config USB_MSI3101 |
| 2 | tristate "Mirics MSi3101 SDR Dongle" | 2 | tristate "Mirics MSi3101 SDR Dongle" |
| 3 | depends on USB && VIDEO_DEV && VIDEO_V4L2 | 3 | depends on USB && VIDEO_DEV && VIDEO_V4L2 |
| 4 | select VIDEOBUF2_VMALLOC | ||
diff --git a/drivers/staging/media/msi3101/sdr-msi3101.c b/drivers/staging/media/msi3101/sdr-msi3101.c index 24c7b70a6cbf..4c3bf776bb20 100644 --- a/drivers/staging/media/msi3101/sdr-msi3101.c +++ b/drivers/staging/media/msi3101/sdr-msi3101.c | |||
| @@ -1131,7 +1131,13 @@ static int msi3101_queue_setup(struct vb2_queue *vq, | |||
| 1131 | /* Absolute min and max number of buffers available for mmap() */ | 1131 | /* Absolute min and max number of buffers available for mmap() */ |
| 1132 | *nbuffers = 32; | 1132 | *nbuffers = 32; |
| 1133 | *nplanes = 1; | 1133 | *nplanes = 1; |
| 1134 | sizes[0] = PAGE_ALIGN(3 * 3072); /* 3 * 768 * 4 */ | 1134 | /* |
| 1135 | * 3, wMaxPacketSize 3x 1024 bytes | ||
| 1136 | * 504, max IQ sample pairs per 1024 frame | ||
| 1137 | * 2, two samples, I and Q | ||
| 1138 | * 4, 32-bit float | ||
| 1139 | */ | ||
| 1140 | sizes[0] = PAGE_ALIGN(3 * 504 * 2 * 4); /* = 12096 */ | ||
| 1135 | dev_dbg(&s->udev->dev, "%s: nbuffers=%d sizes[0]=%d\n", | 1141 | dev_dbg(&s->udev->dev, "%s: nbuffers=%d sizes[0]=%d\n", |
| 1136 | __func__, *nbuffers, sizes[0]); | 1142 | __func__, *nbuffers, sizes[0]); |
| 1137 | return 0; | 1143 | return 0; |
| @@ -1657,7 +1663,7 @@ static int vidioc_s_frequency(struct file *file, void *priv, | |||
| 1657 | f->frequency * 625UL / 10UL); | 1663 | f->frequency * 625UL / 10UL); |
| 1658 | } | 1664 | } |
| 1659 | 1665 | ||
| 1660 | const struct v4l2_ioctl_ops msi3101_ioctl_ops = { | 1666 | static const struct v4l2_ioctl_ops msi3101_ioctl_ops = { |
| 1661 | .vidioc_querycap = msi3101_querycap, | 1667 | .vidioc_querycap = msi3101_querycap, |
| 1662 | 1668 | ||
| 1663 | .vidioc_enum_input = msi3101_enum_input, | 1669 | .vidioc_enum_input = msi3101_enum_input, |
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index 551c96ca60ac..0f199f6a0738 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c | |||
| @@ -134,10 +134,10 @@ static int pscsi_pmode_enable_hba(struct se_hba *hba, unsigned long mode_flag) | |||
| 134 | * pSCSI Host ID and enable for phba mode | 134 | * pSCSI Host ID and enable for phba mode |
| 135 | */ | 135 | */ |
| 136 | sh = scsi_host_lookup(phv->phv_host_id); | 136 | sh = scsi_host_lookup(phv->phv_host_id); |
| 137 | if (IS_ERR(sh)) { | 137 | if (!sh) { |
| 138 | pr_err("pSCSI: Unable to locate SCSI Host for" | 138 | pr_err("pSCSI: Unable to locate SCSI Host for" |
| 139 | " phv_host_id: %d\n", phv->phv_host_id); | 139 | " phv_host_id: %d\n", phv->phv_host_id); |
| 140 | return PTR_ERR(sh); | 140 | return -EINVAL; |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | phv->phv_lld_host = sh; | 143 | phv->phv_lld_host = sh; |
| @@ -515,10 +515,10 @@ static int pscsi_configure_device(struct se_device *dev) | |||
| 515 | sh = phv->phv_lld_host; | 515 | sh = phv->phv_lld_host; |
| 516 | } else { | 516 | } else { |
| 517 | sh = scsi_host_lookup(pdv->pdv_host_id); | 517 | sh = scsi_host_lookup(pdv->pdv_host_id); |
| 518 | if (IS_ERR(sh)) { | 518 | if (!sh) { |
| 519 | pr_err("pSCSI: Unable to locate" | 519 | pr_err("pSCSI: Unable to locate" |
| 520 | " pdv_host_id: %d\n", pdv->pdv_host_id); | 520 | " pdv_host_id: %d\n", pdv->pdv_host_id); |
| 521 | return PTR_ERR(sh); | 521 | return -EINVAL; |
| 522 | } | 522 | } |
| 523 | } | 523 | } |
| 524 | } else { | 524 | } else { |
diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c index 4714c6f8da4b..d9b92b2c524d 100644 --- a/drivers/target/target_core_sbc.c +++ b/drivers/target/target_core_sbc.c | |||
| @@ -263,6 +263,11 @@ sbc_setup_write_same(struct se_cmd *cmd, unsigned char *flags, struct sbc_ops *o | |||
| 263 | sectors, cmd->se_dev->dev_attrib.max_write_same_len); | 263 | sectors, cmd->se_dev->dev_attrib.max_write_same_len); |
| 264 | return TCM_INVALID_CDB_FIELD; | 264 | return TCM_INVALID_CDB_FIELD; |
| 265 | } | 265 | } |
| 266 | /* We always have ANC_SUP == 0 so setting ANCHOR is always an error */ | ||
| 267 | if (flags[0] & 0x10) { | ||
| 268 | pr_warn("WRITE SAME with ANCHOR not supported\n"); | ||
| 269 | return TCM_INVALID_CDB_FIELD; | ||
| 270 | } | ||
| 266 | /* | 271 | /* |
| 267 | * Special case for WRITE_SAME w/ UNMAP=1 that ends up getting | 272 | * Special case for WRITE_SAME w/ UNMAP=1 that ends up getting |
| 268 | * translated into block discard requests within backend code. | 273 | * translated into block discard requests within backend code. |
diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c index 3da4fd10b9f8..474cd44fac14 100644 --- a/drivers/target/target_core_xcopy.c +++ b/drivers/target/target_core_xcopy.c | |||
| @@ -82,6 +82,9 @@ static int target_xcopy_locate_se_dev_e4(struct se_cmd *se_cmd, struct xcopy_op | |||
| 82 | mutex_lock(&g_device_mutex); | 82 | mutex_lock(&g_device_mutex); |
| 83 | list_for_each_entry(se_dev, &g_device_list, g_dev_node) { | 83 | list_for_each_entry(se_dev, &g_device_list, g_dev_node) { |
| 84 | 84 | ||
| 85 | if (!se_dev->dev_attrib.emulate_3pc) | ||
| 86 | continue; | ||
| 87 | |||
| 85 | memset(&tmp_dev_wwn[0], 0, XCOPY_NAA_IEEE_REGEX_LEN); | 88 | memset(&tmp_dev_wwn[0], 0, XCOPY_NAA_IEEE_REGEX_LEN); |
| 86 | target_xcopy_gen_naa_ieee(se_dev, &tmp_dev_wwn[0]); | 89 | target_xcopy_gen_naa_ieee(se_dev, &tmp_dev_wwn[0]); |
| 87 | 90 | ||
| @@ -357,6 +360,7 @@ struct xcopy_pt_cmd { | |||
| 357 | struct se_cmd se_cmd; | 360 | struct se_cmd se_cmd; |
| 358 | struct xcopy_op *xcopy_op; | 361 | struct xcopy_op *xcopy_op; |
| 359 | struct completion xpt_passthrough_sem; | 362 | struct completion xpt_passthrough_sem; |
| 363 | unsigned char sense_buffer[TRANSPORT_SENSE_BUFFER]; | ||
| 360 | }; | 364 | }; |
| 361 | 365 | ||
| 362 | static struct se_port xcopy_pt_port; | 366 | static struct se_port xcopy_pt_port; |
| @@ -675,7 +679,8 @@ static int target_xcopy_issue_pt_cmd(struct xcopy_pt_cmd *xpt_cmd) | |||
| 675 | 679 | ||
| 676 | pr_debug("target_xcopy_issue_pt_cmd(): SCSI status: 0x%02x\n", | 680 | pr_debug("target_xcopy_issue_pt_cmd(): SCSI status: 0x%02x\n", |
| 677 | se_cmd->scsi_status); | 681 | se_cmd->scsi_status); |
| 678 | return 0; | 682 | |
| 683 | return (se_cmd->scsi_status) ? -EINVAL : 0; | ||
| 679 | } | 684 | } |
| 680 | 685 | ||
| 681 | static int target_xcopy_read_source( | 686 | static int target_xcopy_read_source( |
| @@ -708,7 +713,7 @@ static int target_xcopy_read_source( | |||
| 708 | (unsigned long long)src_lba, src_sectors, length); | 713 | (unsigned long long)src_lba, src_sectors, length); |
| 709 | 714 | ||
| 710 | transport_init_se_cmd(se_cmd, &xcopy_pt_tfo, NULL, length, | 715 | transport_init_se_cmd(se_cmd, &xcopy_pt_tfo, NULL, length, |
| 711 | DMA_FROM_DEVICE, 0, NULL); | 716 | DMA_FROM_DEVICE, 0, &xpt_cmd->sense_buffer[0]); |
| 712 | xop->src_pt_cmd = xpt_cmd; | 717 | xop->src_pt_cmd = xpt_cmd; |
| 713 | 718 | ||
| 714 | rc = target_xcopy_setup_pt_cmd(xpt_cmd, xop, src_dev, &cdb[0], | 719 | rc = target_xcopy_setup_pt_cmd(xpt_cmd, xop, src_dev, &cdb[0], |
| @@ -768,7 +773,7 @@ static int target_xcopy_write_destination( | |||
| 768 | (unsigned long long)dst_lba, dst_sectors, length); | 773 | (unsigned long long)dst_lba, dst_sectors, length); |
| 769 | 774 | ||
| 770 | transport_init_se_cmd(se_cmd, &xcopy_pt_tfo, NULL, length, | 775 | transport_init_se_cmd(se_cmd, &xcopy_pt_tfo, NULL, length, |
| 771 | DMA_TO_DEVICE, 0, NULL); | 776 | DMA_TO_DEVICE, 0, &xpt_cmd->sense_buffer[0]); |
| 772 | xop->dst_pt_cmd = xpt_cmd; | 777 | xop->dst_pt_cmd = xpt_cmd; |
| 773 | 778 | ||
| 774 | rc = target_xcopy_setup_pt_cmd(xpt_cmd, xop, dst_dev, &cdb[0], | 779 | rc = target_xcopy_setup_pt_cmd(xpt_cmd, xop, dst_dev, &cdb[0], |
| @@ -884,30 +889,42 @@ out: | |||
| 884 | 889 | ||
| 885 | sense_reason_t target_do_xcopy(struct se_cmd *se_cmd) | 890 | sense_reason_t target_do_xcopy(struct se_cmd *se_cmd) |
| 886 | { | 891 | { |
| 892 | struct se_device *dev = se_cmd->se_dev; | ||
| 887 | struct xcopy_op *xop = NULL; | 893 | struct xcopy_op *xop = NULL; |
| 888 | unsigned char *p = NULL, *seg_desc; | 894 | unsigned char *p = NULL, *seg_desc; |
| 889 | unsigned int list_id, list_id_usage, sdll, inline_dl, sa; | 895 | unsigned int list_id, list_id_usage, sdll, inline_dl, sa; |
| 896 | sense_reason_t ret = TCM_INVALID_PARAMETER_LIST; | ||
| 890 | int rc; | 897 | int rc; |
| 891 | unsigned short tdll; | 898 | unsigned short tdll; |
| 892 | 899 | ||
| 900 | if (!dev->dev_attrib.emulate_3pc) { | ||
| 901 | pr_err("EXTENDED_COPY operation explicitly disabled\n"); | ||
| 902 | return TCM_UNSUPPORTED_SCSI_OPCODE; | ||
| 903 | } | ||
| 904 | |||
| 893 | sa = se_cmd->t_task_cdb[1] & 0x1f; | 905 | sa = se_cmd->t_task_cdb[1] & 0x1f; |
| 894 | if (sa != 0x00) { | 906 | if (sa != 0x00) { |
| 895 | pr_err("EXTENDED_COPY(LID4) not supported\n"); | 907 | pr_err("EXTENDED_COPY(LID4) not supported\n"); |
| 896 | return TCM_UNSUPPORTED_SCSI_OPCODE; | 908 | return TCM_UNSUPPORTED_SCSI_OPCODE; |
| 897 | } | 909 | } |
| 898 | 910 | ||
| 911 | xop = kzalloc(sizeof(struct xcopy_op), GFP_KERNEL); | ||
| 912 | if (!xop) { | ||
| 913 | pr_err("Unable to allocate xcopy_op\n"); | ||
| 914 | return TCM_OUT_OF_RESOURCES; | ||
| 915 | } | ||
| 916 | xop->xop_se_cmd = se_cmd; | ||
| 917 | |||
| 899 | p = transport_kmap_data_sg(se_cmd); | 918 | p = transport_kmap_data_sg(se_cmd); |
| 900 | if (!p) { | 919 | if (!p) { |
| 901 | pr_err("transport_kmap_data_sg() failed in target_do_xcopy\n"); | 920 | pr_err("transport_kmap_data_sg() failed in target_do_xcopy\n"); |
| 921 | kfree(xop); | ||
| 902 | return TCM_OUT_OF_RESOURCES; | 922 | return TCM_OUT_OF_RESOURCES; |
| 903 | } | 923 | } |
| 904 | 924 | ||
| 905 | list_id = p[0]; | 925 | list_id = p[0]; |
| 906 | if (list_id != 0x00) { | 926 | list_id_usage = (p[1] & 0x18) >> 3; |
| 907 | pr_err("XCOPY with non zero list_id: 0x%02x\n", list_id); | 927 | |
| 908 | goto out; | ||
| 909 | } | ||
| 910 | list_id_usage = (p[1] & 0x18); | ||
| 911 | /* | 928 | /* |
| 912 | * Determine TARGET DESCRIPTOR LIST LENGTH + SEGMENT DESCRIPTOR LIST LENGTH | 929 | * Determine TARGET DESCRIPTOR LIST LENGTH + SEGMENT DESCRIPTOR LIST LENGTH |
| 913 | */ | 930 | */ |
| @@ -920,13 +937,6 @@ sense_reason_t target_do_xcopy(struct se_cmd *se_cmd) | |||
| 920 | goto out; | 937 | goto out; |
| 921 | } | 938 | } |
| 922 | 939 | ||
| 923 | xop = kzalloc(sizeof(struct xcopy_op), GFP_KERNEL); | ||
| 924 | if (!xop) { | ||
| 925 | pr_err("Unable to allocate xcopy_op\n"); | ||
| 926 | goto out; | ||
| 927 | } | ||
| 928 | xop->xop_se_cmd = se_cmd; | ||
| 929 | |||
| 930 | pr_debug("Processing XCOPY with list_id: 0x%02x list_id_usage: 0x%02x" | 940 | pr_debug("Processing XCOPY with list_id: 0x%02x list_id_usage: 0x%02x" |
| 931 | " tdll: %hu sdll: %u inline_dl: %u\n", list_id, list_id_usage, | 941 | " tdll: %hu sdll: %u inline_dl: %u\n", list_id, list_id_usage, |
| 932 | tdll, sdll, inline_dl); | 942 | tdll, sdll, inline_dl); |
| @@ -935,6 +945,17 @@ sense_reason_t target_do_xcopy(struct se_cmd *se_cmd) | |||
| 935 | if (rc <= 0) | 945 | if (rc <= 0) |
| 936 | goto out; | 946 | goto out; |
| 937 | 947 | ||
| 948 | if (xop->src_dev->dev_attrib.block_size != | ||
| 949 | xop->dst_dev->dev_attrib.block_size) { | ||
| 950 | pr_err("XCOPY: Non matching src_dev block_size: %u + dst_dev" | ||
| 951 | " block_size: %u currently unsupported\n", | ||
| 952 | xop->src_dev->dev_attrib.block_size, | ||
| 953 | xop->dst_dev->dev_attrib.block_size); | ||
| 954 | xcopy_pt_undepend_remotedev(xop); | ||
| 955 | ret = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE; | ||
| 956 | goto out; | ||
| 957 | } | ||
| 958 | |||
| 938 | pr_debug("XCOPY: Processed %d target descriptors, length: %u\n", rc, | 959 | pr_debug("XCOPY: Processed %d target descriptors, length: %u\n", rc, |
| 939 | rc * XCOPY_TARGET_DESC_LEN); | 960 | rc * XCOPY_TARGET_DESC_LEN); |
| 940 | seg_desc = &p[16]; | 961 | seg_desc = &p[16]; |
| @@ -957,7 +978,7 @@ out: | |||
| 957 | if (p) | 978 | if (p) |
| 958 | transport_kunmap_data_sg(se_cmd); | 979 | transport_kunmap_data_sg(se_cmd); |
| 959 | kfree(xop); | 980 | kfree(xop); |
| 960 | return TCM_INVALID_CDB_FIELD; | 981 | return ret; |
| 961 | } | 982 | } |
| 962 | 983 | ||
| 963 | static sense_reason_t target_rcr_operating_parameters(struct se_cmd *se_cmd) | 984 | static sense_reason_t target_rcr_operating_parameters(struct se_cmd *se_cmd) |
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index dbfc390330ac..5ef596765060 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig | |||
| @@ -78,7 +78,6 @@ config THERMAL_GOV_USER_SPACE | |||
| 78 | config CPU_THERMAL | 78 | config CPU_THERMAL |
| 79 | bool "generic cpu cooling support" | 79 | bool "generic cpu cooling support" |
| 80 | depends on CPU_FREQ | 80 | depends on CPU_FREQ |
| 81 | select CPU_FREQ_TABLE | ||
| 82 | help | 81 | help |
| 83 | This implements the generic cpu cooling mechanism through frequency | 82 | This implements the generic cpu cooling mechanism through frequency |
| 84 | reduction. An ACPI version of this already exists | 83 | reduction. An ACPI version of this already exists |
diff --git a/drivers/thermal/samsung/exynos_thermal_common.c b/drivers/thermal/samsung/exynos_thermal_common.c index f10a6ad37c06..c2301da08ac7 100644 --- a/drivers/thermal/samsung/exynos_thermal_common.c +++ b/drivers/thermal/samsung/exynos_thermal_common.c | |||
| @@ -310,8 +310,6 @@ void exynos_report_trigger(struct thermal_sensor_conf *conf) | |||
| 310 | } | 310 | } |
| 311 | 311 | ||
| 312 | th_zone = conf->pzone_data; | 312 | th_zone = conf->pzone_data; |
| 313 | if (th_zone->therm_dev) | ||
| 314 | return; | ||
| 315 | 313 | ||
| 316 | if (th_zone->bind == false) { | 314 | if (th_zone->bind == false) { |
| 317 | for (i = 0; i < th_zone->cool_dev_size; i++) { | 315 | for (i = 0; i < th_zone->cool_dev_size; i++) { |
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index b43afda8acd1..32f38b90c4f6 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c | |||
| @@ -317,6 +317,9 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on) | |||
| 317 | 317 | ||
| 318 | con = readl(data->base + reg->tmu_ctrl); | 318 | con = readl(data->base + reg->tmu_ctrl); |
| 319 | 319 | ||
| 320 | if (pdata->test_mux) | ||
| 321 | con |= (pdata->test_mux << reg->test_mux_addr_shift); | ||
| 322 | |||
| 320 | if (pdata->reference_voltage) { | 323 | if (pdata->reference_voltage) { |
| 321 | con &= ~(reg->buf_vref_sel_mask << reg->buf_vref_sel_shift); | 324 | con &= ~(reg->buf_vref_sel_mask << reg->buf_vref_sel_shift); |
| 322 | con |= pdata->reference_voltage << reg->buf_vref_sel_shift; | 325 | con |= pdata->reference_voltage << reg->buf_vref_sel_shift; |
| @@ -488,7 +491,7 @@ static const struct of_device_id exynos_tmu_match[] = { | |||
| 488 | }, | 491 | }, |
| 489 | { | 492 | { |
| 490 | .compatible = "samsung,exynos4412-tmu", | 493 | .compatible = "samsung,exynos4412-tmu", |
| 491 | .data = (void *)EXYNOS5250_TMU_DRV_DATA, | 494 | .data = (void *)EXYNOS4412_TMU_DRV_DATA, |
| 492 | }, | 495 | }, |
| 493 | { | 496 | { |
| 494 | .compatible = "samsung,exynos5250-tmu", | 497 | .compatible = "samsung,exynos5250-tmu", |
| @@ -629,9 +632,10 @@ static int exynos_tmu_probe(struct platform_device *pdev) | |||
| 629 | if (ret) | 632 | if (ret) |
| 630 | return ret; | 633 | return ret; |
| 631 | 634 | ||
| 632 | if (pdata->type == SOC_ARCH_EXYNOS || | 635 | if (pdata->type == SOC_ARCH_EXYNOS4210 || |
| 633 | pdata->type == SOC_ARCH_EXYNOS4210 || | 636 | pdata->type == SOC_ARCH_EXYNOS4412 || |
| 634 | pdata->type == SOC_ARCH_EXYNOS5440) | 637 | pdata->type == SOC_ARCH_EXYNOS5250 || |
| 638 | pdata->type == SOC_ARCH_EXYNOS5440) | ||
| 635 | data->soc = pdata->type; | 639 | data->soc = pdata->type; |
| 636 | else { | 640 | else { |
| 637 | ret = -EINVAL; | 641 | ret = -EINVAL; |
diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h index b364c9eee701..3fb65547e64c 100644 --- a/drivers/thermal/samsung/exynos_tmu.h +++ b/drivers/thermal/samsung/exynos_tmu.h | |||
| @@ -41,7 +41,8 @@ enum calibration_mode { | |||
| 41 | 41 | ||
| 42 | enum soc_type { | 42 | enum soc_type { |
| 43 | SOC_ARCH_EXYNOS4210 = 1, | 43 | SOC_ARCH_EXYNOS4210 = 1, |
| 44 | SOC_ARCH_EXYNOS, | 44 | SOC_ARCH_EXYNOS4412, |
| 45 | SOC_ARCH_EXYNOS5250, | ||
| 45 | SOC_ARCH_EXYNOS5440, | 46 | SOC_ARCH_EXYNOS5440, |
| 46 | }; | 47 | }; |
| 47 | 48 | ||
| @@ -84,6 +85,7 @@ enum soc_type { | |||
| 84 | * @triminfo_reload_shift: shift of triminfo reload enable bit in triminfo_ctrl | 85 | * @triminfo_reload_shift: shift of triminfo reload enable bit in triminfo_ctrl |
| 85 | reg. | 86 | reg. |
| 86 | * @tmu_ctrl: TMU main controller register. | 87 | * @tmu_ctrl: TMU main controller register. |
| 88 | * @test_mux_addr_shift: shift bits of test mux address. | ||
| 87 | * @buf_vref_sel_shift: shift bits of reference voltage in tmu_ctrl register. | 89 | * @buf_vref_sel_shift: shift bits of reference voltage in tmu_ctrl register. |
| 88 | * @buf_vref_sel_mask: mask bits of reference voltage in tmu_ctrl register. | 90 | * @buf_vref_sel_mask: mask bits of reference voltage in tmu_ctrl register. |
| 89 | * @therm_trip_mode_shift: shift bits of tripping mode in tmu_ctrl register. | 91 | * @therm_trip_mode_shift: shift bits of tripping mode in tmu_ctrl register. |
| @@ -150,6 +152,7 @@ struct exynos_tmu_registers { | |||
| 150 | u32 triminfo_reload_shift; | 152 | u32 triminfo_reload_shift; |
| 151 | 153 | ||
| 152 | u32 tmu_ctrl; | 154 | u32 tmu_ctrl; |
| 155 | u32 test_mux_addr_shift; | ||
| 153 | u32 buf_vref_sel_shift; | 156 | u32 buf_vref_sel_shift; |
| 154 | u32 buf_vref_sel_mask; | 157 | u32 buf_vref_sel_mask; |
| 155 | u32 therm_trip_mode_shift; | 158 | u32 therm_trip_mode_shift; |
| @@ -257,6 +260,7 @@ struct exynos_tmu_registers { | |||
| 257 | * @first_point_trim: temp value of the first point trimming | 260 | * @first_point_trim: temp value of the first point trimming |
| 258 | * @second_point_trim: temp value of the second point trimming | 261 | * @second_point_trim: temp value of the second point trimming |
| 259 | * @default_temp_offset: default temperature offset in case of no trimming | 262 | * @default_temp_offset: default temperature offset in case of no trimming |
| 263 | * @test_mux; information if SoC supports test MUX | ||
| 260 | * @cal_type: calibration type for temperature | 264 | * @cal_type: calibration type for temperature |
| 261 | * @cal_mode: calibration mode for temperature | 265 | * @cal_mode: calibration mode for temperature |
| 262 | * @freq_clip_table: Table representing frequency reduction percentage. | 266 | * @freq_clip_table: Table representing frequency reduction percentage. |
| @@ -286,6 +290,7 @@ struct exynos_tmu_platform_data { | |||
| 286 | u8 first_point_trim; | 290 | u8 first_point_trim; |
| 287 | u8 second_point_trim; | 291 | u8 second_point_trim; |
| 288 | u8 default_temp_offset; | 292 | u8 default_temp_offset; |
| 293 | u8 test_mux; | ||
| 289 | 294 | ||
| 290 | enum calibration_type cal_type; | 295 | enum calibration_type cal_type; |
| 291 | enum calibration_mode cal_mode; | 296 | enum calibration_mode cal_mode; |
diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c index 9002499c1f69..073c292baa53 100644 --- a/drivers/thermal/samsung/exynos_tmu_data.c +++ b/drivers/thermal/samsung/exynos_tmu_data.c | |||
| @@ -90,14 +90,15 @@ struct exynos_tmu_init_data const exynos4210_default_tmu_data = { | |||
| 90 | }; | 90 | }; |
| 91 | #endif | 91 | #endif |
| 92 | 92 | ||
| 93 | #if defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS4412) | 93 | #if defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250) |
| 94 | static const struct exynos_tmu_registers exynos5250_tmu_registers = { | 94 | static const struct exynos_tmu_registers exynos4412_tmu_registers = { |
| 95 | .triminfo_data = EXYNOS_TMU_REG_TRIMINFO, | 95 | .triminfo_data = EXYNOS_TMU_REG_TRIMINFO, |
| 96 | .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT, | 96 | .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT, |
| 97 | .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT, | 97 | .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT, |
| 98 | .triminfo_ctrl = EXYNOS_TMU_TRIMINFO_CON, | 98 | .triminfo_ctrl = EXYNOS_TMU_TRIMINFO_CON, |
| 99 | .triminfo_reload_shift = EXYNOS_TRIMINFO_RELOAD_SHIFT, | 99 | .triminfo_reload_shift = EXYNOS_TRIMINFO_RELOAD_SHIFT, |
| 100 | .tmu_ctrl = EXYNOS_TMU_REG_CONTROL, | 100 | .tmu_ctrl = EXYNOS_TMU_REG_CONTROL, |
| 101 | .test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT, | ||
| 101 | .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT, | 102 | .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT, |
| 102 | .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK, | 103 | .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK, |
| 103 | .therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT, | 104 | .therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT, |
| @@ -128,7 +129,7 @@ static const struct exynos_tmu_registers exynos5250_tmu_registers = { | |||
| 128 | .emul_time_mask = EXYNOS_EMUL_TIME_MASK, | 129 | .emul_time_mask = EXYNOS_EMUL_TIME_MASK, |
| 129 | }; | 130 | }; |
| 130 | 131 | ||
| 131 | #define EXYNOS5250_TMU_DATA \ | 132 | #define EXYNOS4412_TMU_DATA \ |
| 132 | .threshold_falling = 10, \ | 133 | .threshold_falling = 10, \ |
| 133 | .trigger_levels[0] = 85, \ | 134 | .trigger_levels[0] = 85, \ |
| 134 | .trigger_levels[1] = 103, \ | 135 | .trigger_levels[1] = 103, \ |
| @@ -162,15 +163,32 @@ static const struct exynos_tmu_registers exynos5250_tmu_registers = { | |||
| 162 | .temp_level = 103, \ | 163 | .temp_level = 103, \ |
| 163 | }, \ | 164 | }, \ |
| 164 | .freq_tab_count = 2, \ | 165 | .freq_tab_count = 2, \ |
| 165 | .type = SOC_ARCH_EXYNOS, \ | 166 | .registers = &exynos4412_tmu_registers, \ |
| 166 | .registers = &exynos5250_tmu_registers, \ | ||
| 167 | .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_TRIM_RELOAD | \ | 167 | .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_TRIM_RELOAD | \ |
| 168 | TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_READY_STATUS | \ | 168 | TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_READY_STATUS | \ |
| 169 | TMU_SUPPORT_EMUL_TIME) | 169 | TMU_SUPPORT_EMUL_TIME) |
| 170 | #endif | ||
| 170 | 171 | ||
| 172 | #if defined(CONFIG_SOC_EXYNOS4412) | ||
| 173 | struct exynos_tmu_init_data const exynos4412_default_tmu_data = { | ||
| 174 | .tmu_data = { | ||
| 175 | { | ||
| 176 | EXYNOS4412_TMU_DATA, | ||
| 177 | .type = SOC_ARCH_EXYNOS4412, | ||
| 178 | .test_mux = EXYNOS4412_MUX_ADDR_VALUE, | ||
| 179 | }, | ||
| 180 | }, | ||
| 181 | .tmu_count = 1, | ||
| 182 | }; | ||
| 183 | #endif | ||
| 184 | |||
| 185 | #if defined(CONFIG_SOC_EXYNOS5250) | ||
| 171 | struct exynos_tmu_init_data const exynos5250_default_tmu_data = { | 186 | struct exynos_tmu_init_data const exynos5250_default_tmu_data = { |
| 172 | .tmu_data = { | 187 | .tmu_data = { |
| 173 | { EXYNOS5250_TMU_DATA }, | 188 | { |
| 189 | EXYNOS4412_TMU_DATA, | ||
| 190 | .type = SOC_ARCH_EXYNOS5250, | ||
| 191 | }, | ||
| 174 | }, | 192 | }, |
| 175 | .tmu_count = 1, | 193 | .tmu_count = 1, |
| 176 | }; | 194 | }; |
diff --git a/drivers/thermal/samsung/exynos_tmu_data.h b/drivers/thermal/samsung/exynos_tmu_data.h index dc7feb51099b..a1ea19d9e0a6 100644 --- a/drivers/thermal/samsung/exynos_tmu_data.h +++ b/drivers/thermal/samsung/exynos_tmu_data.h | |||
| @@ -95,6 +95,10 @@ | |||
| 95 | 95 | ||
| 96 | #define EXYNOS_MAX_TRIGGER_PER_REG 4 | 96 | #define EXYNOS_MAX_TRIGGER_PER_REG 4 |
| 97 | 97 | ||
| 98 | /* Exynos4412 specific */ | ||
| 99 | #define EXYNOS4412_MUX_ADDR_VALUE 6 | ||
| 100 | #define EXYNOS4412_MUX_ADDR_SHIFT 20 | ||
| 101 | |||
| 98 | /*exynos5440 specific registers*/ | 102 | /*exynos5440 specific registers*/ |
| 99 | #define EXYNOS5440_TMU_S0_7_TRIM 0x000 | 103 | #define EXYNOS5440_TMU_S0_7_TRIM 0x000 |
| 100 | #define EXYNOS5440_TMU_S0_7_CTRL 0x020 | 104 | #define EXYNOS5440_TMU_S0_7_CTRL 0x020 |
| @@ -138,7 +142,14 @@ extern struct exynos_tmu_init_data const exynos4210_default_tmu_data; | |||
| 138 | #define EXYNOS4210_TMU_DRV_DATA (NULL) | 142 | #define EXYNOS4210_TMU_DRV_DATA (NULL) |
| 139 | #endif | 143 | #endif |
| 140 | 144 | ||
| 141 | #if (defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS4412)) | 145 | #if defined(CONFIG_SOC_EXYNOS4412) |
| 146 | extern struct exynos_tmu_init_data const exynos4412_default_tmu_data; | ||
| 147 | #define EXYNOS4412_TMU_DRV_DATA (&exynos4412_default_tmu_data) | ||
| 148 | #else | ||
| 149 | #define EXYNOS4412_TMU_DRV_DATA (NULL) | ||
| 150 | #endif | ||
| 151 | |||
| 152 | #if defined(CONFIG_SOC_EXYNOS5250) | ||
| 142 | extern struct exynos_tmu_init_data const exynos5250_default_tmu_data; | 153 | extern struct exynos_tmu_init_data const exynos5250_default_tmu_data; |
| 143 | #define EXYNOS5250_TMU_DRV_DATA (&exynos5250_default_tmu_data) | 154 | #define EXYNOS5250_TMU_DRV_DATA (&exynos5250_default_tmu_data) |
| 144 | #else | 155 | #else |
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c index eeef0e2498ca..fdb07199d9c2 100644 --- a/drivers/thermal/thermal_hwmon.c +++ b/drivers/thermal/thermal_hwmon.c | |||
| @@ -159,7 +159,7 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz) | |||
| 159 | 159 | ||
| 160 | INIT_LIST_HEAD(&hwmon->tz_list); | 160 | INIT_LIST_HEAD(&hwmon->tz_list); |
| 161 | strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH); | 161 | strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH); |
| 162 | hwmon->device = hwmon_device_register(&tz->device); | 162 | hwmon->device = hwmon_device_register(NULL); |
| 163 | if (IS_ERR(hwmon->device)) { | 163 | if (IS_ERR(hwmon->device)) { |
| 164 | result = PTR_ERR(hwmon->device); | 164 | result = PTR_ERR(hwmon->device); |
| 165 | goto free_mem; | 165 | goto free_mem; |
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index 4f8b9af54a5a..5a47cc8c8f85 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c | |||
| @@ -110,6 +110,7 @@ static inline int ti_thermal_get_temp(struct thermal_zone_device *thermal, | |||
| 110 | } else { | 110 | } else { |
| 111 | dev_err(bgp->dev, | 111 | dev_err(bgp->dev, |
| 112 | "Failed to read PCB state. Using defaults\n"); | 112 | "Failed to read PCB state. Using defaults\n"); |
| 113 | ret = 0; | ||
| 113 | } | 114 | } |
| 114 | } | 115 | } |
| 115 | *temp = ti_thermal_hotspot_temperature(tmp, slope, constant); | 116 | *temp = ti_thermal_hotspot_temperature(tmp, slope, constant); |
diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c index f36950e4134f..7722cb9d5a80 100644 --- a/drivers/thermal/x86_pkg_temp_thermal.c +++ b/drivers/thermal/x86_pkg_temp_thermal.c | |||
| @@ -316,18 +316,19 @@ static void pkg_temp_thermal_threshold_work_fn(struct work_struct *work) | |||
| 316 | int phy_id = topology_physical_package_id(cpu); | 316 | int phy_id = topology_physical_package_id(cpu); |
| 317 | struct phy_dev_entry *phdev = pkg_temp_thermal_get_phy_entry(cpu); | 317 | struct phy_dev_entry *phdev = pkg_temp_thermal_get_phy_entry(cpu); |
| 318 | bool notify = false; | 318 | bool notify = false; |
| 319 | unsigned long flags; | ||
| 319 | 320 | ||
| 320 | if (!phdev) | 321 | if (!phdev) |
| 321 | return; | 322 | return; |
| 322 | 323 | ||
| 323 | spin_lock(&pkg_work_lock); | 324 | spin_lock_irqsave(&pkg_work_lock, flags); |
| 324 | ++pkg_work_cnt; | 325 | ++pkg_work_cnt; |
| 325 | if (unlikely(phy_id > max_phy_id)) { | 326 | if (unlikely(phy_id > max_phy_id)) { |
| 326 | spin_unlock(&pkg_work_lock); | 327 | spin_unlock_irqrestore(&pkg_work_lock, flags); |
| 327 | return; | 328 | return; |
| 328 | } | 329 | } |
| 329 | pkg_work_scheduled[phy_id] = 0; | 330 | pkg_work_scheduled[phy_id] = 0; |
| 330 | spin_unlock(&pkg_work_lock); | 331 | spin_unlock_irqrestore(&pkg_work_lock, flags); |
| 331 | 332 | ||
| 332 | enable_pkg_thres_interrupt(); | 333 | enable_pkg_thres_interrupt(); |
| 333 | rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val); | 334 | rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val); |
| @@ -397,6 +398,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) | |||
| 397 | int thres_count; | 398 | int thres_count; |
| 398 | u32 eax, ebx, ecx, edx; | 399 | u32 eax, ebx, ecx, edx; |
| 399 | u8 *temp; | 400 | u8 *temp; |
| 401 | unsigned long flags; | ||
| 400 | 402 | ||
| 401 | cpuid(6, &eax, &ebx, &ecx, &edx); | 403 | cpuid(6, &eax, &ebx, &ecx, &edx); |
| 402 | thres_count = ebx & 0x07; | 404 | thres_count = ebx & 0x07; |
| @@ -420,19 +422,19 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) | |||
| 420 | goto err_ret_unlock; | 422 | goto err_ret_unlock; |
| 421 | } | 423 | } |
| 422 | 424 | ||
| 423 | spin_lock(&pkg_work_lock); | 425 | spin_lock_irqsave(&pkg_work_lock, flags); |
| 424 | if (topology_physical_package_id(cpu) > max_phy_id) | 426 | if (topology_physical_package_id(cpu) > max_phy_id) |
| 425 | max_phy_id = topology_physical_package_id(cpu); | 427 | max_phy_id = topology_physical_package_id(cpu); |
| 426 | temp = krealloc(pkg_work_scheduled, | 428 | temp = krealloc(pkg_work_scheduled, |
| 427 | (max_phy_id+1) * sizeof(u8), GFP_ATOMIC); | 429 | (max_phy_id+1) * sizeof(u8), GFP_ATOMIC); |
| 428 | if (!temp) { | 430 | if (!temp) { |
| 429 | spin_unlock(&pkg_work_lock); | 431 | spin_unlock_irqrestore(&pkg_work_lock, flags); |
| 430 | err = -ENOMEM; | 432 | err = -ENOMEM; |
| 431 | goto err_ret_free; | 433 | goto err_ret_free; |
| 432 | } | 434 | } |
| 433 | pkg_work_scheduled = temp; | 435 | pkg_work_scheduled = temp; |
| 434 | pkg_work_scheduled[topology_physical_package_id(cpu)] = 0; | 436 | pkg_work_scheduled[topology_physical_package_id(cpu)] = 0; |
| 435 | spin_unlock(&pkg_work_lock); | 437 | spin_unlock_irqrestore(&pkg_work_lock, flags); |
| 436 | 438 | ||
| 437 | phy_dev_entry->phys_proc_id = topology_physical_package_id(cpu); | 439 | phy_dev_entry->phys_proc_id = topology_physical_package_id(cpu); |
| 438 | phy_dev_entry->first_cpu = cpu; | 440 | phy_dev_entry->first_cpu = cpu; |
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index a0ebbc9ce5cd..042aa077b5b3 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c | |||
| @@ -1912,9 +1912,6 @@ static int serial_imx_probe_dt(struct imx_port *sport, | |||
| 1912 | 1912 | ||
| 1913 | sport->devdata = of_id->data; | 1913 | sport->devdata = of_id->data; |
| 1914 | 1914 | ||
| 1915 | if (of_device_is_stdout_path(np)) | ||
| 1916 | add_preferred_console(imx_reg.cons->name, sport->port.line, 0); | ||
| 1917 | |||
| 1918 | return 0; | 1915 | return 0; |
| 1919 | } | 1916 | } |
| 1920 | #else | 1917 | #else |
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c index 93b697a0de65..15ad6fcda88b 100644 --- a/drivers/tty/serial/vt8500_serial.c +++ b/drivers/tty/serial/vt8500_serial.c | |||
| @@ -561,12 +561,13 @@ static int vt8500_serial_probe(struct platform_device *pdev) | |||
| 561 | if (!mmres || !irqres) | 561 | if (!mmres || !irqres) |
| 562 | return -ENODEV; | 562 | return -ENODEV; |
| 563 | 563 | ||
| 564 | if (np) | 564 | if (np) { |
| 565 | port = of_alias_get_id(np, "serial"); | 565 | port = of_alias_get_id(np, "serial"); |
| 566 | if (port >= VT8500_MAX_PORTS) | 566 | if (port >= VT8500_MAX_PORTS) |
| 567 | port = -1; | 567 | port = -1; |
| 568 | else | 568 | } else { |
| 569 | port = -1; | 569 | port = -1; |
| 570 | } | ||
| 570 | 571 | ||
| 571 | if (port < 0) { | 572 | if (port < 0) { |
| 572 | /* calculate the port id */ | 573 | /* calculate the port id */ |
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c index 6f96795dd20c..64d7a6d9a1ad 100644 --- a/drivers/usb/chipidea/host.c +++ b/drivers/usb/chipidea/host.c | |||
| @@ -100,8 +100,10 @@ static void host_stop(struct ci_hdrc *ci) | |||
| 100 | { | 100 | { |
| 101 | struct usb_hcd *hcd = ci->hcd; | 101 | struct usb_hcd *hcd = ci->hcd; |
| 102 | 102 | ||
| 103 | usb_remove_hcd(hcd); | 103 | if (hcd) { |
| 104 | usb_put_hcd(hcd); | 104 | usb_remove_hcd(hcd); |
| 105 | usb_put_hcd(hcd); | ||
| 106 | } | ||
| 105 | if (ci->platdata->reg_vbus) | 107 | if (ci->platdata->reg_vbus) |
| 106 | regulator_disable(ci->platdata->reg_vbus); | 108 | regulator_disable(ci->platdata->reg_vbus); |
| 107 | } | 109 | } |
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index 5b44cd47da5b..01fe36273f3b 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c | |||
| @@ -97,6 +97,9 @@ static const struct usb_device_id usb_quirk_list[] = { | |||
| 97 | /* Alcor Micro Corp. Hub */ | 97 | /* Alcor Micro Corp. Hub */ |
| 98 | { USB_DEVICE(0x058f, 0x9254), .driver_info = USB_QUIRK_RESET_RESUME }, | 98 | { USB_DEVICE(0x058f, 0x9254), .driver_info = USB_QUIRK_RESET_RESUME }, |
| 99 | 99 | ||
| 100 | /* MicroTouch Systems touchscreen */ | ||
| 101 | { USB_DEVICE(0x0596, 0x051e), .driver_info = USB_QUIRK_RESET_RESUME }, | ||
| 102 | |||
| 100 | /* appletouch */ | 103 | /* appletouch */ |
| 101 | { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME }, | 104 | { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME }, |
| 102 | 105 | ||
| @@ -130,6 +133,9 @@ static const struct usb_device_id usb_quirk_list[] = { | |||
| 130 | /* Broadcom BCM92035DGROM BT dongle */ | 133 | /* Broadcom BCM92035DGROM BT dongle */ |
| 131 | { USB_DEVICE(0x0a5c, 0x2021), .driver_info = USB_QUIRK_RESET_RESUME }, | 134 | { USB_DEVICE(0x0a5c, 0x2021), .driver_info = USB_QUIRK_RESET_RESUME }, |
| 132 | 135 | ||
| 136 | /* MAYA44USB sound device */ | ||
| 137 | { USB_DEVICE(0x0a92, 0x0091), .driver_info = USB_QUIRK_RESET_RESUME }, | ||
| 138 | |||
| 133 | /* Action Semiconductor flash disk */ | 139 | /* Action Semiconductor flash disk */ |
| 134 | { USB_DEVICE(0x10d6, 0x2200), .driver_info = | 140 | { USB_DEVICE(0x10d6, 0x2200), .driver_info = |
| 135 | USB_QUIRK_STRING_FETCH_255 }, | 141 | USB_QUIRK_STRING_FETCH_255 }, |
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index 2c76ef1320ea..08ef2829a7e2 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c | |||
| @@ -799,7 +799,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) | |||
| 799 | * switchable ports. | 799 | * switchable ports. |
| 800 | */ | 800 | */ |
| 801 | pci_write_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN, | 801 | pci_write_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN, |
| 802 | cpu_to_le32(ports_available)); | 802 | ports_available); |
| 803 | 803 | ||
| 804 | pci_read_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN, | 804 | pci_read_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN, |
| 805 | &ports_available); | 805 | &ports_available); |
| @@ -821,7 +821,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) | |||
| 821 | * host. | 821 | * host. |
| 822 | */ | 822 | */ |
| 823 | pci_write_config_dword(xhci_pdev, USB_INTEL_XUSB2PR, | 823 | pci_write_config_dword(xhci_pdev, USB_INTEL_XUSB2PR, |
| 824 | cpu_to_le32(ports_available)); | 824 | ports_available); |
| 825 | 825 | ||
| 826 | pci_read_config_dword(xhci_pdev, USB_INTEL_XUSB2PR, | 826 | pci_read_config_dword(xhci_pdev, USB_INTEL_XUSB2PR, |
| 827 | &ports_available); | 827 | &ports_available); |
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index 773a6b28c4f1..e8b4c56dcf62 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c | |||
| @@ -1157,18 +1157,6 @@ int xhci_bus_suspend(struct usb_hcd *hcd) | |||
| 1157 | t1 = xhci_port_state_to_neutral(t1); | 1157 | t1 = xhci_port_state_to_neutral(t1); |
| 1158 | if (t1 != t2) | 1158 | if (t1 != t2) |
| 1159 | xhci_writel(xhci, t2, port_array[port_index]); | 1159 | xhci_writel(xhci, t2, port_array[port_index]); |
| 1160 | |||
| 1161 | if (hcd->speed != HCD_USB3) { | ||
| 1162 | /* enable remote wake up for USB 2.0 */ | ||
| 1163 | __le32 __iomem *addr; | ||
| 1164 | u32 tmp; | ||
| 1165 | |||
| 1166 | /* Get the port power control register address. */ | ||
| 1167 | addr = port_array[port_index] + PORTPMSC; | ||
| 1168 | tmp = xhci_readl(xhci, addr); | ||
| 1169 | tmp |= PORT_RWE; | ||
| 1170 | xhci_writel(xhci, tmp, addr); | ||
| 1171 | } | ||
| 1172 | } | 1160 | } |
| 1173 | hcd->state = HC_STATE_SUSPENDED; | 1161 | hcd->state = HC_STATE_SUSPENDED; |
| 1174 | bus_state->next_statechange = jiffies + msecs_to_jiffies(10); | 1162 | bus_state->next_statechange = jiffies + msecs_to_jiffies(10); |
| @@ -1247,20 +1235,6 @@ int xhci_bus_resume(struct usb_hcd *hcd) | |||
| 1247 | xhci_ring_device(xhci, slot_id); | 1235 | xhci_ring_device(xhci, slot_id); |
| 1248 | } else | 1236 | } else |
| 1249 | xhci_writel(xhci, temp, port_array[port_index]); | 1237 | xhci_writel(xhci, temp, port_array[port_index]); |
| 1250 | |||
| 1251 | if (hcd->speed != HCD_USB3) { | ||
| 1252 | /* disable remote wake up for USB 2.0 */ | ||
| 1253 | __le32 __iomem *addr; | ||
| 1254 | u32 tmp; | ||
| 1255 | |||
| 1256 | /* Add one to the port status register address to get | ||
| 1257 | * the port power control register address. | ||
| 1258 | */ | ||
| 1259 | addr = port_array[port_index] + PORTPMSC; | ||
| 1260 | tmp = xhci_readl(xhci, addr); | ||
| 1261 | tmp &= ~PORT_RWE; | ||
| 1262 | xhci_writel(xhci, tmp, addr); | ||
| 1263 | } | ||
| 1264 | } | 1238 | } |
| 1265 | 1239 | ||
| 1266 | (void) xhci_readl(xhci, &xhci->op_regs->command); | 1240 | (void) xhci_readl(xhci, &xhci->op_regs->command); |
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 236c3aabe940..b8dffd59eb25 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c | |||
| @@ -35,6 +35,9 @@ | |||
| 35 | #define PCI_VENDOR_ID_ETRON 0x1b6f | 35 | #define PCI_VENDOR_ID_ETRON 0x1b6f |
| 36 | #define PCI_DEVICE_ID_ASROCK_P67 0x7023 | 36 | #define PCI_DEVICE_ID_ASROCK_P67 0x7023 |
| 37 | 37 | ||
| 38 | #define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI 0x8c31 | ||
| 39 | #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31 | ||
| 40 | |||
| 38 | static const char hcd_name[] = "xhci_hcd"; | 41 | static const char hcd_name[] = "xhci_hcd"; |
| 39 | 42 | ||
| 40 | /* called after powerup, by probe or system-pm "wakeup" */ | 43 | /* called after powerup, by probe or system-pm "wakeup" */ |
| @@ -69,6 +72,14 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) | |||
| 69 | "QUIRK: Fresco Logic xHC needs configure" | 72 | "QUIRK: Fresco Logic xHC needs configure" |
| 70 | " endpoint cmd after reset endpoint"); | 73 | " endpoint cmd after reset endpoint"); |
| 71 | } | 74 | } |
| 75 | if (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK && | ||
| 76 | pdev->revision == 0x4) { | ||
| 77 | xhci->quirks |= XHCI_SLOW_SUSPEND; | ||
| 78 | xhci_dbg_trace(xhci, trace_xhci_dbg_quirks, | ||
| 79 | "QUIRK: Fresco Logic xHC revision %u" | ||
| 80 | "must be suspended extra slowly", | ||
| 81 | pdev->revision); | ||
| 82 | } | ||
| 72 | /* Fresco Logic confirms: all revisions of this chip do not | 83 | /* Fresco Logic confirms: all revisions of this chip do not |
| 73 | * support MSI, even though some of them claim to in their PCI | 84 | * support MSI, even though some of them claim to in their PCI |
| 74 | * capabilities. | 85 | * capabilities. |
| @@ -110,6 +121,15 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) | |||
| 110 | xhci->quirks |= XHCI_SPURIOUS_REBOOT; | 121 | xhci->quirks |= XHCI_SPURIOUS_REBOOT; |
| 111 | xhci->quirks |= XHCI_AVOID_BEI; | 122 | xhci->quirks |= XHCI_AVOID_BEI; |
| 112 | } | 123 | } |
| 124 | if (pdev->vendor == PCI_VENDOR_ID_INTEL && | ||
| 125 | (pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI || | ||
| 126 | pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI)) { | ||
| 127 | /* Workaround for occasional spurious wakeups from S5 (or | ||
| 128 | * any other sleep) on Haswell machines with LPT and LPT-LP | ||
| 129 | * with the new Intel BIOS | ||
| 130 | */ | ||
| 131 | xhci->quirks |= XHCI_SPURIOUS_WAKEUP; | ||
| 132 | } | ||
| 113 | if (pdev->vendor == PCI_VENDOR_ID_ETRON && | 133 | if (pdev->vendor == PCI_VENDOR_ID_ETRON && |
| 114 | pdev->device == PCI_DEVICE_ID_ASROCK_P67) { | 134 | pdev->device == PCI_DEVICE_ID_ASROCK_P67) { |
| 115 | xhci->quirks |= XHCI_RESET_ON_RESUME; | 135 | xhci->quirks |= XHCI_RESET_ON_RESUME; |
| @@ -217,6 +237,11 @@ static void xhci_pci_remove(struct pci_dev *dev) | |||
| 217 | usb_put_hcd(xhci->shared_hcd); | 237 | usb_put_hcd(xhci->shared_hcd); |
| 218 | } | 238 | } |
| 219 | usb_hcd_pci_remove(dev); | 239 | usb_hcd_pci_remove(dev); |
| 240 | |||
| 241 | /* Workaround for spurious wakeups at shutdown with HSW */ | ||
| 242 | if (xhci->quirks & XHCI_SPURIOUS_WAKEUP) | ||
| 243 | pci_set_power_state(dev, PCI_D3hot); | ||
| 244 | |||
| 220 | kfree(xhci); | 245 | kfree(xhci); |
| 221 | } | 246 | } |
| 222 | 247 | ||
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 1e36dbb48366..6e0d886bcce5 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c | |||
| @@ -730,6 +730,9 @@ void xhci_shutdown(struct usb_hcd *hcd) | |||
| 730 | 730 | ||
| 731 | spin_lock_irq(&xhci->lock); | 731 | spin_lock_irq(&xhci->lock); |
| 732 | xhci_halt(xhci); | 732 | xhci_halt(xhci); |
| 733 | /* Workaround for spurious wakeups at shutdown with HSW */ | ||
| 734 | if (xhci->quirks & XHCI_SPURIOUS_WAKEUP) | ||
| 735 | xhci_reset(xhci); | ||
| 733 | spin_unlock_irq(&xhci->lock); | 736 | spin_unlock_irq(&xhci->lock); |
| 734 | 737 | ||
| 735 | xhci_cleanup_msix(xhci); | 738 | xhci_cleanup_msix(xhci); |
| @@ -737,6 +740,10 @@ void xhci_shutdown(struct usb_hcd *hcd) | |||
| 737 | xhci_dbg_trace(xhci, trace_xhci_dbg_init, | 740 | xhci_dbg_trace(xhci, trace_xhci_dbg_init, |
| 738 | "xhci_shutdown completed - status = %x", | 741 | "xhci_shutdown completed - status = %x", |
| 739 | xhci_readl(xhci, &xhci->op_regs->status)); | 742 | xhci_readl(xhci, &xhci->op_regs->status)); |
| 743 | |||
| 744 | /* Yet another workaround for spurious wakeups at shutdown with HSW */ | ||
| 745 | if (xhci->quirks & XHCI_SPURIOUS_WAKEUP) | ||
| 746 | pci_set_power_state(to_pci_dev(hcd->self.controller), PCI_D3hot); | ||
| 740 | } | 747 | } |
| 741 | 748 | ||
| 742 | #ifdef CONFIG_PM | 749 | #ifdef CONFIG_PM |
| @@ -839,6 +846,7 @@ static void xhci_clear_command_ring(struct xhci_hcd *xhci) | |||
| 839 | int xhci_suspend(struct xhci_hcd *xhci) | 846 | int xhci_suspend(struct xhci_hcd *xhci) |
| 840 | { | 847 | { |
| 841 | int rc = 0; | 848 | int rc = 0; |
| 849 | unsigned int delay = XHCI_MAX_HALT_USEC; | ||
| 842 | struct usb_hcd *hcd = xhci_to_hcd(xhci); | 850 | struct usb_hcd *hcd = xhci_to_hcd(xhci); |
| 843 | u32 command; | 851 | u32 command; |
| 844 | 852 | ||
| @@ -861,8 +869,12 @@ int xhci_suspend(struct xhci_hcd *xhci) | |||
| 861 | command = xhci_readl(xhci, &xhci->op_regs->command); | 869 | command = xhci_readl(xhci, &xhci->op_regs->command); |
| 862 | command &= ~CMD_RUN; | 870 | command &= ~CMD_RUN; |
| 863 | xhci_writel(xhci, command, &xhci->op_regs->command); | 871 | xhci_writel(xhci, command, &xhci->op_regs->command); |
| 872 | |||
| 873 | /* Some chips from Fresco Logic need an extraordinary delay */ | ||
| 874 | delay *= (xhci->quirks & XHCI_SLOW_SUSPEND) ? 10 : 1; | ||
| 875 | |||
| 864 | if (xhci_handshake(xhci, &xhci->op_regs->status, | 876 | if (xhci_handshake(xhci, &xhci->op_regs->status, |
| 865 | STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC)) { | 877 | STS_HALT, STS_HALT, delay)) { |
| 866 | xhci_warn(xhci, "WARN: xHC CMD_RUN timeout\n"); | 878 | xhci_warn(xhci, "WARN: xHC CMD_RUN timeout\n"); |
| 867 | spin_unlock_irq(&xhci->lock); | 879 | spin_unlock_irq(&xhci->lock); |
| 868 | return -ETIMEDOUT; | 880 | return -ETIMEDOUT; |
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 289fbfbae746..941d5f59e4dc 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h | |||
| @@ -1548,6 +1548,8 @@ struct xhci_hcd { | |||
| 1548 | #define XHCI_COMP_MODE_QUIRK (1 << 14) | 1548 | #define XHCI_COMP_MODE_QUIRK (1 << 14) |
| 1549 | #define XHCI_AVOID_BEI (1 << 15) | 1549 | #define XHCI_AVOID_BEI (1 << 15) |
| 1550 | #define XHCI_PLAT (1 << 16) | 1550 | #define XHCI_PLAT (1 << 16) |
| 1551 | #define XHCI_SLOW_SUSPEND (1 << 17) | ||
| 1552 | #define XHCI_SPURIOUS_WAKEUP (1 << 18) | ||
| 1551 | unsigned int num_active_eps; | 1553 | unsigned int num_active_eps; |
| 1552 | unsigned int limit_active_eps; | 1554 | unsigned int limit_active_eps; |
| 1553 | /* There are two roothubs to keep track of bus suspend info for */ | 1555 | /* There are two roothubs to keep track of bus suspend info for */ |
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index e2b21c1d9c40..ba5f70f92888 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig | |||
| @@ -246,6 +246,6 @@ config USB_EZUSB_FX2 | |||
| 246 | config USB_HSIC_USB3503 | 246 | config USB_HSIC_USB3503 |
| 247 | tristate "USB3503 HSIC to USB20 Driver" | 247 | tristate "USB3503 HSIC to USB20 Driver" |
| 248 | depends on I2C | 248 | depends on I2C |
| 249 | select REGMAP | 249 | select REGMAP_I2C |
| 250 | help | 250 | help |
| 251 | This option enables support for SMSC USB3503 HSIC to USB 2.0 Driver. | 251 | This option enables support for SMSC USB3503 HSIC to USB 2.0 Driver. |
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 18e877ffe7b7..cd70cc886171 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c | |||
| @@ -922,6 +922,52 @@ static void musb_generic_disable(struct musb *musb) | |||
| 922 | } | 922 | } |
| 923 | 923 | ||
| 924 | /* | 924 | /* |
| 925 | * Program the HDRC to start (enable interrupts, dma, etc.). | ||
| 926 | */ | ||
| 927 | void musb_start(struct musb *musb) | ||
| 928 | { | ||
| 929 | void __iomem *regs = musb->mregs; | ||
| 930 | u8 devctl = musb_readb(regs, MUSB_DEVCTL); | ||
| 931 | |||
| 932 | dev_dbg(musb->controller, "<== devctl %02x\n", devctl); | ||
| 933 | |||
| 934 | /* Set INT enable registers, enable interrupts */ | ||
| 935 | musb->intrtxe = musb->epmask; | ||
| 936 | musb_writew(regs, MUSB_INTRTXE, musb->intrtxe); | ||
| 937 | musb->intrrxe = musb->epmask & 0xfffe; | ||
| 938 | musb_writew(regs, MUSB_INTRRXE, musb->intrrxe); | ||
| 939 | musb_writeb(regs, MUSB_INTRUSBE, 0xf7); | ||
| 940 | |||
| 941 | musb_writeb(regs, MUSB_TESTMODE, 0); | ||
| 942 | |||
| 943 | /* put into basic highspeed mode and start session */ | ||
| 944 | musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE | ||
| 945 | | MUSB_POWER_HSENAB | ||
| 946 | /* ENSUSPEND wedges tusb */ | ||
| 947 | /* | MUSB_POWER_ENSUSPEND */ | ||
| 948 | ); | ||
| 949 | |||
| 950 | musb->is_active = 0; | ||
| 951 | devctl = musb_readb(regs, MUSB_DEVCTL); | ||
| 952 | devctl &= ~MUSB_DEVCTL_SESSION; | ||
| 953 | |||
| 954 | /* session started after: | ||
| 955 | * (a) ID-grounded irq, host mode; | ||
| 956 | * (b) vbus present/connect IRQ, peripheral mode; | ||
| 957 | * (c) peripheral initiates, using SRP | ||
| 958 | */ | ||
| 959 | if (musb->port_mode != MUSB_PORT_MODE_HOST && | ||
| 960 | (devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) { | ||
| 961 | musb->is_active = 1; | ||
| 962 | } else { | ||
| 963 | devctl |= MUSB_DEVCTL_SESSION; | ||
| 964 | } | ||
| 965 | |||
| 966 | musb_platform_enable(musb); | ||
| 967 | musb_writeb(regs, MUSB_DEVCTL, devctl); | ||
| 968 | } | ||
| 969 | |||
| 970 | /* | ||
| 925 | * Make the HDRC stop (disable interrupts, etc.); | 971 | * Make the HDRC stop (disable interrupts, etc.); |
| 926 | * reversible by musb_start | 972 | * reversible by musb_start |
| 927 | * called on gadget driver unregister | 973 | * called on gadget driver unregister |
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 65f3917b4fc5..1c5bf75ee8ff 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h | |||
| @@ -503,6 +503,7 @@ static inline void musb_configure_ep0(struct musb *musb) | |||
| 503 | extern const char musb_driver_name[]; | 503 | extern const char musb_driver_name[]; |
| 504 | 504 | ||
| 505 | extern void musb_stop(struct musb *musb); | 505 | extern void musb_stop(struct musb *musb); |
| 506 | extern void musb_start(struct musb *musb); | ||
| 506 | 507 | ||
| 507 | extern void musb_write_fifo(struct musb_hw_ep *ep, u16 len, const u8 *src); | 508 | extern void musb_write_fifo(struct musb_hw_ep *ep, u16 len, const u8 *src); |
| 508 | extern void musb_read_fifo(struct musb_hw_ep *ep, u16 len, u8 *dst); | 509 | extern void musb_read_fifo(struct musb_hw_ep *ep, u16 len, u8 *dst); |
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index b19ed213ab85..3671898a4535 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c | |||
| @@ -1853,11 +1853,14 @@ static int musb_gadget_start(struct usb_gadget *g, | |||
| 1853 | musb->gadget_driver = driver; | 1853 | musb->gadget_driver = driver; |
| 1854 | 1854 | ||
| 1855 | spin_lock_irqsave(&musb->lock, flags); | 1855 | spin_lock_irqsave(&musb->lock, flags); |
| 1856 | musb->is_active = 1; | ||
| 1856 | 1857 | ||
| 1857 | otg_set_peripheral(otg, &musb->g); | 1858 | otg_set_peripheral(otg, &musb->g); |
| 1858 | musb->xceiv->state = OTG_STATE_B_IDLE; | 1859 | musb->xceiv->state = OTG_STATE_B_IDLE; |
| 1859 | spin_unlock_irqrestore(&musb->lock, flags); | 1860 | spin_unlock_irqrestore(&musb->lock, flags); |
| 1860 | 1861 | ||
| 1862 | musb_start(musb); | ||
| 1863 | |||
| 1861 | /* REVISIT: funcall to other code, which also | 1864 | /* REVISIT: funcall to other code, which also |
| 1862 | * handles power budgeting ... this way also | 1865 | * handles power budgeting ... this way also |
| 1863 | * ensures HdrcStart is indirectly called. | 1866 | * ensures HdrcStart is indirectly called. |
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c index a523950c2b32..d1d6b83aabca 100644 --- a/drivers/usb/musb/musb_virthub.c +++ b/drivers/usb/musb/musb_virthub.c | |||
| @@ -44,52 +44,6 @@ | |||
| 44 | 44 | ||
| 45 | #include "musb_core.h" | 45 | #include "musb_core.h" |
| 46 | 46 | ||
| 47 | /* | ||
| 48 | * Program the HDRC to start (enable interrupts, dma, etc.). | ||
| 49 | */ | ||
| 50 | static void musb_start(struct musb *musb) | ||
| 51 | { | ||
| 52 | void __iomem *regs = musb->mregs; | ||
| 53 | u8 devctl = musb_readb(regs, MUSB_DEVCTL); | ||
| 54 | |||
| 55 | dev_dbg(musb->controller, "<== devctl %02x\n", devctl); | ||
| 56 | |||
| 57 | /* Set INT enable registers, enable interrupts */ | ||
| 58 | musb->intrtxe = musb->epmask; | ||
| 59 | musb_writew(regs, MUSB_INTRTXE, musb->intrtxe); | ||
| 60 | musb->intrrxe = musb->epmask & 0xfffe; | ||
| 61 | musb_writew(regs, MUSB_INTRRXE, musb->intrrxe); | ||
| 62 | musb_writeb(regs, MUSB_INTRUSBE, 0xf7); | ||
| 63 | |||
| 64 | musb_writeb(regs, MUSB_TESTMODE, 0); | ||
| 65 | |||
| 66 | /* put into basic highspeed mode and start session */ | ||
| 67 | musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE | ||
| 68 | | MUSB_POWER_HSENAB | ||
| 69 | /* ENSUSPEND wedges tusb */ | ||
| 70 | /* | MUSB_POWER_ENSUSPEND */ | ||
| 71 | ); | ||
| 72 | |||
| 73 | musb->is_active = 0; | ||
| 74 | devctl = musb_readb(regs, MUSB_DEVCTL); | ||
| 75 | devctl &= ~MUSB_DEVCTL_SESSION; | ||
| 76 | |||
| 77 | /* session started after: | ||
| 78 | * (a) ID-grounded irq, host mode; | ||
| 79 | * (b) vbus present/connect IRQ, peripheral mode; | ||
| 80 | * (c) peripheral initiates, using SRP | ||
| 81 | */ | ||
| 82 | if (musb->port_mode != MUSB_PORT_MODE_HOST && | ||
| 83 | (devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) { | ||
| 84 | musb->is_active = 1; | ||
| 85 | } else { | ||
| 86 | devctl |= MUSB_DEVCTL_SESSION; | ||
| 87 | } | ||
| 88 | |||
| 89 | musb_platform_enable(musb); | ||
| 90 | musb_writeb(regs, MUSB_DEVCTL, devctl); | ||
| 91 | } | ||
| 92 | |||
| 93 | static void musb_port_suspend(struct musb *musb, bool do_suspend) | 47 | static void musb_port_suspend(struct musb *musb, bool do_suspend) |
| 94 | { | 48 | { |
| 95 | struct usb_otg *otg = musb->xceiv->otg; | 49 | struct usb_otg *otg = musb->xceiv->otg; |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 80a7104d5ddb..acaee066b99a 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -451,6 +451,10 @@ static void option_instat_callback(struct urb *urb); | |||
| 451 | #define CHANGHONG_VENDOR_ID 0x2077 | 451 | #define CHANGHONG_VENDOR_ID 0x2077 |
| 452 | #define CHANGHONG_PRODUCT_CH690 0x7001 | 452 | #define CHANGHONG_PRODUCT_CH690 0x7001 |
| 453 | 453 | ||
| 454 | /* Inovia */ | ||
| 455 | #define INOVIA_VENDOR_ID 0x20a6 | ||
| 456 | #define INOVIA_SEW858 0x1105 | ||
| 457 | |||
| 454 | /* some devices interfaces need special handling due to a number of reasons */ | 458 | /* some devices interfaces need special handling due to a number of reasons */ |
| 455 | enum option_blacklist_reason { | 459 | enum option_blacklist_reason { |
| 456 | OPTION_BLACKLIST_NONE = 0, | 460 | OPTION_BLACKLIST_NONE = 0, |
| @@ -689,6 +693,222 @@ static const struct usb_device_id option_ids[] = { | |||
| 689 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7A) }, | 693 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7A) }, |
| 690 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7B) }, | 694 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7B) }, |
| 691 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7C) }, | 695 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7C) }, |
| 696 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x01) }, | ||
| 697 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x02) }, | ||
| 698 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x03) }, | ||
| 699 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x04) }, | ||
| 700 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x05) }, | ||
| 701 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x06) }, | ||
| 702 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0A) }, | ||
| 703 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0B) }, | ||
| 704 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0D) }, | ||
| 705 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0E) }, | ||
| 706 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0F) }, | ||
| 707 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x10) }, | ||
| 708 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x12) }, | ||
| 709 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x13) }, | ||
| 710 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x14) }, | ||
| 711 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x15) }, | ||
| 712 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x17) }, | ||
| 713 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x18) }, | ||
| 714 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x19) }, | ||
| 715 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x1A) }, | ||
| 716 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x1B) }, | ||
| 717 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x1C) }, | ||
| 718 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x31) }, | ||
| 719 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x32) }, | ||
| 720 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x33) }, | ||
| 721 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x34) }, | ||
| 722 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x35) }, | ||
| 723 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x36) }, | ||
| 724 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3A) }, | ||
| 725 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3B) }, | ||
| 726 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3D) }, | ||
| 727 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3E) }, | ||
| 728 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3F) }, | ||
| 729 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x48) }, | ||
| 730 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x49) }, | ||
| 731 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x4A) }, | ||
| 732 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x4B) }, | ||
| 733 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x4C) }, | ||
| 734 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x61) }, | ||
| 735 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x62) }, | ||
| 736 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x63) }, | ||
| 737 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x64) }, | ||
| 738 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x65) }, | ||
| 739 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x66) }, | ||
| 740 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6A) }, | ||
| 741 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6B) }, | ||
| 742 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6D) }, | ||
| 743 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6E) }, | ||
| 744 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6F) }, | ||
| 745 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x78) }, | ||
| 746 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x79) }, | ||
| 747 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7A) }, | ||
| 748 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7B) }, | ||
| 749 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7C) }, | ||
| 750 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x01) }, | ||
| 751 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x02) }, | ||
| 752 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x03) }, | ||
| 753 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x04) }, | ||
| 754 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x05) }, | ||
| 755 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x06) }, | ||
| 756 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0A) }, | ||
| 757 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0B) }, | ||
| 758 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0D) }, | ||
| 759 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0E) }, | ||
| 760 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0F) }, | ||
| 761 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x10) }, | ||
| 762 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x12) }, | ||
| 763 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x13) }, | ||
| 764 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x14) }, | ||
| 765 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x15) }, | ||
| 766 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x17) }, | ||
| 767 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x18) }, | ||
| 768 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x19) }, | ||
| 769 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x1A) }, | ||
| 770 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x1B) }, | ||
| 771 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x1C) }, | ||
| 772 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x31) }, | ||
| 773 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x32) }, | ||
| 774 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x33) }, | ||
| 775 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x34) }, | ||
| 776 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x35) }, | ||
| 777 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x36) }, | ||
| 778 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3A) }, | ||
| 779 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3B) }, | ||
| 780 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3D) }, | ||
| 781 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3E) }, | ||
| 782 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3F) }, | ||
| 783 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x48) }, | ||
| 784 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x49) }, | ||
| 785 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x4A) }, | ||
| 786 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x4B) }, | ||
| 787 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x4C) }, | ||
| 788 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x61) }, | ||
| 789 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x62) }, | ||
| 790 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x63) }, | ||
| 791 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x64) }, | ||
| 792 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x65) }, | ||
| 793 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x66) }, | ||
| 794 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6A) }, | ||
| 795 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6B) }, | ||
| 796 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6D) }, | ||
| 797 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6E) }, | ||
| 798 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6F) }, | ||
| 799 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x78) }, | ||
| 800 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x79) }, | ||
| 801 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7A) }, | ||
| 802 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7B) }, | ||
| 803 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7C) }, | ||
| 804 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x01) }, | ||
| 805 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x02) }, | ||
| 806 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x03) }, | ||
| 807 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x04) }, | ||
| 808 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x05) }, | ||
| 809 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x06) }, | ||
| 810 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0A) }, | ||
| 811 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0B) }, | ||
| 812 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0D) }, | ||
| 813 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0E) }, | ||
| 814 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0F) }, | ||
| 815 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x10) }, | ||
| 816 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x12) }, | ||
| 817 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x13) }, | ||
| 818 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x14) }, | ||
| 819 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x15) }, | ||
| 820 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x17) }, | ||
| 821 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x18) }, | ||
| 822 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x19) }, | ||
| 823 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x1A) }, | ||
| 824 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x1B) }, | ||
| 825 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x1C) }, | ||
| 826 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x31) }, | ||
| 827 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x32) }, | ||
| 828 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x33) }, | ||
| 829 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x34) }, | ||
| 830 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x35) }, | ||
| 831 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x36) }, | ||
| 832 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3A) }, | ||
| 833 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3B) }, | ||
| 834 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3D) }, | ||
| 835 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3E) }, | ||
| 836 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3F) }, | ||
| 837 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x48) }, | ||
| 838 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x49) }, | ||
| 839 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x4A) }, | ||
| 840 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x4B) }, | ||
| 841 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x4C) }, | ||
| 842 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x61) }, | ||
| 843 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x62) }, | ||
| 844 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x63) }, | ||
| 845 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x64) }, | ||
| 846 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x65) }, | ||
| 847 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x66) }, | ||
| 848 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6A) }, | ||
| 849 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6B) }, | ||
| 850 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6D) }, | ||
| 851 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6E) }, | ||
| 852 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6F) }, | ||
| 853 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x78) }, | ||
| 854 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x79) }, | ||
| 855 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7A) }, | ||
| 856 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7B) }, | ||
| 857 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7C) }, | ||
| 858 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x01) }, | ||
| 859 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x02) }, | ||
| 860 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x03) }, | ||
| 861 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x04) }, | ||
| 862 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x05) }, | ||
| 863 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x06) }, | ||
| 864 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0A) }, | ||
| 865 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0B) }, | ||
| 866 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0D) }, | ||
| 867 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0E) }, | ||
| 868 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0F) }, | ||
| 869 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x10) }, | ||
| 870 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x12) }, | ||
| 871 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x13) }, | ||
| 872 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x14) }, | ||
| 873 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x15) }, | ||
| 874 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x17) }, | ||
| 875 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x18) }, | ||
| 876 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x19) }, | ||
| 877 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x1A) }, | ||
| 878 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x1B) }, | ||
| 879 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x1C) }, | ||
| 880 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x31) }, | ||
| 881 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x32) }, | ||
| 882 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x33) }, | ||
| 883 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x34) }, | ||
| 884 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x35) }, | ||
| 885 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x36) }, | ||
| 886 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3A) }, | ||
| 887 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3B) }, | ||
| 888 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3D) }, | ||
| 889 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3E) }, | ||
| 890 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3F) }, | ||
| 891 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x48) }, | ||
| 892 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x49) }, | ||
| 893 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x4A) }, | ||
| 894 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x4B) }, | ||
| 895 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x4C) }, | ||
| 896 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x61) }, | ||
| 897 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x62) }, | ||
| 898 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x63) }, | ||
| 899 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x64) }, | ||
| 900 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x65) }, | ||
| 901 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x66) }, | ||
| 902 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6A) }, | ||
| 903 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6B) }, | ||
| 904 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6D) }, | ||
| 905 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6E) }, | ||
| 906 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6F) }, | ||
| 907 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x78) }, | ||
| 908 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x79) }, | ||
| 909 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7A) }, | ||
| 910 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7B) }, | ||
| 911 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7C) }, | ||
| 692 | 912 | ||
| 693 | 913 | ||
| 694 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, | 914 | { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, |
| @@ -1257,7 +1477,9 @@ static const struct usb_device_id option_ids[] = { | |||
| 1257 | 1477 | ||
| 1258 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) }, | 1478 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) }, |
| 1259 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) }, | 1479 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) }, |
| 1260 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200) }, | 1480 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200), |
| 1481 | .driver_info = (kernel_ulong_t)&net_intf6_blacklist | ||
| 1482 | }, | ||
| 1261 | { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */ | 1483 | { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */ |
| 1262 | { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/ | 1484 | { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/ |
| 1263 | { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) }, | 1485 | { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) }, |
| @@ -1345,6 +1567,7 @@ static const struct usb_device_id option_ids[] = { | |||
| 1345 | { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) }, | 1567 | { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) }, |
| 1346 | { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ | 1568 | { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ |
| 1347 | { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ | 1569 | { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ |
| 1570 | { USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) }, | ||
| 1348 | { } /* Terminating entry */ | 1571 | { } /* Terminating entry */ |
| 1349 | }; | 1572 | }; |
| 1350 | MODULE_DEVICE_TABLE(usb, option_ids); | 1573 | MODULE_DEVICE_TABLE(usb, option_ids); |
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 760b78560f67..c9a35697ebe9 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
| @@ -190,6 +190,7 @@ static struct usb_device_id ti_id_table_combined[] = { | |||
| 190 | { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) }, | 190 | { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) }, |
| 191 | { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) }, | 191 | { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) }, |
| 192 | { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) }, | 192 | { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) }, |
| 193 | { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) }, | ||
| 193 | { USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) }, | 194 | { USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) }, |
| 194 | { } /* terminator */ | 195 | { } /* terminator */ |
| 195 | }; | 196 | }; |
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 94d75edef77f..18509e6c21ab 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c | |||
| @@ -211,8 +211,11 @@ static int slave_configure(struct scsi_device *sdev) | |||
| 211 | /* | 211 | /* |
| 212 | * Many devices do not respond properly to READ_CAPACITY_16. | 212 | * Many devices do not respond properly to READ_CAPACITY_16. |
| 213 | * Tell the SCSI layer to try READ_CAPACITY_10 first. | 213 | * Tell the SCSI layer to try READ_CAPACITY_10 first. |
| 214 | * However some USB 3.0 drive enclosures return capacity | ||
| 215 | * modulo 2TB. Those must use READ_CAPACITY_16 | ||
| 214 | */ | 216 | */ |
| 215 | sdev->try_rc_10_first = 1; | 217 | if (!(us->fflags & US_FL_NEEDS_CAP16)) |
| 218 | sdev->try_rc_10_first = 1; | ||
| 216 | 219 | ||
| 217 | /* assume SPC3 or latter devices support sense size > 18 */ | 220 | /* assume SPC3 or latter devices support sense size > 18 */ |
| 218 | if (sdev->scsi_level > SCSI_SPC_2) | 221 | if (sdev->scsi_level > SCSI_SPC_2) |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index c015f2c16729..de32cfa5bfa6 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -1925,6 +1925,13 @@ UNUSUAL_DEV( 0x1652, 0x6600, 0x0201, 0x0201, | |||
| 1925 | USB_SC_DEVICE, USB_PR_DEVICE, NULL, | 1925 | USB_SC_DEVICE, USB_PR_DEVICE, NULL, |
| 1926 | US_FL_IGNORE_RESIDUE ), | 1926 | US_FL_IGNORE_RESIDUE ), |
| 1927 | 1927 | ||
| 1928 | /* Reported by Oliver Neukum <oneukum@suse.com> */ | ||
| 1929 | UNUSUAL_DEV( 0x174c, 0x55aa, 0x0100, 0x0100, | ||
| 1930 | "ASMedia", | ||
| 1931 | "AS2105", | ||
| 1932 | USB_SC_DEVICE, USB_PR_DEVICE, NULL, | ||
| 1933 | US_FL_NEEDS_CAP16), | ||
| 1934 | |||
| 1928 | /* Reported by Jesse Feddema <jdfeddema@gmail.com> */ | 1935 | /* Reported by Jesse Feddema <jdfeddema@gmail.com> */ |
| 1929 | UNUSUAL_DEV( 0x177f, 0x0400, 0x0000, 0x0000, | 1936 | UNUSUAL_DEV( 0x177f, 0x0400, 0x0000, 0x0000, |
| 1930 | "Yarvik", | 1937 | "Yarvik", |
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index a9807dea3887..4fb7a8f83c8a 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c | |||
| @@ -545,6 +545,8 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, | |||
| 545 | long npage; | 545 | long npage; |
| 546 | int ret = 0, prot = 0; | 546 | int ret = 0, prot = 0; |
| 547 | uint64_t mask; | 547 | uint64_t mask; |
| 548 | struct vfio_dma *dma = NULL; | ||
| 549 | unsigned long pfn; | ||
| 548 | 550 | ||
| 549 | end = map->iova + map->size; | 551 | end = map->iova + map->size; |
| 550 | 552 | ||
| @@ -587,8 +589,6 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, | |||
| 587 | } | 589 | } |
| 588 | 590 | ||
| 589 | for (iova = map->iova; iova < end; iova += size, vaddr += size) { | 591 | for (iova = map->iova; iova < end; iova += size, vaddr += size) { |
| 590 | struct vfio_dma *dma = NULL; | ||
| 591 | unsigned long pfn; | ||
| 592 | long i; | 592 | long i; |
| 593 | 593 | ||
| 594 | /* Pin a contiguous chunk of memory */ | 594 | /* Pin a contiguous chunk of memory */ |
| @@ -597,16 +597,15 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, | |||
| 597 | if (npage <= 0) { | 597 | if (npage <= 0) { |
| 598 | WARN_ON(!npage); | 598 | WARN_ON(!npage); |
| 599 | ret = (int)npage; | 599 | ret = (int)npage; |
| 600 | break; | 600 | goto out; |
| 601 | } | 601 | } |
| 602 | 602 | ||
| 603 | /* Verify pages are not already mapped */ | 603 | /* Verify pages are not already mapped */ |
| 604 | for (i = 0; i < npage; i++) { | 604 | for (i = 0; i < npage; i++) { |
| 605 | if (iommu_iova_to_phys(iommu->domain, | 605 | if (iommu_iova_to_phys(iommu->domain, |
| 606 | iova + (i << PAGE_SHIFT))) { | 606 | iova + (i << PAGE_SHIFT))) { |
| 607 | vfio_unpin_pages(pfn, npage, prot, true); | ||
| 608 | ret = -EBUSY; | 607 | ret = -EBUSY; |
| 609 | break; | 608 | goto out_unpin; |
| 610 | } | 609 | } |
| 611 | } | 610 | } |
| 612 | 611 | ||
| @@ -616,8 +615,7 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, | |||
| 616 | if (ret) { | 615 | if (ret) { |
| 617 | if (ret != -EBUSY || | 616 | if (ret != -EBUSY || |
| 618 | map_try_harder(iommu, iova, pfn, npage, prot)) { | 617 | map_try_harder(iommu, iova, pfn, npage, prot)) { |
| 619 | vfio_unpin_pages(pfn, npage, prot, true); | 618 | goto out_unpin; |
| 620 | break; | ||
| 621 | } | 619 | } |
| 622 | } | 620 | } |
| 623 | 621 | ||
| @@ -672,9 +670,8 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, | |||
| 672 | dma = kzalloc(sizeof(*dma), GFP_KERNEL); | 670 | dma = kzalloc(sizeof(*dma), GFP_KERNEL); |
| 673 | if (!dma) { | 671 | if (!dma) { |
| 674 | iommu_unmap(iommu->domain, iova, size); | 672 | iommu_unmap(iommu->domain, iova, size); |
| 675 | vfio_unpin_pages(pfn, npage, prot, true); | ||
| 676 | ret = -ENOMEM; | 673 | ret = -ENOMEM; |
| 677 | break; | 674 | goto out_unpin; |
| 678 | } | 675 | } |
| 679 | 676 | ||
| 680 | dma->size = size; | 677 | dma->size = size; |
| @@ -685,16 +682,21 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, | |||
| 685 | } | 682 | } |
| 686 | } | 683 | } |
| 687 | 684 | ||
| 688 | if (ret) { | 685 | WARN_ON(ret); |
| 689 | struct vfio_dma *tmp; | 686 | mutex_unlock(&iommu->lock); |
| 690 | iova = map->iova; | 687 | return ret; |
| 691 | size = map->size; | 688 | |
| 692 | while ((tmp = vfio_find_dma(iommu, iova, size))) { | 689 | out_unpin: |
| 693 | int r = vfio_remove_dma_overlap(iommu, iova, | 690 | vfio_unpin_pages(pfn, npage, prot, true); |
| 694 | &size, tmp); | 691 | |
| 695 | if (WARN_ON(r || !size)) | 692 | out: |
| 696 | break; | 693 | iova = map->iova; |
| 697 | } | 694 | size = map->size; |
| 695 | while ((dma = vfio_find_dma(iommu, iova, size))) { | ||
| 696 | int r = vfio_remove_dma_overlap(iommu, iova, | ||
| 697 | &size, dma); | ||
| 698 | if (WARN_ON(r || !size)) | ||
| 699 | break; | ||
| 698 | } | 700 | } |
| 699 | 701 | ||
| 700 | mutex_unlock(&iommu->lock); | 702 | mutex_unlock(&iommu->lock); |
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index ce5221fa393a..e663921eebb6 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c | |||
| @@ -1056,7 +1056,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) | |||
| 1056 | if (data_direction != DMA_NONE) { | 1056 | if (data_direction != DMA_NONE) { |
| 1057 | ret = vhost_scsi_map_iov_to_sgl(cmd, | 1057 | ret = vhost_scsi_map_iov_to_sgl(cmd, |
| 1058 | &vq->iov[data_first], data_num, | 1058 | &vq->iov[data_first], data_num, |
| 1059 | data_direction == DMA_TO_DEVICE); | 1059 | data_direction == DMA_FROM_DEVICE); |
| 1060 | if (unlikely(ret)) { | 1060 | if (unlikely(ret)) { |
| 1061 | vq_err(vq, "Failed to map iov to sgl\n"); | 1061 | vq_err(vq, "Failed to map iov to sgl\n"); |
| 1062 | goto err_free; | 1062 | goto err_free; |
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index c7c64f18773d..fa932c2f7d97 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c | |||
| @@ -613,6 +613,9 @@ static int w1_bus_notify(struct notifier_block *nb, unsigned long action, | |||
| 613 | sl = dev_to_w1_slave(dev); | 613 | sl = dev_to_w1_slave(dev); |
| 614 | fops = sl->family->fops; | 614 | fops = sl->family->fops; |
| 615 | 615 | ||
| 616 | if (!fops) | ||
| 617 | return 0; | ||
| 618 | |||
| 616 | switch (action) { | 619 | switch (action) { |
| 617 | case BUS_NOTIFY_ADD_DEVICE: | 620 | case BUS_NOTIFY_ADD_DEVICE: |
| 618 | /* if the family driver needs to initialize something... */ | 621 | /* if the family driver needs to initialize something... */ |
| @@ -713,7 +716,10 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn) | |||
| 713 | atomic_set(&sl->refcnt, 0); | 716 | atomic_set(&sl->refcnt, 0); |
| 714 | init_completion(&sl->released); | 717 | init_completion(&sl->released); |
| 715 | 718 | ||
| 719 | /* slave modules need to be loaded in a context with unlocked mutex */ | ||
| 720 | mutex_unlock(&dev->mutex); | ||
| 716 | request_module("w1-family-0x%0x", rn->family); | 721 | request_module("w1-family-0x%0x", rn->family); |
| 722 | mutex_lock(&dev->mutex); | ||
| 717 | 723 | ||
| 718 | spin_lock(&w1_flock); | 724 | spin_lock(&w1_flock); |
| 719 | f = w1_family_registered(rn->family); | 725 | f = w1_family_registered(rn->family); |
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 5be5e3d14f79..19f3c3fc65f4 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
| @@ -802,6 +802,12 @@ static int hpwdt_init_one(struct pci_dev *dev, | |||
| 802 | return -ENODEV; | 802 | return -ENODEV; |
| 803 | } | 803 | } |
| 804 | 804 | ||
| 805 | /* | ||
| 806 | * Ignore all auxilary iLO devices with the following PCI ID | ||
| 807 | */ | ||
| 808 | if (dev->subsystem_device == 0x1979) | ||
| 809 | return -ENODEV; | ||
| 810 | |||
| 805 | if (pci_enable_device(dev)) { | 811 | if (pci_enable_device(dev)) { |
| 806 | dev_warn(&dev->dev, | 812 | dev_warn(&dev->dev, |
| 807 | "Not possible to enable PCI Device: 0x%x:0x%x.\n", | 813 | "Not possible to enable PCI Device: 0x%x:0x%x.\n", |
diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c index 491419e0772a..5c3d4df63e68 100644 --- a/drivers/watchdog/kempld_wdt.c +++ b/drivers/watchdog/kempld_wdt.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #define KEMPLD_WDT_STAGE_TIMEOUT(x) (0x1b + (x) * 4) | 35 | #define KEMPLD_WDT_STAGE_TIMEOUT(x) (0x1b + (x) * 4) |
| 36 | #define KEMPLD_WDT_STAGE_CFG(x) (0x18 + (x)) | 36 | #define KEMPLD_WDT_STAGE_CFG(x) (0x18 + (x)) |
| 37 | #define STAGE_CFG_GET_PRESCALER(x) (((x) & 0x30) >> 4) | 37 | #define STAGE_CFG_GET_PRESCALER(x) (((x) & 0x30) >> 4) |
| 38 | #define STAGE_CFG_SET_PRESCALER(x) (((x) & 0x30) << 4) | 38 | #define STAGE_CFG_SET_PRESCALER(x) (((x) & 0x3) << 4) |
| 39 | #define STAGE_CFG_PRESCALER_MASK 0x30 | 39 | #define STAGE_CFG_PRESCALER_MASK 0x30 |
| 40 | #define STAGE_CFG_ACTION_MASK 0x7 | 40 | #define STAGE_CFG_ACTION_MASK 0x7 |
| 41 | #define STAGE_CFG_ASSERT (1 << 3) | 41 | #define STAGE_CFG_ASSERT (1 << 3) |
diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c index 1f94b42764aa..f6caa77151c7 100644 --- a/drivers/watchdog/sunxi_wdt.c +++ b/drivers/watchdog/sunxi_wdt.c | |||
| @@ -146,7 +146,7 @@ static const struct watchdog_ops sunxi_wdt_ops = { | |||
| 146 | .set_timeout = sunxi_wdt_set_timeout, | 146 | .set_timeout = sunxi_wdt_set_timeout, |
| 147 | }; | 147 | }; |
| 148 | 148 | ||
| 149 | static int __init sunxi_wdt_probe(struct platform_device *pdev) | 149 | static int sunxi_wdt_probe(struct platform_device *pdev) |
| 150 | { | 150 | { |
| 151 | struct sunxi_wdt_dev *sunxi_wdt; | 151 | struct sunxi_wdt_dev *sunxi_wdt; |
| 152 | struct resource *res; | 152 | struct resource *res; |
| @@ -187,7 +187,7 @@ static int __init sunxi_wdt_probe(struct platform_device *pdev) | |||
| 187 | return 0; | 187 | return 0; |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | static int __exit sunxi_wdt_remove(struct platform_device *pdev) | 190 | static int sunxi_wdt_remove(struct platform_device *pdev) |
| 191 | { | 191 | { |
| 192 | struct sunxi_wdt_dev *sunxi_wdt = platform_get_drvdata(pdev); | 192 | struct sunxi_wdt_dev *sunxi_wdt = platform_get_drvdata(pdev); |
| 193 | 193 | ||
diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c index 42913f131dc2..c9b0c627fe7e 100644 --- a/drivers/watchdog/ts72xx_wdt.c +++ b/drivers/watchdog/ts72xx_wdt.c | |||
| @@ -310,7 +310,8 @@ static long ts72xx_wdt_ioctl(struct file *file, unsigned int cmd, | |||
| 310 | 310 | ||
| 311 | case WDIOC_GETSTATUS: | 311 | case WDIOC_GETSTATUS: |
| 312 | case WDIOC_GETBOOTSTATUS: | 312 | case WDIOC_GETBOOTSTATUS: |
| 313 | return put_user(0, p); | 313 | error = put_user(0, p); |
| 314 | break; | ||
| 314 | 315 | ||
| 315 | case WDIOC_KEEPALIVE: | 316 | case WDIOC_KEEPALIVE: |
| 316 | ts72xx_wdt_kick(wdt); | 317 | ts72xx_wdt_kick(wdt); |
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 4ae17ed13b32..62176ad89846 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
| @@ -1561,8 +1561,9 @@ int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info, | |||
| 1561 | return ret; | 1561 | return ret; |
| 1562 | } | 1562 | } |
| 1563 | 1563 | ||
| 1564 | struct btrfs_root *btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info, | 1564 | struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info, |
| 1565 | struct btrfs_key *location) | 1565 | struct btrfs_key *location, |
| 1566 | bool check_ref) | ||
| 1566 | { | 1567 | { |
| 1567 | struct btrfs_root *root; | 1568 | struct btrfs_root *root; |
| 1568 | int ret; | 1569 | int ret; |
| @@ -1586,7 +1587,7 @@ struct btrfs_root *btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info, | |||
| 1586 | again: | 1587 | again: |
| 1587 | root = btrfs_lookup_fs_root(fs_info, location->objectid); | 1588 | root = btrfs_lookup_fs_root(fs_info, location->objectid); |
| 1588 | if (root) { | 1589 | if (root) { |
| 1589 | if (btrfs_root_refs(&root->root_item) == 0) | 1590 | if (check_ref && btrfs_root_refs(&root->root_item) == 0) |
| 1590 | return ERR_PTR(-ENOENT); | 1591 | return ERR_PTR(-ENOENT); |
| 1591 | return root; | 1592 | return root; |
| 1592 | } | 1593 | } |
| @@ -1595,7 +1596,7 @@ again: | |||
| 1595 | if (IS_ERR(root)) | 1596 | if (IS_ERR(root)) |
| 1596 | return root; | 1597 | return root; |
| 1597 | 1598 | ||
| 1598 | if (btrfs_root_refs(&root->root_item) == 0) { | 1599 | if (check_ref && btrfs_root_refs(&root->root_item) == 0) { |
| 1599 | ret = -ENOENT; | 1600 | ret = -ENOENT; |
| 1600 | goto fail; | 1601 | goto fail; |
| 1601 | } | 1602 | } |
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index b71acd6e1e5b..5ce2a7da8b11 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h | |||
| @@ -68,8 +68,17 @@ struct btrfs_root *btrfs_read_fs_root(struct btrfs_root *tree_root, | |||
| 68 | int btrfs_init_fs_root(struct btrfs_root *root); | 68 | int btrfs_init_fs_root(struct btrfs_root *root); |
| 69 | int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info, | 69 | int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info, |
| 70 | struct btrfs_root *root); | 70 | struct btrfs_root *root); |
| 71 | struct btrfs_root *btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info, | 71 | |
| 72 | struct btrfs_key *location); | 72 | struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info, |
| 73 | struct btrfs_key *key, | ||
| 74 | bool check_ref); | ||
| 75 | static inline struct btrfs_root * | ||
| 76 | btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info, | ||
| 77 | struct btrfs_key *location) | ||
| 78 | { | ||
| 79 | return btrfs_get_fs_root(fs_info, location, true); | ||
| 80 | } | ||
| 81 | |||
| 73 | int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info); | 82 | int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info); |
| 74 | void btrfs_btree_balance_dirty(struct btrfs_root *root); | 83 | void btrfs_btree_balance_dirty(struct btrfs_root *root); |
| 75 | void btrfs_btree_balance_dirty_nodelay(struct btrfs_root *root); | 84 | void btrfs_btree_balance_dirty_nodelay(struct btrfs_root *root); |
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 22bda32acb89..51731b76900d 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
| @@ -1490,10 +1490,8 @@ static noinline u64 find_delalloc_range(struct extent_io_tree *tree, | |||
| 1490 | cur_start = state->end + 1; | 1490 | cur_start = state->end + 1; |
| 1491 | node = rb_next(node); | 1491 | node = rb_next(node); |
| 1492 | total_bytes += state->end - state->start + 1; | 1492 | total_bytes += state->end - state->start + 1; |
| 1493 | if (total_bytes >= max_bytes) { | 1493 | if (total_bytes >= max_bytes) |
| 1494 | *end = *start + max_bytes - 1; | ||
| 1495 | break; | 1494 | break; |
| 1496 | } | ||
| 1497 | if (!node) | 1495 | if (!node) |
| 1498 | break; | 1496 | break; |
| 1499 | } | 1497 | } |
| @@ -1635,10 +1633,9 @@ again: | |||
| 1635 | 1633 | ||
| 1636 | /* | 1634 | /* |
| 1637 | * make sure to limit the number of pages we try to lock down | 1635 | * make sure to limit the number of pages we try to lock down |
| 1638 | * if we're looping. | ||
| 1639 | */ | 1636 | */ |
| 1640 | if (delalloc_end + 1 - delalloc_start > max_bytes && loops) | 1637 | if (delalloc_end + 1 - delalloc_start > max_bytes) |
| 1641 | delalloc_end = delalloc_start + PAGE_CACHE_SIZE - 1; | 1638 | delalloc_end = delalloc_start + max_bytes - 1; |
| 1642 | 1639 | ||
| 1643 | /* step two, lock all the pages after the page that has start */ | 1640 | /* step two, lock all the pages after the page that has start */ |
| 1644 | ret = lock_delalloc_pages(inode, locked_page, | 1641 | ret = lock_delalloc_pages(inode, locked_page, |
| @@ -1649,8 +1646,7 @@ again: | |||
| 1649 | */ | 1646 | */ |
| 1650 | free_extent_state(cached_state); | 1647 | free_extent_state(cached_state); |
| 1651 | if (!loops) { | 1648 | if (!loops) { |
| 1652 | unsigned long offset = (*start) & (PAGE_CACHE_SIZE - 1); | 1649 | max_bytes = PAGE_CACHE_SIZE; |
| 1653 | max_bytes = PAGE_CACHE_SIZE - offset; | ||
| 1654 | loops = 1; | 1650 | loops = 1; |
| 1655 | goto again; | 1651 | goto again; |
| 1656 | } else { | 1652 | } else { |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 22ebc13b6c99..51e3afa78354 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
| @@ -6437,6 +6437,7 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, | |||
| 6437 | 6437 | ||
| 6438 | if (btrfs_extent_readonly(root, disk_bytenr)) | 6438 | if (btrfs_extent_readonly(root, disk_bytenr)) |
| 6439 | goto out; | 6439 | goto out; |
| 6440 | btrfs_release_path(path); | ||
| 6440 | 6441 | ||
| 6441 | /* | 6442 | /* |
| 6442 | * look for other files referencing this extent, if we | 6443 | * look for other files referencing this extent, if we |
| @@ -7986,7 +7987,7 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
| 7986 | 7987 | ||
| 7987 | 7988 | ||
| 7988 | /* check for collisions, even if the name isn't there */ | 7989 | /* check for collisions, even if the name isn't there */ |
| 7989 | ret = btrfs_check_dir_item_collision(root, new_dir->i_ino, | 7990 | ret = btrfs_check_dir_item_collision(dest, new_dir->i_ino, |
| 7990 | new_dentry->d_name.name, | 7991 | new_dentry->d_name.name, |
| 7991 | new_dentry->d_name.len); | 7992 | new_dentry->d_name.len); |
| 7992 | 7993 | ||
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index a5a26320503f..4a355726151e 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c | |||
| @@ -588,7 +588,7 @@ static struct btrfs_root *read_fs_root(struct btrfs_fs_info *fs_info, | |||
| 588 | else | 588 | else |
| 589 | key.offset = (u64)-1; | 589 | key.offset = (u64)-1; |
| 590 | 590 | ||
| 591 | return btrfs_read_fs_root_no_name(fs_info, &key); | 591 | return btrfs_get_fs_root(fs_info, &key, false); |
| 592 | } | 592 | } |
| 593 | 593 | ||
| 594 | #ifdef BTRFS_COMPAT_EXTENT_TREE_V0 | 594 | #ifdef BTRFS_COMPAT_EXTENT_TREE_V0 |
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index 0b1f4ef8db98..ec71ea44d2b4 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c | |||
| @@ -299,11 +299,6 @@ int btrfs_find_orphan_roots(struct btrfs_root *tree_root) | |||
| 299 | continue; | 299 | continue; |
| 300 | } | 300 | } |
| 301 | 301 | ||
| 302 | if (btrfs_root_refs(&root->root_item) == 0) { | ||
| 303 | btrfs_add_dead_root(root); | ||
| 304 | continue; | ||
| 305 | } | ||
| 306 | |||
| 307 | err = btrfs_init_fs_root(root); | 302 | err = btrfs_init_fs_root(root); |
| 308 | if (err) { | 303 | if (err) { |
| 309 | btrfs_free_fs_root(root); | 304 | btrfs_free_fs_root(root); |
| @@ -318,6 +313,9 @@ int btrfs_find_orphan_roots(struct btrfs_root *tree_root) | |||
| 318 | btrfs_free_fs_root(root); | 313 | btrfs_free_fs_root(root); |
| 319 | break; | 314 | break; |
| 320 | } | 315 | } |
| 316 | |||
| 317 | if (btrfs_root_refs(&root->root_item) == 0) | ||
| 318 | btrfs_add_dead_root(root); | ||
| 321 | } | 319 | } |
| 322 | 320 | ||
| 323 | btrfs_free_path(path); | 321 | btrfs_free_path(path); |
diff --git a/fs/buffer.c b/fs/buffer.c index 4d7433534f5c..6024877335ca 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -1005,9 +1005,19 @@ grow_dev_page(struct block_device *bdev, sector_t block, | |||
| 1005 | struct buffer_head *bh; | 1005 | struct buffer_head *bh; |
| 1006 | sector_t end_block; | 1006 | sector_t end_block; |
| 1007 | int ret = 0; /* Will call free_more_memory() */ | 1007 | int ret = 0; /* Will call free_more_memory() */ |
| 1008 | gfp_t gfp_mask; | ||
| 1008 | 1009 | ||
| 1009 | page = find_or_create_page(inode->i_mapping, index, | 1010 | gfp_mask = mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS; |
| 1010 | (mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS)|__GFP_MOVABLE); | 1011 | gfp_mask |= __GFP_MOVABLE; |
| 1012 | /* | ||
| 1013 | * XXX: __getblk_slow() can not really deal with failure and | ||
| 1014 | * will endlessly loop on improvised global reclaim. Prefer | ||
| 1015 | * looping in the allocator rather than here, at least that | ||
| 1016 | * code knows what it's doing. | ||
| 1017 | */ | ||
| 1018 | gfp_mask |= __GFP_NOFAIL; | ||
| 1019 | |||
| 1020 | page = find_or_create_page(inode->i_mapping, index, gfp_mask); | ||
| 1011 | if (!page) | 1021 | if (!page) |
| 1012 | return ret; | 1022 | return ret; |
| 1013 | 1023 | ||
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index a16b4e58bcc6..77fc5e181077 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -120,14 +120,16 @@ cifs_read_super(struct super_block *sb) | |||
| 120 | { | 120 | { |
| 121 | struct inode *inode; | 121 | struct inode *inode; |
| 122 | struct cifs_sb_info *cifs_sb; | 122 | struct cifs_sb_info *cifs_sb; |
| 123 | struct cifs_tcon *tcon; | ||
| 123 | int rc = 0; | 124 | int rc = 0; |
| 124 | 125 | ||
| 125 | cifs_sb = CIFS_SB(sb); | 126 | cifs_sb = CIFS_SB(sb); |
| 127 | tcon = cifs_sb_master_tcon(cifs_sb); | ||
| 126 | 128 | ||
| 127 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIXACL) | 129 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIXACL) |
| 128 | sb->s_flags |= MS_POSIXACL; | 130 | sb->s_flags |= MS_POSIXACL; |
| 129 | 131 | ||
| 130 | if (cifs_sb_master_tcon(cifs_sb)->ses->capabilities & CAP_LARGE_FILES) | 132 | if (tcon->ses->capabilities & tcon->ses->server->vals->cap_large_files) |
| 131 | sb->s_maxbytes = MAX_LFS_FILESIZE; | 133 | sb->s_maxbytes = MAX_LFS_FILESIZE; |
| 132 | else | 134 | else |
| 133 | sb->s_maxbytes = MAX_NON_LFS; | 135 | sb->s_maxbytes = MAX_NON_LFS; |
| @@ -147,7 +149,7 @@ cifs_read_super(struct super_block *sb) | |||
| 147 | goto out_no_root; | 149 | goto out_no_root; |
| 148 | } | 150 | } |
| 149 | 151 | ||
| 150 | if (cifs_sb_master_tcon(cifs_sb)->nocase) | 152 | if (tcon->nocase) |
| 151 | sb->s_d_op = &cifs_ci_dentry_ops; | 153 | sb->s_d_op = &cifs_ci_dentry_ops; |
| 152 | else | 154 | else |
| 153 | sb->s_d_op = &cifs_dentry_ops; | 155 | sb->s_d_op = &cifs_dentry_ops; |
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index a630475e421c..08f9dfb1a894 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h | |||
| @@ -1491,15 +1491,30 @@ struct file_notify_information { | |||
| 1491 | __u8 FileName[0]; | 1491 | __u8 FileName[0]; |
| 1492 | } __attribute__((packed)); | 1492 | } __attribute__((packed)); |
| 1493 | 1493 | ||
| 1494 | struct reparse_data { | 1494 | /* For IO_REPARSE_TAG_SYMLINK */ |
| 1495 | __u32 ReparseTag; | 1495 | struct reparse_symlink_data { |
| 1496 | __u16 ReparseDataLength; | 1496 | __le32 ReparseTag; |
| 1497 | __le16 ReparseDataLength; | ||
| 1497 | __u16 Reserved; | 1498 | __u16 Reserved; |
| 1498 | __u16 SubstituteNameOffset; | 1499 | __le16 SubstituteNameOffset; |
| 1499 | __u16 SubstituteNameLength; | 1500 | __le16 SubstituteNameLength; |
| 1500 | __u16 PrintNameOffset; | 1501 | __le16 PrintNameOffset; |
| 1501 | __u16 PrintNameLength; | 1502 | __le16 PrintNameLength; |
| 1502 | __u32 Flags; | 1503 | __le32 Flags; |
| 1504 | char PathBuffer[0]; | ||
| 1505 | } __attribute__((packed)); | ||
| 1506 | |||
| 1507 | /* For IO_REPARSE_TAG_NFS */ | ||
| 1508 | #define NFS_SPECFILE_LNK 0x00000000014B4E4C | ||
| 1509 | #define NFS_SPECFILE_CHR 0x0000000000524843 | ||
| 1510 | #define NFS_SPECFILE_BLK 0x00000000004B4C42 | ||
| 1511 | #define NFS_SPECFILE_FIFO 0x000000004F464946 | ||
| 1512 | #define NFS_SPECFILE_SOCK 0x000000004B434F53 | ||
| 1513 | struct reparse_posix_data { | ||
| 1514 | __le32 ReparseTag; | ||
| 1515 | __le16 ReparseDataLength; | ||
| 1516 | __u16 Reserved; | ||
| 1517 | __le64 InodeType; /* LNK, FIFO, CHR etc. */ | ||
| 1503 | char PathBuffer[0]; | 1518 | char PathBuffer[0]; |
| 1504 | } __attribute__((packed)); | 1519 | } __attribute__((packed)); |
| 1505 | 1520 | ||
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 4baf35949b51..ccd31ab815d4 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
| @@ -3088,7 +3088,8 @@ CIFSSMBQuerySymLink(const unsigned int xid, struct cifs_tcon *tcon, | |||
| 3088 | bool is_unicode; | 3088 | bool is_unicode; |
| 3089 | unsigned int sub_len; | 3089 | unsigned int sub_len; |
| 3090 | char *sub_start; | 3090 | char *sub_start; |
| 3091 | struct reparse_data *reparse_buf; | 3091 | struct reparse_symlink_data *reparse_buf; |
| 3092 | struct reparse_posix_data *posix_buf; | ||
| 3092 | __u32 data_offset, data_count; | 3093 | __u32 data_offset, data_count; |
| 3093 | char *end_of_smb; | 3094 | char *end_of_smb; |
| 3094 | 3095 | ||
| @@ -3137,20 +3138,47 @@ CIFSSMBQuerySymLink(const unsigned int xid, struct cifs_tcon *tcon, | |||
| 3137 | goto qreparse_out; | 3138 | goto qreparse_out; |
| 3138 | } | 3139 | } |
| 3139 | end_of_smb = 2 + get_bcc(&pSMBr->hdr) + (char *)&pSMBr->ByteCount; | 3140 | end_of_smb = 2 + get_bcc(&pSMBr->hdr) + (char *)&pSMBr->ByteCount; |
| 3140 | reparse_buf = (struct reparse_data *) | 3141 | reparse_buf = (struct reparse_symlink_data *) |
| 3141 | ((char *)&pSMBr->hdr.Protocol + data_offset); | 3142 | ((char *)&pSMBr->hdr.Protocol + data_offset); |
| 3142 | if ((char *)reparse_buf >= end_of_smb) { | 3143 | if ((char *)reparse_buf >= end_of_smb) { |
| 3143 | rc = -EIO; | 3144 | rc = -EIO; |
| 3144 | goto qreparse_out; | 3145 | goto qreparse_out; |
| 3145 | } | 3146 | } |
| 3146 | if ((reparse_buf->PathBuffer + reparse_buf->PrintNameOffset + | 3147 | if (reparse_buf->ReparseTag == cpu_to_le32(IO_REPARSE_TAG_NFS)) { |
| 3147 | reparse_buf->PrintNameLength) > end_of_smb) { | 3148 | cifs_dbg(FYI, "NFS style reparse tag\n"); |
| 3149 | posix_buf = (struct reparse_posix_data *)reparse_buf; | ||
| 3150 | |||
| 3151 | if (posix_buf->InodeType != cpu_to_le64(NFS_SPECFILE_LNK)) { | ||
| 3152 | cifs_dbg(FYI, "unsupported file type 0x%llx\n", | ||
| 3153 | le64_to_cpu(posix_buf->InodeType)); | ||
| 3154 | rc = -EOPNOTSUPP; | ||
| 3155 | goto qreparse_out; | ||
| 3156 | } | ||
| 3157 | is_unicode = true; | ||
| 3158 | sub_len = le16_to_cpu(reparse_buf->ReparseDataLength); | ||
| 3159 | if (posix_buf->PathBuffer + sub_len > end_of_smb) { | ||
| 3160 | cifs_dbg(FYI, "reparse buf beyond SMB\n"); | ||
| 3161 | rc = -EIO; | ||
| 3162 | goto qreparse_out; | ||
| 3163 | } | ||
| 3164 | *symlinkinfo = cifs_strndup_from_utf16(posix_buf->PathBuffer, | ||
| 3165 | sub_len, is_unicode, nls_codepage); | ||
| 3166 | goto qreparse_out; | ||
| 3167 | } else if (reparse_buf->ReparseTag != | ||
| 3168 | cpu_to_le32(IO_REPARSE_TAG_SYMLINK)) { | ||
| 3169 | rc = -EOPNOTSUPP; | ||
| 3170 | goto qreparse_out; | ||
| 3171 | } | ||
| 3172 | |||
| 3173 | /* Reparse tag is NTFS symlink */ | ||
| 3174 | sub_start = le16_to_cpu(reparse_buf->SubstituteNameOffset) + | ||
| 3175 | reparse_buf->PathBuffer; | ||
| 3176 | sub_len = le16_to_cpu(reparse_buf->SubstituteNameLength); | ||
| 3177 | if (sub_start + sub_len > end_of_smb) { | ||
| 3148 | cifs_dbg(FYI, "reparse buf beyond SMB\n"); | 3178 | cifs_dbg(FYI, "reparse buf beyond SMB\n"); |
| 3149 | rc = -EIO; | 3179 | rc = -EIO; |
| 3150 | goto qreparse_out; | 3180 | goto qreparse_out; |
| 3151 | } | 3181 | } |
| 3152 | sub_start = reparse_buf->SubstituteNameOffset + reparse_buf->PathBuffer; | ||
| 3153 | sub_len = reparse_buf->SubstituteNameLength; | ||
| 3154 | if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) | 3182 | if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) |
| 3155 | is_unicode = true; | 3183 | is_unicode = true; |
| 3156 | else | 3184 | else |
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c index af847e1cf1c1..651a5279607b 100644 --- a/fs/cifs/netmisc.c +++ b/fs/cifs/netmisc.c | |||
| @@ -780,7 +780,9 @@ static const struct { | |||
| 780 | ERRDOS, ERRnoaccess, 0xc0000290}, { | 780 | ERRDOS, ERRnoaccess, 0xc0000290}, { |
| 781 | ERRDOS, ERRbadfunc, 0xc000029c}, { | 781 | ERRDOS, ERRbadfunc, 0xc000029c}, { |
| 782 | ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, { | 782 | ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, { |
| 783 | ERRDOS, ERRinvlevel, 0x007c0001}, }; | 783 | ERRDOS, ERRinvlevel, 0x007c0001}, { |
| 784 | 0, 0, 0 } | ||
| 785 | }; | ||
| 784 | 786 | ||
| 785 | /***************************************************************************** | 787 | /***************************************************************************** |
| 786 | Print an error message from the status code | 788 | Print an error message from the status code |
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 352358de1d7e..e87387dbf39f 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c | |||
| @@ -500,9 +500,9 @@ select_sectype(struct TCP_Server_Info *server, enum securityEnum requested) | |||
| 500 | return NTLMv2; | 500 | return NTLMv2; |
| 501 | if (global_secflags & CIFSSEC_MAY_NTLM) | 501 | if (global_secflags & CIFSSEC_MAY_NTLM) |
| 502 | return NTLM; | 502 | return NTLM; |
| 503 | /* Fallthrough */ | ||
| 504 | default: | 503 | default: |
| 505 | return Unspecified; | 504 | /* Fallthrough to attempt LANMAN authentication next */ |
| 505 | break; | ||
| 506 | } | 506 | } |
| 507 | case CIFS_NEGFLAVOR_LANMAN: | 507 | case CIFS_NEGFLAVOR_LANMAN: |
| 508 | switch (requested) { | 508 | switch (requested) { |
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index eba0efde66d7..edccb5252462 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c | |||
| @@ -687,6 +687,10 @@ SMB2_logoff(const unsigned int xid, struct cifs_ses *ses) | |||
| 687 | else | 687 | else |
| 688 | return -EIO; | 688 | return -EIO; |
| 689 | 689 | ||
| 690 | /* no need to send SMB logoff if uid already closed due to reconnect */ | ||
| 691 | if (ses->need_reconnect) | ||
| 692 | goto smb2_session_already_dead; | ||
| 693 | |||
| 690 | rc = small_smb2_init(SMB2_LOGOFF, NULL, (void **) &req); | 694 | rc = small_smb2_init(SMB2_LOGOFF, NULL, (void **) &req); |
| 691 | if (rc) | 695 | if (rc) |
| 692 | return rc; | 696 | return rc; |
| @@ -701,6 +705,8 @@ SMB2_logoff(const unsigned int xid, struct cifs_ses *ses) | |||
| 701 | * No tcon so can't do | 705 | * No tcon so can't do |
| 702 | * cifs_stats_inc(&tcon->stats.smb2_stats.smb2_com_fail[SMB2...]); | 706 | * cifs_stats_inc(&tcon->stats.smb2_stats.smb2_com_fail[SMB2...]); |
| 703 | */ | 707 | */ |
| 708 | |||
| 709 | smb2_session_already_dead: | ||
| 704 | return rc; | 710 | return rc; |
| 705 | } | 711 | } |
| 706 | 712 | ||
diff --git a/fs/cifs/smbfsctl.h b/fs/cifs/smbfsctl.h index d952ee48f4dc..a4b2391fe66e 100644 --- a/fs/cifs/smbfsctl.h +++ b/fs/cifs/smbfsctl.h | |||
| @@ -97,9 +97,23 @@ | |||
| 97 | #define FSCTL_QUERY_NETWORK_INTERFACE_INFO 0x001401FC /* BB add struct */ | 97 | #define FSCTL_QUERY_NETWORK_INTERFACE_INFO 0x001401FC /* BB add struct */ |
| 98 | #define FSCTL_SRV_READ_HASH 0x001441BB /* BB add struct */ | 98 | #define FSCTL_SRV_READ_HASH 0x001441BB /* BB add struct */ |
| 99 | 99 | ||
| 100 | /* See FSCC 2.1.2.5 */ | ||
| 100 | #define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003 | 101 | #define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003 |
| 101 | #define IO_REPARSE_TAG_HSM 0xC0000004 | 102 | #define IO_REPARSE_TAG_HSM 0xC0000004 |
| 102 | #define IO_REPARSE_TAG_SIS 0x80000007 | 103 | #define IO_REPARSE_TAG_SIS 0x80000007 |
| 104 | #define IO_REPARSE_TAG_HSM2 0x80000006 | ||
| 105 | #define IO_REPARSE_TAG_DRIVER_EXTENDER 0x80000005 | ||
| 106 | /* Used by the DFS filter. See MS-DFSC */ | ||
| 107 | #define IO_REPARSE_TAG_DFS 0x8000000A | ||
| 108 | /* Used by the DFS filter See MS-DFSC */ | ||
| 109 | #define IO_REPARSE_TAG_DFSR 0x80000012 | ||
| 110 | #define IO_REPARSE_TAG_FILTER_MANAGER 0x8000000B | ||
| 111 | /* See section MS-FSCC 2.1.2.4 */ | ||
| 112 | #define IO_REPARSE_TAG_SYMLINK 0xA000000C | ||
| 113 | #define IO_REPARSE_TAG_DEDUP 0x80000013 | ||
| 114 | #define IO_REPARSE_APPXSTREAM 0xC0000014 | ||
| 115 | /* NFS symlinks, Win 8/SMB3 and later */ | ||
| 116 | #define IO_REPARSE_TAG_NFS 0x80000014 | ||
| 103 | 117 | ||
| 104 | /* fsctl flags */ | 118 | /* fsctl flags */ |
| 105 | /* If Flags is set to this value, the request is an FSCTL not ioctl request */ | 119 | /* If Flags is set to this value, the request is an FSCTL not ioctl request */ |
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 6fdcb1b4a106..800b938e4061 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c | |||
| @@ -410,8 +410,13 @@ static int | |||
| 410 | wait_for_free_request(struct TCP_Server_Info *server, const int timeout, | 410 | wait_for_free_request(struct TCP_Server_Info *server, const int timeout, |
| 411 | const int optype) | 411 | const int optype) |
| 412 | { | 412 | { |
| 413 | return wait_for_free_credits(server, timeout, | 413 | int *val; |
| 414 | server->ops->get_credits_field(server, optype)); | 414 | |
| 415 | val = server->ops->get_credits_field(server, optype); | ||
| 416 | /* Since an echo is already inflight, no need to wait to send another */ | ||
| 417 | if (*val <= 0 && optype == CIFS_ECHO_OP) | ||
| 418 | return -EAGAIN; | ||
| 419 | return wait_for_free_credits(server, timeout, val); | ||
| 415 | } | 420 | } |
| 416 | 421 | ||
| 417 | static int allocate_mid(struct cifs_ses *ses, struct smb_hdr *in_buf, | 422 | static int allocate_mid(struct cifs_ses *ses, struct smb_hdr *in_buf, |
diff --git a/fs/dcache.c b/fs/dcache.c index 41000305d716..20532cb0b06e 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
| @@ -1331,14 +1331,6 @@ rename_retry: | |||
| 1331 | * list is non-empty and continue searching. | 1331 | * list is non-empty and continue searching. |
| 1332 | */ | 1332 | */ |
| 1333 | 1333 | ||
| 1334 | /** | ||
| 1335 | * have_submounts - check for mounts over a dentry | ||
| 1336 | * @parent: dentry to check. | ||
| 1337 | * | ||
| 1338 | * Return true if the parent or its subdirectories contain | ||
| 1339 | * a mount point | ||
| 1340 | */ | ||
| 1341 | |||
| 1342 | static enum d_walk_ret check_mount(void *data, struct dentry *dentry) | 1334 | static enum d_walk_ret check_mount(void *data, struct dentry *dentry) |
| 1343 | { | 1335 | { |
| 1344 | int *ret = data; | 1336 | int *ret = data; |
| @@ -1349,6 +1341,13 @@ static enum d_walk_ret check_mount(void *data, struct dentry *dentry) | |||
| 1349 | return D_WALK_CONTINUE; | 1341 | return D_WALK_CONTINUE; |
| 1350 | } | 1342 | } |
| 1351 | 1343 | ||
| 1344 | /** | ||
| 1345 | * have_submounts - check for mounts over a dentry | ||
| 1346 | * @parent: dentry to check. | ||
| 1347 | * | ||
| 1348 | * Return true if the parent or its subdirectories contain | ||
| 1349 | * a mount point | ||
| 1350 | */ | ||
| 1352 | int have_submounts(struct dentry *parent) | 1351 | int have_submounts(struct dentry *parent) |
| 1353 | { | 1352 | { |
| 1354 | int ret = 0; | 1353 | int ret = 0; |
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index c88e355f7635..000eae2782b6 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c | |||
| @@ -408,7 +408,7 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat, | |||
| 408 | struct page *page) | 408 | struct page *page) |
| 409 | { | 409 | { |
| 410 | return ecryptfs_lower_header_size(crypt_stat) + | 410 | return ecryptfs_lower_header_size(crypt_stat) + |
| 411 | (page->index << PAGE_CACHE_SHIFT); | 411 | ((loff_t)page->index << PAGE_CACHE_SHIFT); |
| 412 | } | 412 | } |
| 413 | 413 | ||
| 414 | /** | 414 | /** |
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c index 7d52806c2119..4725a07f003c 100644 --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c | |||
| @@ -1149,7 +1149,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, | |||
| 1149 | struct ecryptfs_msg_ctx *msg_ctx; | 1149 | struct ecryptfs_msg_ctx *msg_ctx; |
| 1150 | struct ecryptfs_message *msg = NULL; | 1150 | struct ecryptfs_message *msg = NULL; |
| 1151 | char *auth_tok_sig; | 1151 | char *auth_tok_sig; |
| 1152 | char *payload; | 1152 | char *payload = NULL; |
| 1153 | size_t payload_len = 0; | 1153 | size_t payload_len = 0; |
| 1154 | int rc; | 1154 | int rc; |
| 1155 | 1155 | ||
| @@ -1203,6 +1203,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, | |||
| 1203 | } | 1203 | } |
| 1204 | out: | 1204 | out: |
| 1205 | kfree(msg); | 1205 | kfree(msg); |
| 1206 | kfree(payload); | ||
| 1206 | return rc; | 1207 | return rc; |
| 1207 | } | 1208 | } |
| 1208 | 1209 | ||
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index 1194b1f0f839..f8cde46de9cd 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c | |||
| @@ -1783,7 +1783,7 @@ retry: | |||
| 1783 | d_tmpfile(dentry, inode); | 1783 | d_tmpfile(dentry, inode); |
| 1784 | err = ext3_orphan_add(handle, inode); | 1784 | err = ext3_orphan_add(handle, inode); |
| 1785 | if (err) | 1785 | if (err) |
| 1786 | goto err_drop_inode; | 1786 | goto err_unlock_inode; |
| 1787 | mark_inode_dirty(inode); | 1787 | mark_inode_dirty(inode); |
| 1788 | unlock_new_inode(inode); | 1788 | unlock_new_inode(inode); |
| 1789 | } | 1789 | } |
| @@ -1791,10 +1791,9 @@ retry: | |||
| 1791 | if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries)) | 1791 | if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries)) |
| 1792 | goto retry; | 1792 | goto retry; |
| 1793 | return err; | 1793 | return err; |
| 1794 | err_drop_inode: | 1794 | err_unlock_inode: |
| 1795 | ext3_journal_stop(handle); | 1795 | ext3_journal_stop(handle); |
| 1796 | unlock_new_inode(inode); | 1796 | unlock_new_inode(inode); |
| 1797 | iput(inode); | ||
| 1798 | return err; | 1797 | return err; |
| 1799 | } | 1798 | } |
| 1800 | 1799 | ||
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 0d424d7ac02b..e274e9c1171f 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -2563,7 +2563,7 @@ retry: | |||
| 2563 | break; | 2563 | break; |
| 2564 | } | 2564 | } |
| 2565 | blk_finish_plug(&plug); | 2565 | blk_finish_plug(&plug); |
| 2566 | if (!ret && !cycled) { | 2566 | if (!ret && !cycled && wbc->nr_to_write > 0) { |
| 2567 | cycled = 1; | 2567 | cycled = 1; |
| 2568 | mpd.last_page = writeback_index - 1; | 2568 | mpd.last_page = writeback_index - 1; |
| 2569 | mpd.first_page = 0; | 2569 | mpd.first_page = 0; |
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 1bec5a5c1e45..5a0408d7b114 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c | |||
| @@ -2319,7 +2319,7 @@ retry: | |||
| 2319 | d_tmpfile(dentry, inode); | 2319 | d_tmpfile(dentry, inode); |
| 2320 | err = ext4_orphan_add(handle, inode); | 2320 | err = ext4_orphan_add(handle, inode); |
| 2321 | if (err) | 2321 | if (err) |
| 2322 | goto err_drop_inode; | 2322 | goto err_unlock_inode; |
| 2323 | mark_inode_dirty(inode); | 2323 | mark_inode_dirty(inode); |
| 2324 | unlock_new_inode(inode); | 2324 | unlock_new_inode(inode); |
| 2325 | } | 2325 | } |
| @@ -2328,10 +2328,9 @@ retry: | |||
| 2328 | if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries)) | 2328 | if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries)) |
| 2329 | goto retry; | 2329 | goto retry; |
| 2330 | return err; | 2330 | return err; |
| 2331 | err_drop_inode: | 2331 | err_unlock_inode: |
| 2332 | ext4_journal_stop(handle); | 2332 | ext4_journal_stop(handle); |
| 2333 | unlock_new_inode(inode); | 2333 | unlock_new_inode(inode); |
| 2334 | iput(inode); | ||
| 2335 | return err; | 2334 | return err; |
| 2336 | } | 2335 | } |
| 2337 | 2336 | ||
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index c081e34f717f..03e9bebba198 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c | |||
| @@ -1350,6 +1350,8 @@ retry: | |||
| 1350 | s_min_extra_isize) { | 1350 | s_min_extra_isize) { |
| 1351 | tried_min_extra_isize++; | 1351 | tried_min_extra_isize++; |
| 1352 | new_extra_isize = s_min_extra_isize; | 1352 | new_extra_isize = s_min_extra_isize; |
| 1353 | kfree(is); is = NULL; | ||
| 1354 | kfree(bs); bs = NULL; | ||
| 1353 | goto retry; | 1355 | goto retry; |
| 1354 | } | 1356 | } |
| 1355 | error = -1; | 1357 | error = -1; |
diff --git a/fs/file_table.c b/fs/file_table.c index abdd15ad13c9..e900ca518635 100644 --- a/fs/file_table.c +++ b/fs/file_table.c | |||
| @@ -297,7 +297,7 @@ void flush_delayed_fput(void) | |||
| 297 | delayed_fput(NULL); | 297 | delayed_fput(NULL); |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | static DECLARE_WORK(delayed_fput_work, delayed_fput); | 300 | static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput); |
| 301 | 301 | ||
| 302 | void fput(struct file *file) | 302 | void fput(struct file *file) |
| 303 | { | 303 | { |
| @@ -317,7 +317,7 @@ void fput(struct file *file) | |||
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | if (llist_add(&file->f_u.fu_llist, &delayed_fput_list)) | 319 | if (llist_add(&file->f_u.fu_llist, &delayed_fput_list)) |
| 320 | schedule_work(&delayed_fput_work); | 320 | schedule_delayed_work(&delayed_fput_work, 1); |
| 321 | } | 321 | } |
| 322 | } | 322 | } |
| 323 | 323 | ||
diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c index c1a3e603279c..7f464c513ba0 100644 --- a/fs/jfs/jfs_inode.c +++ b/fs/jfs/jfs_inode.c | |||
| @@ -95,7 +95,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode) | |||
| 95 | 95 | ||
| 96 | if (insert_inode_locked(inode) < 0) { | 96 | if (insert_inode_locked(inode) < 0) { |
| 97 | rc = -EINVAL; | 97 | rc = -EINVAL; |
| 98 | goto fail_unlock; | 98 | goto fail_put; |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | inode_init_owner(inode, parent, mode); | 101 | inode_init_owner(inode, parent, mode); |
| @@ -156,7 +156,6 @@ struct inode *ialloc(struct inode *parent, umode_t mode) | |||
| 156 | fail_drop: | 156 | fail_drop: |
| 157 | dquot_drop(inode); | 157 | dquot_drop(inode); |
| 158 | inode->i_flags |= S_NOQUOTA; | 158 | inode->i_flags |= S_NOQUOTA; |
| 159 | fail_unlock: | ||
| 160 | clear_nlink(inode); | 159 | clear_nlink(inode); |
| 161 | unlock_new_inode(inode); | 160 | unlock_new_inode(inode); |
| 162 | fail_put: | 161 | fail_put: |
diff --git a/fs/namei.c b/fs/namei.c index 645268f23eb6..caa28051e197 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
| @@ -2294,10 +2294,11 @@ out: | |||
| 2294 | * path_mountpoint - look up a path to be umounted | 2294 | * path_mountpoint - look up a path to be umounted |
| 2295 | * @dfd: directory file descriptor to start walk from | 2295 | * @dfd: directory file descriptor to start walk from |
| 2296 | * @name: full pathname to walk | 2296 | * @name: full pathname to walk |
| 2297 | * @path: pointer to container for result | ||
| 2297 | * @flags: lookup flags | 2298 | * @flags: lookup flags |
| 2298 | * | 2299 | * |
| 2299 | * Look up the given name, but don't attempt to revalidate the last component. | 2300 | * Look up the given name, but don't attempt to revalidate the last component. |
| 2300 | * Returns 0 and "path" will be valid on success; Retuns error otherwise. | 2301 | * Returns 0 and "path" will be valid on success; Returns error otherwise. |
| 2301 | */ | 2302 | */ |
| 2302 | static int | 2303 | static int |
| 2303 | path_mountpoint(int dfd, const char *name, struct path *path, unsigned int flags) | 2304 | path_mountpoint(int dfd, const char *name, struct path *path, unsigned int flags) |
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 9f8ef9b7674d..8eaa1ba793fc 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c | |||
| @@ -288,10 +288,14 @@ static int proc_reg_mmap(struct file *file, struct vm_area_struct *vma) | |||
| 288 | static unsigned long proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, unsigned long len, unsigned long pgoff, unsigned long flags) | 288 | static unsigned long proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, unsigned long len, unsigned long pgoff, unsigned long flags) |
| 289 | { | 289 | { |
| 290 | struct proc_dir_entry *pde = PDE(file_inode(file)); | 290 | struct proc_dir_entry *pde = PDE(file_inode(file)); |
| 291 | int rv = -EIO; | 291 | unsigned long rv = -EIO; |
| 292 | unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); | 292 | unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) = NULL; |
| 293 | if (use_pde(pde)) { | 293 | if (use_pde(pde)) { |
| 294 | get_unmapped_area = pde->proc_fops->get_unmapped_area; | 294 | #ifdef CONFIG_MMU |
| 295 | get_unmapped_area = current->mm->get_unmapped_area; | ||
| 296 | #endif | ||
| 297 | if (pde->proc_fops->get_unmapped_area) | ||
| 298 | get_unmapped_area = pde->proc_fops->get_unmapped_area; | ||
| 295 | if (get_unmapped_area) | 299 | if (get_unmapped_area) |
| 296 | rv = get_unmapped_area(file, orig_addr, len, pgoff, flags); | 300 | rv = get_unmapped_area(file, orig_addr, len, pgoff, flags); |
| 297 | unuse_pde(pde); | 301 | unuse_pde(pde); |
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 7366e9d63cee..390bdab01c3c 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
| @@ -941,6 +941,8 @@ static void pte_to_pagemap_entry(pagemap_entry_t *pme, struct pagemapread *pm, | |||
| 941 | frame = pte_pfn(pte); | 941 | frame = pte_pfn(pte); |
| 942 | flags = PM_PRESENT; | 942 | flags = PM_PRESENT; |
| 943 | page = vm_normal_page(vma, addr, pte); | 943 | page = vm_normal_page(vma, addr, pte); |
| 944 | if (pte_soft_dirty(pte)) | ||
| 945 | flags2 |= __PM_SOFT_DIRTY; | ||
| 944 | } else if (is_swap_pte(pte)) { | 946 | } else if (is_swap_pte(pte)) { |
| 945 | swp_entry_t entry; | 947 | swp_entry_t entry; |
| 946 | if (pte_swp_soft_dirty(pte)) | 948 | if (pte_swp_soft_dirty(pte)) |
| @@ -960,7 +962,7 @@ static void pte_to_pagemap_entry(pagemap_entry_t *pme, struct pagemapread *pm, | |||
| 960 | 962 | ||
| 961 | if (page && !PageAnon(page)) | 963 | if (page && !PageAnon(page)) |
| 962 | flags |= PM_FILE; | 964 | flags |= PM_FILE; |
| 963 | if ((vma->vm_flags & VM_SOFTDIRTY) || pte_soft_dirty(pte)) | 965 | if ((vma->vm_flags & VM_SOFTDIRTY)) |
| 964 | flags2 |= __PM_SOFT_DIRTY; | 966 | flags2 |= __PM_SOFT_DIRTY; |
| 965 | 967 | ||
| 966 | *pme = make_pme(PM_PFRAME(frame) | PM_STATUS2(pm->v2, flags2) | flags); | 968 | *pme = make_pme(PM_PFRAME(frame) | PM_STATUS2(pm->v2, flags2) | flags); |
diff --git a/fs/seq_file.c b/fs/seq_file.c index 3135c2525c76..a290157265ef 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c | |||
| @@ -328,6 +328,8 @@ loff_t seq_lseek(struct file *file, loff_t offset, int whence) | |||
| 328 | m->read_pos = offset; | 328 | m->read_pos = offset; |
| 329 | retval = file->f_pos = offset; | 329 | retval = file->f_pos = offset; |
| 330 | } | 330 | } |
| 331 | } else { | ||
| 332 | file->f_pos = offset; | ||
| 331 | } | 333 | } |
| 332 | } | 334 | } |
| 333 | file->f_version = m->version; | 335 | file->f_version = m->version; |
diff --git a/fs/statfs.c b/fs/statfs.c index c219e733f553..083dc0ac9140 100644 --- a/fs/statfs.c +++ b/fs/statfs.c | |||
| @@ -94,7 +94,7 @@ retry: | |||
| 94 | 94 | ||
| 95 | int fd_statfs(int fd, struct kstatfs *st) | 95 | int fd_statfs(int fd, struct kstatfs *st) |
| 96 | { | 96 | { |
| 97 | struct fd f = fdget(fd); | 97 | struct fd f = fdget_raw(fd); |
| 98 | int error = -EBADF; | 98 | int error = -EBADF; |
| 99 | if (f.file) { | 99 | if (f.file) { |
| 100 | error = vfs_statfs(&f.file->f_path, st); | 100 | error = vfs_statfs(&f.file->f_path, st); |
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h index cf051e05a8fe..4e280bd226dd 100644 --- a/include/acpi/acexcep.h +++ b/include/acpi/acexcep.h | |||
| @@ -125,8 +125,9 @@ struct acpi_exception_info { | |||
| 125 | #define AE_NO_HANDLER EXCEP_ENV (0x001A) | 125 | #define AE_NO_HANDLER EXCEP_ENV (0x001A) |
| 126 | #define AE_OWNER_ID_LIMIT EXCEP_ENV (0x001B) | 126 | #define AE_OWNER_ID_LIMIT EXCEP_ENV (0x001B) |
| 127 | #define AE_NOT_CONFIGURED EXCEP_ENV (0x001C) | 127 | #define AE_NOT_CONFIGURED EXCEP_ENV (0x001C) |
| 128 | #define AE_ACCESS EXCEP_ENV (0x001D) | ||
| 128 | 129 | ||
| 129 | #define AE_CODE_ENV_MAX 0x001C | 130 | #define AE_CODE_ENV_MAX 0x001D |
| 130 | 131 | ||
| 131 | /* | 132 | /* |
| 132 | * Programmer exceptions | 133 | * Programmer exceptions |
| @@ -227,7 +228,7 @@ static const struct acpi_exception_info acpi_gbl_exception_names_env[] = { | |||
| 227 | EXCEP_TXT("AE_NO_ACPI_TABLES", "ACPI tables could not be found"), | 228 | EXCEP_TXT("AE_NO_ACPI_TABLES", "ACPI tables could not be found"), |
| 228 | EXCEP_TXT("AE_NO_NAMESPACE", "A namespace has not been loaded"), | 229 | EXCEP_TXT("AE_NO_NAMESPACE", "A namespace has not been loaded"), |
| 229 | EXCEP_TXT("AE_NO_MEMORY", "Insufficient dynamic memory"), | 230 | EXCEP_TXT("AE_NO_MEMORY", "Insufficient dynamic memory"), |
| 230 | EXCEP_TXT("AE_NOT_FOUND", "The name was not found in the namespace"), | 231 | EXCEP_TXT("AE_NOT_FOUND", "A requested entity is not found"), |
| 231 | EXCEP_TXT("AE_NOT_EXIST", "A required entity does not exist"), | 232 | EXCEP_TXT("AE_NOT_EXIST", "A required entity does not exist"), |
| 232 | EXCEP_TXT("AE_ALREADY_EXISTS", "An entity already exists"), | 233 | EXCEP_TXT("AE_ALREADY_EXISTS", "An entity already exists"), |
| 233 | EXCEP_TXT("AE_TYPE", "The object type is incorrect"), | 234 | EXCEP_TXT("AE_TYPE", "The object type is incorrect"), |
| @@ -259,7 +260,8 @@ static const struct acpi_exception_info acpi_gbl_exception_names_env[] = { | |||
| 259 | EXCEP_TXT("AE_OWNER_ID_LIMIT", | 260 | EXCEP_TXT("AE_OWNER_ID_LIMIT", |
| 260 | "There are no more Owner IDs available for ACPI tables or control methods"), | 261 | "There are no more Owner IDs available for ACPI tables or control methods"), |
| 261 | EXCEP_TXT("AE_NOT_CONFIGURED", | 262 | EXCEP_TXT("AE_NOT_CONFIGURED", |
| 262 | "The interface is not part of the current subsystem configuration") | 263 | "The interface is not part of the current subsystem configuration"), |
| 264 | EXCEP_TXT("AE_ACCESS", "Permission denied for the requested operation") | ||
| 263 | }; | 265 | }; |
| 264 | 266 | ||
| 265 | static const struct acpi_exception_info acpi_gbl_exception_names_pgm[] = { | 267 | static const struct acpi_exception_info acpi_gbl_exception_names_pgm[] = { |
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 02e113bb8b7d..15100f625e65 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
| @@ -222,7 +222,8 @@ struct acpi_device_power_flags { | |||
| 222 | u32 power_resources:1; /* Power resources */ | 222 | u32 power_resources:1; /* Power resources */ |
| 223 | u32 inrush_current:1; /* Serialize Dx->D0 */ | 223 | u32 inrush_current:1; /* Serialize Dx->D0 */ |
| 224 | u32 power_removed:1; /* Optimize Dx->D0 */ | 224 | u32 power_removed:1; /* Optimize Dx->D0 */ |
| 225 | u32 reserved:28; | 225 | u32 ignore_parent:1; /* Power is independent of parent power state */ |
| 226 | u32 reserved:27; | ||
| 226 | }; | 227 | }; |
| 227 | 228 | ||
| 228 | struct acpi_device_power_state { | 229 | struct acpi_device_power_state { |
| @@ -311,7 +312,6 @@ struct acpi_device { | |||
| 311 | unsigned int physical_node_count; | 312 | unsigned int physical_node_count; |
| 312 | struct list_head physical_node_list; | 313 | struct list_head physical_node_list; |
| 313 | struct mutex physical_node_lock; | 314 | struct mutex physical_node_lock; |
| 314 | struct list_head power_dependent; | ||
| 315 | void (*remove)(struct acpi_device *); | 315 | void (*remove)(struct acpi_device *); |
| 316 | }; | 316 | }; |
| 317 | 317 | ||
| @@ -456,8 +456,6 @@ acpi_status acpi_add_pm_notifier(struct acpi_device *adev, | |||
| 456 | acpi_status acpi_remove_pm_notifier(struct acpi_device *adev, | 456 | acpi_status acpi_remove_pm_notifier(struct acpi_device *adev, |
| 457 | acpi_notify_handler handler); | 457 | acpi_notify_handler handler); |
| 458 | int acpi_pm_device_sleep_state(struct device *, int *, int); | 458 | int acpi_pm_device_sleep_state(struct device *, int *, int); |
| 459 | void acpi_dev_pm_add_dependent(acpi_handle handle, struct device *depdev); | ||
| 460 | void acpi_dev_pm_remove_dependent(acpi_handle handle, struct device *depdev); | ||
| 461 | #else | 459 | #else |
| 462 | static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev, | 460 | static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev, |
| 463 | acpi_notify_handler handler, | 461 | acpi_notify_handler handler, |
| @@ -478,10 +476,6 @@ static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m) | |||
| 478 | return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3_COLD) ? | 476 | return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3_COLD) ? |
| 479 | m : ACPI_STATE_D0; | 477 | m : ACPI_STATE_D0; |
| 480 | } | 478 | } |
| 481 | static inline void acpi_dev_pm_add_dependent(acpi_handle handle, | ||
| 482 | struct device *depdev) {} | ||
| 483 | static inline void acpi_dev_pm_remove_dependent(acpi_handle handle, | ||
| 484 | struct device *depdev) {} | ||
| 485 | #endif | 479 | #endif |
| 486 | 480 | ||
| 487 | #ifdef CONFIG_PM_RUNTIME | 481 | #ifdef CONFIG_PM_RUNTIME |
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 85bfdbe17805..c7b1475422b3 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | 46 | ||
| 47 | /* Current ACPICA subsystem version in YYYYMMDD format */ | 47 | /* Current ACPICA subsystem version in YYYYMMDD format */ |
| 48 | 48 | ||
| 49 | #define ACPI_CA_VERSION 0x20130725 | 49 | #define ACPI_CA_VERSION 0x20130823 |
| 50 | 50 | ||
| 51 | #include <acpi/acconfig.h> | 51 | #include <acpi/acconfig.h> |
| 52 | #include <acpi/actypes.h> | 52 | #include <acpi/actypes.h> |
| @@ -280,9 +280,16 @@ acpi_status | |||
| 280 | acpi_install_initialization_handler(acpi_init_handler handler, u32 function); | 280 | acpi_install_initialization_handler(acpi_init_handler handler, u32 function); |
| 281 | 281 | ||
| 282 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 282 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 283 | acpi_install_global_event_handler | 283 | acpi_install_sci_handler(acpi_sci_handler |
| 284 | (acpi_gbl_event_handler handler, void *context)) | 284 | address, |
| 285 | 285 | void *context)) | |
| 286 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | ||
| 287 | acpi_remove_sci_handler(acpi_sci_handler | ||
| 288 | address)) | ||
| 289 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | ||
| 290 | acpi_install_global_event_handler | ||
| 291 | (acpi_gbl_event_handler handler, | ||
| 292 | void *context)) | ||
| 286 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 293 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 287 | acpi_install_fixed_event_handler(u32 | 294 | acpi_install_fixed_event_handler(u32 |
| 288 | acpi_event, | 295 | acpi_event, |
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index b748aefce929..f6abf23ad0a7 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
| @@ -474,6 +474,11 @@ typedef u64 acpi_integer; | |||
| 474 | #define ACPI_MOVE_NAME(dest,src) (ACPI_STRNCPY (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE)) | 474 | #define ACPI_MOVE_NAME(dest,src) (ACPI_STRNCPY (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE)) |
| 475 | #endif | 475 | #endif |
| 476 | 476 | ||
| 477 | /* Support for the special RSDP signature (8 characters) */ | ||
| 478 | |||
| 479 | #define ACPI_VALIDATE_RSDP_SIG(a) (!ACPI_STRNCMP (ACPI_CAST_PTR (char, (a)), ACPI_SIG_RSDP, 8)) | ||
| 480 | #define ACPI_MAKE_RSDP_SIG(dest) (ACPI_MEMCPY (ACPI_CAST_PTR (char, (dest)), ACPI_SIG_RSDP, 8)) | ||
| 481 | |||
| 477 | /******************************************************************************* | 482 | /******************************************************************************* |
| 478 | * | 483 | * |
| 479 | * Miscellaneous constants | 484 | * Miscellaneous constants |
| @@ -946,6 +951,9 @@ typedef void | |||
| 946 | * Various handlers and callback procedures | 951 | * Various handlers and callback procedures |
| 947 | */ | 952 | */ |
| 948 | typedef | 953 | typedef |
| 954 | u32 (*acpi_sci_handler) (void *context); | ||
| 955 | |||
| 956 | typedef | ||
| 949 | void (*acpi_gbl_event_handler) (u32 event_type, | 957 | void (*acpi_gbl_event_handler) (u32 event_type, |
| 950 | acpi_handle device, | 958 | acpi_handle device, |
| 951 | u32 event_number, void *context); | 959 | u32 event_number, void *context); |
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 68534ef86ec8..fda0f3e35c03 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h | |||
| @@ -87,7 +87,7 @@ | |||
| 87 | #define ACPI_FLUSH_CPU_CACHE() | 87 | #define ACPI_FLUSH_CPU_CACHE() |
| 88 | #define ACPI_CAST_PTHREAD_T(pthread) ((acpi_thread_id) (pthread)) | 88 | #define ACPI_CAST_PTHREAD_T(pthread) ((acpi_thread_id) (pthread)) |
| 89 | 89 | ||
| 90 | #if defined(__ia64__) || defined(__x86_64__) | 90 | #if defined(__ia64__) || defined(__x86_64__) || defined(__aarch64__) |
| 91 | #define ACPI_MACHINE_WIDTH 64 | 91 | #define ACPI_MACHINE_WIDTH 64 |
| 92 | #define COMPILER_DEPENDENT_INT64 long | 92 | #define COMPILER_DEPENDENT_INT64 long |
| 93 | #define COMPILER_DEPENDENT_UINT64 unsigned long | 93 | #define COMPILER_DEPENDENT_UINT64 unsigned long |
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 66096d06925e..6eb1d3cb5104 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
| @@ -199,6 +199,7 @@ struct acpi_processor_flags { | |||
| 199 | struct acpi_processor { | 199 | struct acpi_processor { |
| 200 | acpi_handle handle; | 200 | acpi_handle handle; |
| 201 | u32 acpi_id; | 201 | u32 acpi_id; |
| 202 | u32 apic_id; | ||
| 202 | u32 id; | 203 | u32 id; |
| 203 | u32 pblk; | 204 | u32 pblk; |
| 204 | int performance_platform_limit; | 205 | int performance_platform_limit; |
| @@ -224,7 +225,6 @@ struct acpi_processor_errata { | |||
| 224 | } piix4; | 225 | } piix4; |
| 225 | }; | 226 | }; |
| 226 | 227 | ||
| 227 | extern void acpi_processor_load_module(struct acpi_processor *pr); | ||
| 228 | extern int acpi_processor_preregister_performance(struct | 228 | extern int acpi_processor_preregister_performance(struct |
| 229 | acpi_processor_performance | 229 | acpi_processor_performance |
| 230 | __percpu *performance); | 230 | __percpu *performance); |
| @@ -314,6 +314,8 @@ static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit) | |||
| 314 | 314 | ||
| 315 | /* in processor_core.c */ | 315 | /* in processor_core.c */ |
| 316 | void acpi_processor_set_pdc(acpi_handle handle); | 316 | void acpi_processor_set_pdc(acpi_handle handle); |
| 317 | int acpi_get_apicid(acpi_handle, int type, u32 acpi_id); | ||
| 318 | int acpi_map_cpuid(int apic_id, u32 acpi_id); | ||
| 317 | int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id); | 319 | int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id); |
| 318 | 320 | ||
| 319 | /* in processor_throttling.c */ | 321 | /* in processor_throttling.c */ |
diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h index edbd250809cb..bed35e36fd27 100644 --- a/include/dt-bindings/pinctrl/omap.h +++ b/include/dt-bindings/pinctrl/omap.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #define PULL_UP (1 << 4) | 23 | #define PULL_UP (1 << 4) |
| 24 | #define ALTELECTRICALSEL (1 << 5) | 24 | #define ALTELECTRICALSEL (1 << 5) |
| 25 | 25 | ||
| 26 | /* 34xx specific mux bit defines */ | 26 | /* omap3/4/5 specific mux bit defines */ |
| 27 | #define INPUT_EN (1 << 8) | 27 | #define INPUT_EN (1 << 8) |
| 28 | #define OFF_EN (1 << 9) | 28 | #define OFF_EN (1 << 9) |
| 29 | #define OFFOUT_EN (1 << 10) | 29 | #define OFFOUT_EN (1 << 10) |
| @@ -31,8 +31,6 @@ | |||
| 31 | #define OFF_PULL_EN (1 << 12) | 31 | #define OFF_PULL_EN (1 << 12) |
| 32 | #define OFF_PULL_UP (1 << 13) | 32 | #define OFF_PULL_UP (1 << 13) |
| 33 | #define WAKEUP_EN (1 << 14) | 33 | #define WAKEUP_EN (1 << 14) |
| 34 | |||
| 35 | /* 44xx specific mux bit defines */ | ||
| 36 | #define WAKEUP_EVENT (1 << 15) | 34 | #define WAKEUP_EVENT (1 << 15) |
| 37 | 35 | ||
| 38 | /* Active pin states */ | 36 | /* Active pin states */ |
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index a5db4aeefa36..3bc74141453f 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -116,7 +116,7 @@ void acpi_numa_arch_fixup(void); | |||
| 116 | 116 | ||
| 117 | #ifdef CONFIG_ACPI_HOTPLUG_CPU | 117 | #ifdef CONFIG_ACPI_HOTPLUG_CPU |
| 118 | /* Arch dependent functions for cpu hotplug support */ | 118 | /* Arch dependent functions for cpu hotplug support */ |
| 119 | int acpi_map_lsapic(acpi_handle handle, int *pcpu); | 119 | int acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu); |
| 120 | int acpi_unmap_lsapic(int cpu); | 120 | int acpi_unmap_lsapic(int cpu); |
| 121 | #endif /* CONFIG_ACPI_HOTPLUG_CPU */ | 121 | #endif /* CONFIG_ACPI_HOTPLUG_CPU */ |
| 122 | 122 | ||
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index a3b6b82108b9..5a1c8b71ccd8 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h | |||
| @@ -4,8 +4,11 @@ | |||
| 4 | 4 | ||
| 5 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
| 6 | #define BIT(nr) (1UL << (nr)) | 6 | #define BIT(nr) (1UL << (nr)) |
| 7 | #define BIT_ULL(nr) (1ULL << (nr)) | ||
| 7 | #define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) | 8 | #define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) |
| 8 | #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) | 9 | #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) |
| 10 | #define BIT_ULL_MASK(nr) (1ULL << ((nr) % BITS_PER_LONG_LONG)) | ||
| 11 | #define BIT_ULL_WORD(nr) ((nr) / BITS_PER_LONG_LONG) | ||
| 9 | #define BITS_PER_BYTE 8 | 12 | #define BITS_PER_BYTE 8 |
| 10 | #define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) | 13 | #define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) |
| 11 | #endif | 14 | #endif |
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index 842de225055f..ded429966c1f 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h | |||
| @@ -65,6 +65,21 @@ | |||
| 65 | #define __visible __attribute__((externally_visible)) | 65 | #define __visible __attribute__((externally_visible)) |
| 66 | #endif | 66 | #endif |
| 67 | 67 | ||
| 68 | /* | ||
| 69 | * GCC 'asm goto' miscompiles certain code sequences: | ||
| 70 | * | ||
| 71 | * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 | ||
| 72 | * | ||
| 73 | * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. | ||
| 74 | * Fixed in GCC 4.8.2 and later versions. | ||
| 75 | * | ||
| 76 | * (asm goto is automatically volatile - the naming reflects this.) | ||
| 77 | */ | ||
| 78 | #if GCC_VERSION <= 40801 | ||
| 79 | # define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) | ||
| 80 | #else | ||
| 81 | # define asm_volatile_goto(x...) do { asm goto(x); } while (0) | ||
| 82 | #endif | ||
| 68 | 83 | ||
| 69 | #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP | 84 | #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP |
| 70 | #if GCC_VERSION >= 40400 | 85 | #if GCC_VERSION >= 40400 |
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 801ff9e73679..3434ef7de017 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h | |||
| @@ -185,19 +185,6 @@ extern void cpu_hotplug_enable(void); | |||
| 185 | void clear_tasks_mm_cpumask(int cpu); | 185 | void clear_tasks_mm_cpumask(int cpu); |
| 186 | int cpu_down(unsigned int cpu); | 186 | int cpu_down(unsigned int cpu); |
| 187 | 187 | ||
| 188 | #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE | ||
| 189 | extern void cpu_hotplug_driver_lock(void); | ||
| 190 | extern void cpu_hotplug_driver_unlock(void); | ||
| 191 | #else | ||
| 192 | static inline void cpu_hotplug_driver_lock(void) | ||
| 193 | { | ||
| 194 | } | ||
| 195 | |||
| 196 | static inline void cpu_hotplug_driver_unlock(void) | ||
| 197 | { | ||
| 198 | } | ||
| 199 | #endif | ||
| 200 | |||
| 201 | #else /* CONFIG_HOTPLUG_CPU */ | 188 | #else /* CONFIG_HOTPLUG_CPU */ |
| 202 | 189 | ||
| 203 | static inline void cpu_hotplug_begin(void) {} | 190 | static inline void cpu_hotplug_begin(void) {} |
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index fcabc42d66ab..93a8c34d6c7f 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h | |||
| @@ -85,6 +85,20 @@ struct cpufreq_policy { | |||
| 85 | struct list_head policy_list; | 85 | struct list_head policy_list; |
| 86 | struct kobject kobj; | 86 | struct kobject kobj; |
| 87 | struct completion kobj_unregister; | 87 | struct completion kobj_unregister; |
| 88 | |||
| 89 | /* | ||
| 90 | * The rules for this semaphore: | ||
| 91 | * - Any routine that wants to read from the policy structure will | ||
| 92 | * do a down_read on this semaphore. | ||
| 93 | * - Any routine that will write to the policy structure and/or may take away | ||
| 94 | * the policy altogether (eg. CPU hotplug), will hold this lock in write | ||
| 95 | * mode before doing so. | ||
| 96 | * | ||
| 97 | * Additional rules: | ||
| 98 | * - Lock should not be held across | ||
| 99 | * __cpufreq_governor(data, CPUFREQ_GOV_POLICY_EXIT); | ||
| 100 | */ | ||
| 101 | struct rw_semaphore rwsem; | ||
| 88 | }; | 102 | }; |
| 89 | 103 | ||
| 90 | /* Only for ACPI */ | 104 | /* Only for ACPI */ |
| @@ -180,13 +194,6 @@ __ATTR(_name, 0644, show_##_name, store_##_name) | |||
| 180 | struct cpufreq_driver { | 194 | struct cpufreq_driver { |
| 181 | char name[CPUFREQ_NAME_LEN]; | 195 | char name[CPUFREQ_NAME_LEN]; |
| 182 | u8 flags; | 196 | u8 flags; |
| 183 | /* | ||
| 184 | * This should be set by platforms having multiple clock-domains, i.e. | ||
| 185 | * supporting multiple policies. With this sysfs directories of governor | ||
| 186 | * would be created in cpu/cpu<num>/cpufreq/ directory and so they can | ||
| 187 | * use the same governor with different tunables for different clusters. | ||
| 188 | */ | ||
| 189 | bool have_governor_per_policy; | ||
| 190 | 197 | ||
| 191 | /* needed by all drivers */ | 198 | /* needed by all drivers */ |
| 192 | int (*init) (struct cpufreq_policy *policy); | 199 | int (*init) (struct cpufreq_policy *policy); |
| @@ -194,9 +201,11 @@ struct cpufreq_driver { | |||
| 194 | 201 | ||
| 195 | /* define one out of two */ | 202 | /* define one out of two */ |
| 196 | int (*setpolicy) (struct cpufreq_policy *policy); | 203 | int (*setpolicy) (struct cpufreq_policy *policy); |
| 197 | int (*target) (struct cpufreq_policy *policy, | 204 | int (*target) (struct cpufreq_policy *policy, /* Deprecated */ |
| 198 | unsigned int target_freq, | 205 | unsigned int target_freq, |
| 199 | unsigned int relation); | 206 | unsigned int relation); |
| 207 | int (*target_index) (struct cpufreq_policy *policy, | ||
| 208 | unsigned int index); | ||
| 200 | 209 | ||
| 201 | /* should be defined, if possible */ | 210 | /* should be defined, if possible */ |
| 202 | unsigned int (*get) (unsigned int cpu); | 211 | unsigned int (*get) (unsigned int cpu); |
| @@ -211,13 +220,22 @@ struct cpufreq_driver { | |||
| 211 | }; | 220 | }; |
| 212 | 221 | ||
| 213 | /* flags */ | 222 | /* flags */ |
| 214 | #define CPUFREQ_STICKY 0x01 /* the driver isn't removed even if | 223 | #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if |
| 215 | * all ->init() calls failed */ | 224 | all ->init() calls failed */ |
| 216 | #define CPUFREQ_CONST_LOOPS 0x02 /* loops_per_jiffy or other kernel | 225 | #define CPUFREQ_CONST_LOOPS (1 << 1) /* loops_per_jiffy or other |
| 217 | * "constants" aren't affected by | 226 | kernel "constants" aren't |
| 218 | * frequency transitions */ | 227 | affected by frequency |
| 219 | #define CPUFREQ_PM_NO_WARN 0x04 /* don't warn on suspend/resume speed | 228 | transitions */ |
| 220 | * mismatches */ | 229 | #define CPUFREQ_PM_NO_WARN (1 << 2) /* don't warn on suspend/resume |
| 230 | speed mismatches */ | ||
| 231 | |||
| 232 | /* | ||
| 233 | * This should be set by platforms having multiple clock-domains, i.e. | ||
| 234 | * supporting multiple policies. With this sysfs directories of governor would | ||
| 235 | * be created in cpu/cpu<num>/cpufreq/ directory and so they can use the same | ||
| 236 | * governor with different tunables for different clusters. | ||
| 237 | */ | ||
| 238 | #define CPUFREQ_HAVE_GOVERNOR_PER_POLICY (1 << 3) | ||
| 221 | 239 | ||
| 222 | int cpufreq_register_driver(struct cpufreq_driver *driver_data); | 240 | int cpufreq_register_driver(struct cpufreq_driver *driver_data); |
| 223 | int cpufreq_unregister_driver(struct cpufreq_driver *driver_data); | 241 | int cpufreq_unregister_driver(struct cpufreq_driver *driver_data); |
| @@ -240,6 +258,13 @@ static inline void cpufreq_verify_within_limits(struct cpufreq_policy *policy, | |||
| 240 | return; | 258 | return; |
| 241 | } | 259 | } |
| 242 | 260 | ||
| 261 | static inline void | ||
| 262 | cpufreq_verify_within_cpu_limits(struct cpufreq_policy *policy) | ||
| 263 | { | ||
| 264 | cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, | ||
| 265 | policy->cpuinfo.max_freq); | ||
| 266 | } | ||
| 267 | |||
| 243 | /********************************************************************* | 268 | /********************************************************************* |
| 244 | * CPUFREQ NOTIFIER INTERFACE * | 269 | * CPUFREQ NOTIFIER INTERFACE * |
| 245 | *********************************************************************/ | 270 | *********************************************************************/ |
| @@ -392,6 +417,7 @@ int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy, | |||
| 392 | 417 | ||
| 393 | int cpufreq_frequency_table_verify(struct cpufreq_policy *policy, | 418 | int cpufreq_frequency_table_verify(struct cpufreq_policy *policy, |
| 394 | struct cpufreq_frequency_table *table); | 419 | struct cpufreq_frequency_table *table); |
| 420 | int cpufreq_generic_frequency_table_verify(struct cpufreq_policy *policy); | ||
| 395 | 421 | ||
| 396 | int cpufreq_frequency_table_target(struct cpufreq_policy *policy, | 422 | int cpufreq_frequency_table_target(struct cpufreq_policy *policy, |
| 397 | struct cpufreq_frequency_table *table, | 423 | struct cpufreq_frequency_table *table, |
| @@ -407,8 +433,20 @@ struct cpufreq_frequency_table *cpufreq_frequency_get_table(unsigned int cpu); | |||
| 407 | 433 | ||
| 408 | /* the following are really really optional */ | 434 | /* the following are really really optional */ |
| 409 | extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs; | 435 | extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs; |
| 436 | extern struct freq_attr *cpufreq_generic_attr[]; | ||
| 410 | void cpufreq_frequency_table_get_attr(struct cpufreq_frequency_table *table, | 437 | void cpufreq_frequency_table_get_attr(struct cpufreq_frequency_table *table, |
| 411 | unsigned int cpu); | 438 | unsigned int cpu); |
| 412 | void cpufreq_frequency_table_put_attr(unsigned int cpu); | 439 | void cpufreq_frequency_table_put_attr(unsigned int cpu); |
| 440 | int cpufreq_table_validate_and_show(struct cpufreq_policy *policy, | ||
| 441 | struct cpufreq_frequency_table *table); | ||
| 442 | |||
| 443 | int cpufreq_generic_init(struct cpufreq_policy *policy, | ||
| 444 | struct cpufreq_frequency_table *table, | ||
| 445 | unsigned int transition_latency); | ||
| 446 | static inline int cpufreq_generic_exit(struct cpufreq_policy *policy) | ||
| 447 | { | ||
| 448 | cpufreq_frequency_table_put_attr(policy->cpu); | ||
| 449 | return 0; | ||
| 450 | } | ||
| 413 | 451 | ||
| 414 | #endif /* _LINUX_CPUFREQ_H */ | 452 | #endif /* _LINUX_CPUFREQ_H */ |
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index 5f1ab92107e6..7a7cc74d7f27 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 17 | #include <linux/notifier.h> | 17 | #include <linux/notifier.h> |
| 18 | #include <linux/opp.h> | 18 | #include <linux/pm_opp.h> |
| 19 | 19 | ||
| 20 | #define DEVFREQ_NAME_LEN 16 | 20 | #define DEVFREQ_NAME_LEN 16 |
| 21 | 21 | ||
| @@ -187,7 +187,7 @@ extern int devfreq_suspend_device(struct devfreq *devfreq); | |||
| 187 | extern int devfreq_resume_device(struct devfreq *devfreq); | 187 | extern int devfreq_resume_device(struct devfreq *devfreq); |
| 188 | 188 | ||
| 189 | /* Helper functions for devfreq user device driver with OPP. */ | 189 | /* Helper functions for devfreq user device driver with OPP. */ |
| 190 | extern struct opp *devfreq_recommended_opp(struct device *dev, | 190 | extern struct dev_pm_opp *devfreq_recommended_opp(struct device *dev, |
| 191 | unsigned long *freq, u32 flags); | 191 | unsigned long *freq, u32 flags); |
| 192 | extern int devfreq_register_opp_notifier(struct device *dev, | 192 | extern int devfreq_register_opp_notifier(struct device *dev, |
| 193 | struct devfreq *devfreq); | 193 | struct devfreq *devfreq); |
| @@ -238,7 +238,7 @@ static inline int devfreq_resume_device(struct devfreq *devfreq) | |||
| 238 | return 0; | 238 | return 0; |
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | static inline struct opp *devfreq_recommended_opp(struct device *dev, | 241 | static inline struct dev_pm_opp *devfreq_recommended_opp(struct device *dev, |
| 242 | unsigned long *freq, u32 flags) | 242 | unsigned long *freq, u32 flags) |
| 243 | { | 243 | { |
| 244 | return ERR_PTR(-EINVAL); | 244 | return ERR_PTR(-EINVAL); |
diff --git a/include/linux/filter.h b/include/linux/filter.h index a6ac84871d6d..ff4e40cd45b1 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <linux/atomic.h> | 7 | #include <linux/atomic.h> |
| 8 | #include <linux/compat.h> | 8 | #include <linux/compat.h> |
| 9 | #include <linux/workqueue.h> | ||
| 9 | #include <uapi/linux/filter.h> | 10 | #include <uapi/linux/filter.h> |
| 10 | 11 | ||
| 11 | #ifdef CONFIG_COMPAT | 12 | #ifdef CONFIG_COMPAT |
| @@ -25,15 +26,19 @@ struct sk_filter | |||
| 25 | { | 26 | { |
| 26 | atomic_t refcnt; | 27 | atomic_t refcnt; |
| 27 | unsigned int len; /* Number of filter blocks */ | 28 | unsigned int len; /* Number of filter blocks */ |
| 29 | struct rcu_head rcu; | ||
| 28 | unsigned int (*bpf_func)(const struct sk_buff *skb, | 30 | unsigned int (*bpf_func)(const struct sk_buff *skb, |
| 29 | const struct sock_filter *filter); | 31 | const struct sock_filter *filter); |
| 30 | struct rcu_head rcu; | 32 | union { |
| 31 | struct sock_filter insns[0]; | 33 | struct sock_filter insns[0]; |
| 34 | struct work_struct work; | ||
| 35 | }; | ||
| 32 | }; | 36 | }; |
| 33 | 37 | ||
| 34 | static inline unsigned int sk_filter_len(const struct sk_filter *fp) | 38 | static inline unsigned int sk_filter_size(unsigned int proglen) |
| 35 | { | 39 | { |
| 36 | return fp->len * sizeof(struct sock_filter) + sizeof(*fp); | 40 | return max(sizeof(struct sk_filter), |
| 41 | offsetof(struct sk_filter, insns[proglen])); | ||
| 37 | } | 42 | } |
| 38 | 43 | ||
| 39 | extern int sk_filter(struct sock *sk, struct sk_buff *skb); | 44 | extern int sk_filter(struct sock *sk, struct sk_buff *skb); |
| @@ -67,11 +72,13 @@ static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen, | |||
| 67 | } | 72 | } |
| 68 | #define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns) | 73 | #define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns) |
| 69 | #else | 74 | #else |
| 75 | #include <linux/slab.h> | ||
| 70 | static inline void bpf_jit_compile(struct sk_filter *fp) | 76 | static inline void bpf_jit_compile(struct sk_filter *fp) |
| 71 | { | 77 | { |
| 72 | } | 78 | } |
| 73 | static inline void bpf_jit_free(struct sk_filter *fp) | 79 | static inline void bpf_jit_free(struct sk_filter *fp) |
| 74 | { | 80 | { |
| 81 | kfree(fp); | ||
| 75 | } | 82 | } |
| 76 | #define SK_RUN_FILTER(FILTER, SKB) sk_run_filter(SKB, FILTER->insns) | 83 | #define SK_RUN_FILTER(FILTER, SKB) sk_run_filter(SKB, FILTER->insns) |
| 77 | #endif | 84 | #endif |
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index ecc82b37c4cc..b3e7a667e03c 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
| @@ -137,47 +137,24 @@ extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, | |||
| 137 | extern void mem_cgroup_replace_page_cache(struct page *oldpage, | 137 | extern void mem_cgroup_replace_page_cache(struct page *oldpage, |
| 138 | struct page *newpage); | 138 | struct page *newpage); |
| 139 | 139 | ||
| 140 | /** | 140 | static inline void mem_cgroup_oom_enable(void) |
| 141 | * mem_cgroup_toggle_oom - toggle the memcg OOM killer for the current task | ||
| 142 | * @new: true to enable, false to disable | ||
| 143 | * | ||
| 144 | * Toggle whether a failed memcg charge should invoke the OOM killer | ||
| 145 | * or just return -ENOMEM. Returns the previous toggle state. | ||
| 146 | * | ||
| 147 | * NOTE: Any path that enables the OOM killer before charging must | ||
| 148 | * call mem_cgroup_oom_synchronize() afterward to finalize the | ||
| 149 | * OOM handling and clean up. | ||
| 150 | */ | ||
| 151 | static inline bool mem_cgroup_toggle_oom(bool new) | ||
| 152 | { | 141 | { |
| 153 | bool old; | 142 | WARN_ON(current->memcg_oom.may_oom); |
| 154 | 143 | current->memcg_oom.may_oom = 1; | |
| 155 | old = current->memcg_oom.may_oom; | ||
| 156 | current->memcg_oom.may_oom = new; | ||
| 157 | |||
| 158 | return old; | ||
| 159 | } | 144 | } |
| 160 | 145 | ||
| 161 | static inline void mem_cgroup_enable_oom(void) | 146 | static inline void mem_cgroup_oom_disable(void) |
| 162 | { | 147 | { |
| 163 | bool old = mem_cgroup_toggle_oom(true); | 148 | WARN_ON(!current->memcg_oom.may_oom); |
| 164 | 149 | current->memcg_oom.may_oom = 0; | |
| 165 | WARN_ON(old == true); | ||
| 166 | } | ||
| 167 | |||
| 168 | static inline void mem_cgroup_disable_oom(void) | ||
| 169 | { | ||
| 170 | bool old = mem_cgroup_toggle_oom(false); | ||
| 171 | |||
| 172 | WARN_ON(old == false); | ||
| 173 | } | 150 | } |
| 174 | 151 | ||
| 175 | static inline bool task_in_memcg_oom(struct task_struct *p) | 152 | static inline bool task_in_memcg_oom(struct task_struct *p) |
| 176 | { | 153 | { |
| 177 | return p->memcg_oom.in_memcg_oom; | 154 | return p->memcg_oom.memcg; |
| 178 | } | 155 | } |
| 179 | 156 | ||
| 180 | bool mem_cgroup_oom_synchronize(void); | 157 | bool mem_cgroup_oom_synchronize(bool wait); |
| 181 | 158 | ||
| 182 | #ifdef CONFIG_MEMCG_SWAP | 159 | #ifdef CONFIG_MEMCG_SWAP |
| 183 | extern int do_swap_account; | 160 | extern int do_swap_account; |
| @@ -402,16 +379,11 @@ static inline void mem_cgroup_end_update_page_stat(struct page *page, | |||
| 402 | { | 379 | { |
| 403 | } | 380 | } |
| 404 | 381 | ||
| 405 | static inline bool mem_cgroup_toggle_oom(bool new) | 382 | static inline void mem_cgroup_oom_enable(void) |
| 406 | { | ||
| 407 | return false; | ||
| 408 | } | ||
| 409 | |||
| 410 | static inline void mem_cgroup_enable_oom(void) | ||
| 411 | { | 383 | { |
| 412 | } | 384 | } |
| 413 | 385 | ||
| 414 | static inline void mem_cgroup_disable_oom(void) | 386 | static inline void mem_cgroup_oom_disable(void) |
| 415 | { | 387 | { |
| 416 | } | 388 | } |
| 417 | 389 | ||
| @@ -420,7 +392,7 @@ static inline bool task_in_memcg_oom(struct task_struct *p) | |||
| 420 | return false; | 392 | return false; |
| 421 | } | 393 | } |
| 422 | 394 | ||
| 423 | static inline bool mem_cgroup_oom_synchronize(void) | 395 | static inline bool mem_cgroup_oom_synchronize(bool wait) |
| 424 | { | 396 | { |
| 425 | return false; | 397 | return false; |
| 426 | } | 398 | } |
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 09c2300ddb37..cb358355ef43 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #define MAPPER_CTRL_MINOR 236 | 45 | #define MAPPER_CTRL_MINOR 236 |
| 46 | #define LOOP_CTRL_MINOR 237 | 46 | #define LOOP_CTRL_MINOR 237 |
| 47 | #define VHOST_NET_MINOR 238 | 47 | #define VHOST_NET_MINOR 238 |
| 48 | #define UHID_MINOR 239 | ||
| 48 | #define MISC_DYNAMIC_MINOR 255 | 49 | #define MISC_DYNAMIC_MINOR 255 |
| 49 | 50 | ||
| 50 | struct device; | 51 | struct device; |
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h index 68029b30c3dc..5eb4e31af22b 100644 --- a/include/linux/mlx5/device.h +++ b/include/linux/mlx5/device.h | |||
| @@ -181,7 +181,7 @@ enum { | |||
| 181 | MLX5_DEV_CAP_FLAG_TLP_HINTS = 1LL << 39, | 181 | MLX5_DEV_CAP_FLAG_TLP_HINTS = 1LL << 39, |
| 182 | MLX5_DEV_CAP_FLAG_SIG_HAND_OVER = 1LL << 40, | 182 | MLX5_DEV_CAP_FLAG_SIG_HAND_OVER = 1LL << 40, |
| 183 | MLX5_DEV_CAP_FLAG_DCT = 1LL << 41, | 183 | MLX5_DEV_CAP_FLAG_DCT = 1LL << 41, |
| 184 | MLX5_DEV_CAP_FLAG_CMDIF_CSUM = 1LL << 46, | 184 | MLX5_DEV_CAP_FLAG_CMDIF_CSUM = 3LL << 46, |
| 185 | }; | 185 | }; |
| 186 | 186 | ||
| 187 | enum { | 187 | enum { |
| @@ -417,7 +417,7 @@ struct mlx5_init_seg { | |||
| 417 | struct health_buffer health; | 417 | struct health_buffer health; |
| 418 | __be32 rsvd2[884]; | 418 | __be32 rsvd2[884]; |
| 419 | __be32 health_counter; | 419 | __be32 health_counter; |
| 420 | __be32 rsvd3[1023]; | 420 | __be32 rsvd3[1019]; |
| 421 | __be64 ieee1588_clk; | 421 | __be64 ieee1588_clk; |
| 422 | __be32 ieee1588_clk_type; | 422 | __be32 ieee1588_clk_type; |
| 423 | __be32 clr_intx; | 423 | __be32 clr_intx; |
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index 8888381fc150..6b8c496572c8 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h | |||
| @@ -82,7 +82,7 @@ enum { | |||
| 82 | }; | 82 | }; |
| 83 | 83 | ||
| 84 | enum { | 84 | enum { |
| 85 | MLX5_MAX_EQ_NAME = 20 | 85 | MLX5_MAX_EQ_NAME = 32 |
| 86 | }; | 86 | }; |
| 87 | 87 | ||
| 88 | enum { | 88 | enum { |
| @@ -747,8 +747,7 @@ static inline u32 mlx5_idx_to_mkey(u32 mkey_idx) | |||
| 747 | 747 | ||
| 748 | enum { | 748 | enum { |
| 749 | MLX5_PROF_MASK_QP_SIZE = (u64)1 << 0, | 749 | MLX5_PROF_MASK_QP_SIZE = (u64)1 << 0, |
| 750 | MLX5_PROF_MASK_CMDIF_CSUM = (u64)1 << 1, | 750 | MLX5_PROF_MASK_MR_CACHE = (u64)1 << 1, |
| 751 | MLX5_PROF_MASK_MR_CACHE = (u64)1 << 2, | ||
| 752 | }; | 751 | }; |
| 753 | 752 | ||
| 754 | enum { | 753 | enum { |
| @@ -758,7 +757,6 @@ enum { | |||
| 758 | struct mlx5_profile { | 757 | struct mlx5_profile { |
| 759 | u64 mask; | 758 | u64 mask; |
| 760 | u32 log_max_qp; | 759 | u32 log_max_qp; |
| 761 | int cmdif_csum; | ||
| 762 | struct { | 760 | struct { |
| 763 | int size; | 761 | int size; |
| 764 | int limit; | 762 | int limit; |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 3de49aca4519..25f5d2d11e7c 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -2264,11 +2264,12 @@ static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index) | |||
| 2264 | } | 2264 | } |
| 2265 | 2265 | ||
| 2266 | #ifdef CONFIG_XPS | 2266 | #ifdef CONFIG_XPS |
| 2267 | extern int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask, | 2267 | extern int netif_set_xps_queue(struct net_device *dev, |
| 2268 | const struct cpumask *mask, | ||
| 2268 | u16 index); | 2269 | u16 index); |
| 2269 | #else | 2270 | #else |
| 2270 | static inline int netif_set_xps_queue(struct net_device *dev, | 2271 | static inline int netif_set_xps_queue(struct net_device *dev, |
| 2271 | struct cpumask *mask, | 2272 | const struct cpumask *mask, |
| 2272 | u16 index) | 2273 | u16 index) |
| 2273 | { | 2274 | { |
| 2274 | return 0; | 2275 | return 0; |
diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h deleted file mode 100644 index c84128255814..000000000000 --- a/include/linux/of_reserved_mem.h +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | #ifndef __OF_RESERVED_MEM_H | ||
| 2 | #define __OF_RESERVED_MEM_H | ||
| 3 | |||
| 4 | #ifdef CONFIG_OF_RESERVED_MEM | ||
| 5 | void of_reserved_mem_device_init(struct device *dev); | ||
| 6 | void of_reserved_mem_device_release(struct device *dev); | ||
| 7 | void early_init_dt_scan_reserved_mem(void); | ||
| 8 | #else | ||
| 9 | static inline void of_reserved_mem_device_init(struct device *dev) { } | ||
| 10 | static inline void of_reserved_mem_device_release(struct device *dev) { } | ||
| 11 | static inline void early_init_dt_scan_reserved_mem(void) { } | ||
| 12 | #endif | ||
| 13 | |||
| 14 | #endif /* __OF_RESERVED_MEM_H */ | ||
diff --git a/include/linux/opp.h b/include/linux/opp.h deleted file mode 100644 index 3aca2b8def33..000000000000 --- a/include/linux/opp.h +++ /dev/null | |||
| @@ -1,134 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Generic OPP Interface | ||
| 3 | * | ||
| 4 | * Copyright (C) 2009-2010 Texas Instruments Incorporated. | ||
| 5 | * Nishanth Menon | ||
| 6 | * Romit Dasgupta | ||
| 7 | * Kevin Hilman | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License version 2 as | ||
| 11 | * published by the Free Software Foundation. | ||
| 12 | */ | ||
| 13 | |||
| 14 | #ifndef __LINUX_OPP_H__ | ||
| 15 | #define __LINUX_OPP_H__ | ||
| 16 | |||
| 17 | #include <linux/err.h> | ||
| 18 | #include <linux/cpufreq.h> | ||
| 19 | #include <linux/notifier.h> | ||
| 20 | |||
| 21 | struct opp; | ||
| 22 | struct device; | ||
| 23 | |||
| 24 | enum opp_event { | ||
| 25 | OPP_EVENT_ADD, OPP_EVENT_ENABLE, OPP_EVENT_DISABLE, | ||
| 26 | }; | ||
| 27 | |||
| 28 | #if defined(CONFIG_PM_OPP) | ||
| 29 | |||
| 30 | unsigned long opp_get_voltage(struct opp *opp); | ||
| 31 | |||
| 32 | unsigned long opp_get_freq(struct opp *opp); | ||
| 33 | |||
| 34 | int opp_get_opp_count(struct device *dev); | ||
| 35 | |||
| 36 | struct opp *opp_find_freq_exact(struct device *dev, unsigned long freq, | ||
| 37 | bool available); | ||
| 38 | |||
| 39 | struct opp *opp_find_freq_floor(struct device *dev, unsigned long *freq); | ||
| 40 | |||
| 41 | struct opp *opp_find_freq_ceil(struct device *dev, unsigned long *freq); | ||
| 42 | |||
| 43 | int opp_add(struct device *dev, unsigned long freq, unsigned long u_volt); | ||
| 44 | |||
| 45 | int opp_enable(struct device *dev, unsigned long freq); | ||
| 46 | |||
| 47 | int opp_disable(struct device *dev, unsigned long freq); | ||
| 48 | |||
| 49 | struct srcu_notifier_head *opp_get_notifier(struct device *dev); | ||
| 50 | #else | ||
| 51 | static inline unsigned long opp_get_voltage(struct opp *opp) | ||
| 52 | { | ||
| 53 | return 0; | ||
| 54 | } | ||
| 55 | |||
| 56 | static inline unsigned long opp_get_freq(struct opp *opp) | ||
| 57 | { | ||
| 58 | return 0; | ||
| 59 | } | ||
| 60 | |||
| 61 | static inline int opp_get_opp_count(struct device *dev) | ||
| 62 | { | ||
| 63 | return 0; | ||
| 64 | } | ||
| 65 | |||
| 66 | static inline struct opp *opp_find_freq_exact(struct device *dev, | ||
| 67 | unsigned long freq, bool available) | ||
| 68 | { | ||
| 69 | return ERR_PTR(-EINVAL); | ||
| 70 | } | ||
| 71 | |||
| 72 | static inline struct opp *opp_find_freq_floor(struct device *dev, | ||
| 73 | unsigned long *freq) | ||
| 74 | { | ||
| 75 | return ERR_PTR(-EINVAL); | ||
| 76 | } | ||
| 77 | |||
| 78 | static inline struct opp *opp_find_freq_ceil(struct device *dev, | ||
| 79 | unsigned long *freq) | ||
| 80 | { | ||
| 81 | return ERR_PTR(-EINVAL); | ||
| 82 | } | ||
| 83 | |||
| 84 | static inline int opp_add(struct device *dev, unsigned long freq, | ||
| 85 | unsigned long u_volt) | ||
| 86 | { | ||
| 87 | return -EINVAL; | ||
| 88 | } | ||
| 89 | |||
| 90 | static inline int opp_enable(struct device *dev, unsigned long freq) | ||
| 91 | { | ||
| 92 | return 0; | ||
| 93 | } | ||
| 94 | |||
| 95 | static inline int opp_disable(struct device *dev, unsigned long freq) | ||
| 96 | { | ||
| 97 | return 0; | ||
| 98 | } | ||
| 99 | |||
| 100 | static inline struct srcu_notifier_head *opp_get_notifier(struct device *dev) | ||
| 101 | { | ||
| 102 | return ERR_PTR(-EINVAL); | ||
| 103 | } | ||
| 104 | #endif /* CONFIG_PM_OPP */ | ||
| 105 | |||
| 106 | #if defined(CONFIG_PM_OPP) && defined(CONFIG_OF) | ||
| 107 | int of_init_opp_table(struct device *dev); | ||
| 108 | #else | ||
| 109 | static inline int of_init_opp_table(struct device *dev) | ||
| 110 | { | ||
| 111 | return -EINVAL; | ||
| 112 | } | ||
| 113 | #endif | ||
| 114 | |||
| 115 | #if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP) | ||
| 116 | int opp_init_cpufreq_table(struct device *dev, | ||
| 117 | struct cpufreq_frequency_table **table); | ||
| 118 | void opp_free_cpufreq_table(struct device *dev, | ||
| 119 | struct cpufreq_frequency_table **table); | ||
| 120 | #else | ||
| 121 | static inline int opp_init_cpufreq_table(struct device *dev, | ||
| 122 | struct cpufreq_frequency_table **table) | ||
| 123 | { | ||
| 124 | return -EINVAL; | ||
| 125 | } | ||
| 126 | |||
| 127 | static inline | ||
| 128 | void opp_free_cpufreq_table(struct device *dev, | ||
| 129 | struct cpufreq_frequency_table **table) | ||
| 130 | { | ||
| 131 | } | ||
| 132 | #endif /* CONFIG_CPU_FREQ */ | ||
| 133 | |||
| 134 | #endif /* __LINUX_OPP_H__ */ | ||
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 866e85c5eb94..c8ba627c1d60 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
| @@ -294,9 +294,31 @@ struct ring_buffer; | |||
| 294 | */ | 294 | */ |
| 295 | struct perf_event { | 295 | struct perf_event { |
| 296 | #ifdef CONFIG_PERF_EVENTS | 296 | #ifdef CONFIG_PERF_EVENTS |
| 297 | struct list_head group_entry; | 297 | /* |
| 298 | * entry onto perf_event_context::event_list; | ||
| 299 | * modifications require ctx->lock | ||
| 300 | * RCU safe iterations. | ||
| 301 | */ | ||
| 298 | struct list_head event_entry; | 302 | struct list_head event_entry; |
| 303 | |||
| 304 | /* | ||
| 305 | * XXX: group_entry and sibling_list should be mutually exclusive; | ||
| 306 | * either you're a sibling on a group, or you're the group leader. | ||
| 307 | * Rework the code to always use the same list element. | ||
| 308 | * | ||
| 309 | * Locked for modification by both ctx->mutex and ctx->lock; holding | ||
| 310 | * either sufficies for read. | ||
| 311 | */ | ||
| 312 | struct list_head group_entry; | ||
| 299 | struct list_head sibling_list; | 313 | struct list_head sibling_list; |
| 314 | |||
| 315 | /* | ||
| 316 | * We need storage to track the entries in perf_pmu_migrate_context; we | ||
| 317 | * cannot use the event_entry because of RCU and we want to keep the | ||
| 318 | * group in tact which avoids us using the other two entries. | ||
| 319 | */ | ||
| 320 | struct list_head migrate_entry; | ||
| 321 | |||
| 300 | struct hlist_node hlist_entry; | 322 | struct hlist_node hlist_entry; |
| 301 | int nr_siblings; | 323 | int nr_siblings; |
| 302 | int group_flags; | 324 | int group_flags; |
diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h new file mode 100644 index 000000000000..5151b0059585 --- /dev/null +++ b/include/linux/pm_opp.h | |||
| @@ -0,0 +1,139 @@ | |||
| 1 | /* | ||
| 2 | * Generic OPP Interface | ||
| 3 | * | ||
| 4 | * Copyright (C) 2009-2010 Texas Instruments Incorporated. | ||
| 5 | * Nishanth Menon | ||
| 6 | * Romit Dasgupta | ||
| 7 | * Kevin Hilman | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License version 2 as | ||
| 11 | * published by the Free Software Foundation. | ||
| 12 | */ | ||
| 13 | |||
| 14 | #ifndef __LINUX_OPP_H__ | ||
| 15 | #define __LINUX_OPP_H__ | ||
| 16 | |||
| 17 | #include <linux/err.h> | ||
| 18 | #include <linux/cpufreq.h> | ||
| 19 | #include <linux/notifier.h> | ||
| 20 | |||
| 21 | struct dev_pm_opp; | ||
| 22 | struct device; | ||
| 23 | |||
| 24 | enum dev_pm_opp_event { | ||
| 25 | OPP_EVENT_ADD, OPP_EVENT_ENABLE, OPP_EVENT_DISABLE, | ||
| 26 | }; | ||
| 27 | |||
| 28 | #if defined(CONFIG_PM_OPP) | ||
| 29 | |||
| 30 | unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp); | ||
| 31 | |||
| 32 | unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp); | ||
| 33 | |||
| 34 | int dev_pm_opp_get_opp_count(struct device *dev); | ||
| 35 | |||
| 36 | struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev, | ||
| 37 | unsigned long freq, | ||
| 38 | bool available); | ||
| 39 | |||
| 40 | struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev, | ||
| 41 | unsigned long *freq); | ||
| 42 | |||
| 43 | struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev, | ||
| 44 | unsigned long *freq); | ||
| 45 | |||
| 46 | int dev_pm_opp_add(struct device *dev, unsigned long freq, | ||
| 47 | unsigned long u_volt); | ||
| 48 | |||
| 49 | int dev_pm_opp_enable(struct device *dev, unsigned long freq); | ||
| 50 | |||
| 51 | int dev_pm_opp_disable(struct device *dev, unsigned long freq); | ||
| 52 | |||
| 53 | struct srcu_notifier_head *dev_pm_opp_get_notifier(struct device *dev); | ||
| 54 | #else | ||
| 55 | static inline unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp) | ||
| 56 | { | ||
| 57 | return 0; | ||
| 58 | } | ||
| 59 | |||
| 60 | static inline unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp) | ||
| 61 | { | ||
| 62 | return 0; | ||
| 63 | } | ||
| 64 | |||
| 65 | static inline int dev_pm_opp_get_opp_count(struct device *dev) | ||
| 66 | { | ||
| 67 | return 0; | ||
| 68 | } | ||
| 69 | |||
| 70 | static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev, | ||
| 71 | unsigned long freq, bool available) | ||
| 72 | { | ||
| 73 | return ERR_PTR(-EINVAL); | ||
| 74 | } | ||
| 75 | |||
| 76 | static inline struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev, | ||
| 77 | unsigned long *freq) | ||
| 78 | { | ||
| 79 | return ERR_PTR(-EINVAL); | ||
| 80 | } | ||
| 81 | |||
| 82 | static inline struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev, | ||
| 83 | unsigned long *freq) | ||
| 84 | { | ||
| 85 | return ERR_PTR(-EINVAL); | ||
| 86 | } | ||
| 87 | |||
| 88 | static inline int dev_pm_opp_add(struct device *dev, unsigned long freq, | ||
| 89 | unsigned long u_volt) | ||
| 90 | { | ||
| 91 | return -EINVAL; | ||
| 92 | } | ||
| 93 | |||
| 94 | static inline int dev_pm_opp_enable(struct device *dev, unsigned long freq) | ||
| 95 | { | ||
| 96 | return 0; | ||
| 97 | } | ||
| 98 | |||
| 99 | static inline int dev_pm_opp_disable(struct device *dev, unsigned long freq) | ||
| 100 | { | ||
| 101 | return 0; | ||
| 102 | } | ||
| 103 | |||
| 104 | static inline struct srcu_notifier_head *dev_pm_opp_get_notifier( | ||
| 105 | struct device *dev) | ||
| 106 | { | ||
| 107 | return ERR_PTR(-EINVAL); | ||
| 108 | } | ||
| 109 | #endif /* CONFIG_PM_OPP */ | ||
| 110 | |||
| 111 | #if defined(CONFIG_PM_OPP) && defined(CONFIG_OF) | ||
| 112 | int of_init_opp_table(struct device *dev); | ||
| 113 | #else | ||
| 114 | static inline int of_init_opp_table(struct device *dev) | ||
| 115 | { | ||
| 116 | return -EINVAL; | ||
| 117 | } | ||
| 118 | #endif | ||
| 119 | |||
| 120 | #if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP) | ||
| 121 | int dev_pm_opp_init_cpufreq_table(struct device *dev, | ||
| 122 | struct cpufreq_frequency_table **table); | ||
| 123 | void dev_pm_opp_free_cpufreq_table(struct device *dev, | ||
| 124 | struct cpufreq_frequency_table **table); | ||
| 125 | #else | ||
| 126 | static inline int dev_pm_opp_init_cpufreq_table(struct device *dev, | ||
| 127 | struct cpufreq_frequency_table **table) | ||
| 128 | { | ||
| 129 | return -EINVAL; | ||
| 130 | } | ||
| 131 | |||
| 132 | static inline | ||
| 133 | void dev_pm_opp_free_cpufreq_table(struct device *dev, | ||
| 134 | struct cpufreq_frequency_table **table) | ||
| 135 | { | ||
| 136 | } | ||
| 137 | #endif /* CONFIG_CPU_FREQ */ | ||
| 138 | |||
| 139 | #endif /* __LINUX_OPP_H__ */ | ||
diff --git a/include/linux/powercap.h b/include/linux/powercap.h new file mode 100644 index 000000000000..4e250417ee30 --- /dev/null +++ b/include/linux/powercap.h | |||
| @@ -0,0 +1,325 @@ | |||
| 1 | /* | ||
| 2 | * powercap.h: Data types and headers for sysfs power capping interface | ||
| 3 | * Copyright (c) 2013, Intel Corporation. | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify it | ||
| 6 | * under the terms and conditions of the GNU General Public License, | ||
| 7 | * version 2, as published by the Free Software Foundation. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
| 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 12 | * more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License along with | ||
| 15 | * this program; if not, write to the Free Software Foundation, Inc. | ||
| 16 | * | ||
| 17 | */ | ||
| 18 | |||
| 19 | #ifndef __POWERCAP_H__ | ||
| 20 | #define __POWERCAP_H__ | ||
| 21 | |||
| 22 | #include <linux/device.h> | ||
| 23 | #include <linux/idr.h> | ||
| 24 | |||
| 25 | /* | ||
| 26 | * A power cap class device can contain multiple powercap control_types. | ||
| 27 | * Each control_type can have multiple power zones, which can be independently | ||
| 28 | * controlled. Each power zone can have one or more constraints. | ||
| 29 | */ | ||
| 30 | |||
| 31 | struct powercap_control_type; | ||
| 32 | struct powercap_zone; | ||
| 33 | struct powercap_zone_constraint; | ||
| 34 | |||
| 35 | /** | ||
| 36 | * struct powercap_control_type_ops - Define control type callbacks | ||
| 37 | * @set_enable: Enable/Disable whole control type. | ||
| 38 | * Default is enabled. But this callback allows all zones | ||
| 39 | * to be in disable state and remove any applied power | ||
| 40 | * limits. If disabled power zone can only be monitored | ||
| 41 | * not controlled. | ||
| 42 | * @get_enable: get Enable/Disable status. | ||
| 43 | * @release: Callback to inform that last reference to this | ||
| 44 | * control type is closed. So it is safe to free data | ||
| 45 | * structure associated with this control type. | ||
| 46 | * This callback is mandatory if the client own memory | ||
| 47 | * for the control type. | ||
| 48 | * | ||
| 49 | * This structure defines control type callbacks to be implemented by client | ||
| 50 | * drivers | ||
| 51 | */ | ||
| 52 | struct powercap_control_type_ops { | ||
| 53 | int (*set_enable) (struct powercap_control_type *, bool mode); | ||
| 54 | int (*get_enable) (struct powercap_control_type *, bool *mode); | ||
| 55 | int (*release) (struct powercap_control_type *); | ||
| 56 | }; | ||
| 57 | |||
| 58 | /** | ||
| 59 | * struct powercap_control_type- Defines a powercap control_type | ||
| 60 | * @name: name of control_type | ||
| 61 | * @dev: device for this control_type | ||
| 62 | * @idr: idr to have unique id for its child | ||
| 63 | * @root_node: Root holding power zones for this control_type | ||
| 64 | * @ops: Pointer to callback struct | ||
| 65 | * @node_lock: mutex for control type | ||
| 66 | * @allocated: This is possible that client owns the memory | ||
| 67 | * used by this structure. In this case | ||
| 68 | * this flag is set to false by framework to | ||
| 69 | * prevent deallocation during release process. | ||
| 70 | * Otherwise this flag is set to true. | ||
| 71 | * @ctrl_inst: link to the control_type list | ||
| 72 | * | ||
| 73 | * Defines powercap control_type. This acts as a container for power | ||
| 74 | * zones, which use same method to control power. E.g. RAPL, RAPL-PCI etc. | ||
| 75 | * All fields are private and should not be used by client drivers. | ||
| 76 | */ | ||
| 77 | struct powercap_control_type { | ||
| 78 | struct device dev; | ||
| 79 | struct idr idr; | ||
| 80 | int nr_zones; | ||
| 81 | const struct powercap_control_type_ops *ops; | ||
| 82 | struct mutex lock; | ||
| 83 | bool allocated; | ||
| 84 | struct list_head node; | ||
| 85 | }; | ||
| 86 | |||
| 87 | /** | ||
| 88 | * struct powercap_zone_ops - Define power zone callbacks | ||
| 89 | * @get_max_energy_range_uj: Get maximum range of energy counter in | ||
| 90 | * micro-joules. | ||
| 91 | * @get_energy_uj: Get current energy counter in micro-joules. | ||
| 92 | * @reset_energy_uj: Reset micro-joules energy counter. | ||
| 93 | * @get_max_power_range_uw: Get maximum range of power counter in | ||
| 94 | * micro-watts. | ||
| 95 | * @get_power_uw: Get current power counter in micro-watts. | ||
| 96 | * @set_enable: Enable/Disable power zone controls. | ||
| 97 | * Default is enabled. | ||
| 98 | * @get_enable: get Enable/Disable status. | ||
| 99 | * @release: Callback to inform that last reference to this | ||
| 100 | * control type is closed. So it is safe to free | ||
| 101 | * data structure associated with this | ||
| 102 | * control type. Mandatory, if client driver owns | ||
| 103 | * the power_zone memory. | ||
| 104 | * | ||
| 105 | * This structure defines zone callbacks to be implemented by client drivers. | ||
| 106 | * Client drives can define both energy and power related callbacks. But at | ||
| 107 | * the least one type (either power or energy) is mandatory. Client drivers | ||
| 108 | * should handle mutual exclusion, if required in callbacks. | ||
| 109 | */ | ||
| 110 | struct powercap_zone_ops { | ||
| 111 | int (*get_max_energy_range_uj) (struct powercap_zone *, u64 *); | ||
| 112 | int (*get_energy_uj) (struct powercap_zone *, u64 *); | ||
| 113 | int (*reset_energy_uj) (struct powercap_zone *); | ||
| 114 | int (*get_max_power_range_uw) (struct powercap_zone *, u64 *); | ||
| 115 | int (*get_power_uw) (struct powercap_zone *, u64 *); | ||
| 116 | int (*set_enable) (struct powercap_zone *, bool mode); | ||
| 117 | int (*get_enable) (struct powercap_zone *, bool *mode); | ||
| 118 | int (*release) (struct powercap_zone *); | ||
| 119 | }; | ||
| 120 | |||
| 121 | #define POWERCAP_ZONE_MAX_ATTRS 6 | ||
| 122 | #define POWERCAP_CONSTRAINTS_ATTRS 8 | ||
| 123 | #define MAX_CONSTRAINTS_PER_ZONE 10 | ||
| 124 | /** | ||
| 125 | * struct powercap_zone- Defines instance of a power cap zone | ||
| 126 | * @id: Unique id | ||
| 127 | * @name: Power zone name. | ||
| 128 | * @control_type_inst: Control type instance for this zone. | ||
| 129 | * @ops: Pointer to the zone operation structure. | ||
| 130 | * @dev: Instance of a device. | ||
| 131 | * @const_id_cnt: Number of constraint defined. | ||
| 132 | * @idr: Instance to an idr entry for children zones. | ||
| 133 | * @parent_idr: To remove reference from the parent idr. | ||
| 134 | * @private_data: Private data pointer if any for this zone. | ||
| 135 | * @zone_dev_attrs: Attributes associated with this device. | ||
| 136 | * @zone_attr_count: Attribute count. | ||
| 137 | * @dev_zone_attr_group: Attribute group for attributes. | ||
| 138 | * @dev_attr_groups: Attribute group store to register with device. | ||
| 139 | * @allocated: This is possible that client owns the memory | ||
| 140 | * used by this structure. In this case | ||
| 141 | * this flag is set to false by framework to | ||
| 142 | * prevent deallocation during release process. | ||
| 143 | * Otherwise this flag is set to true. | ||
| 144 | * @constraint_ptr: List of constraints for this zone. | ||
| 145 | * | ||
| 146 | * This defines a power zone instance. The fields of this structure are | ||
| 147 | * private, and should not be used by client drivers. | ||
| 148 | */ | ||
| 149 | struct powercap_zone { | ||
| 150 | int id; | ||
| 151 | char *name; | ||
| 152 | void *control_type_inst; | ||
| 153 | const struct powercap_zone_ops *ops; | ||
| 154 | struct device dev; | ||
| 155 | int const_id_cnt; | ||
| 156 | struct idr idr; | ||
| 157 | struct idr *parent_idr; | ||
| 158 | void *private_data; | ||
| 159 | struct attribute **zone_dev_attrs; | ||
| 160 | int zone_attr_count; | ||
| 161 | struct attribute_group dev_zone_attr_group; | ||
| 162 | const struct attribute_group *dev_attr_groups[2]; /* 1 group + NULL */ | ||
| 163 | bool allocated; | ||
| 164 | struct powercap_zone_constraint *constraints; | ||
| 165 | }; | ||
| 166 | |||
| 167 | /** | ||
| 168 | * struct powercap_zone_constraint_ops - Define constraint callbacks | ||
| 169 | * @set_power_limit_uw: Set power limit in micro-watts. | ||
| 170 | * @get_power_limit_uw: Get power limit in micro-watts. | ||
| 171 | * @set_time_window_us: Set time window in micro-seconds. | ||
| 172 | * @get_time_window_us: Get time window in micro-seconds. | ||
| 173 | * @get_max_power_uw: Get max power allowed in micro-watts. | ||
| 174 | * @get_min_power_uw: Get min power allowed in micro-watts. | ||
| 175 | * @get_max_time_window_us: Get max time window allowed in micro-seconds. | ||
| 176 | * @get_min_time_window_us: Get min time window allowed in micro-seconds. | ||
| 177 | * @get_name: Get the name of constraint | ||
| 178 | * | ||
| 179 | * This structure is used to define the constraint callbacks for the client | ||
| 180 | * drivers. The following callbacks are mandatory and can't be NULL: | ||
| 181 | * set_power_limit_uw | ||
| 182 | * get_power_limit_uw | ||
| 183 | * set_time_window_us | ||
| 184 | * get_time_window_us | ||
| 185 | * get_name | ||
| 186 | * Client drivers should handle mutual exclusion, if required in callbacks. | ||
| 187 | */ | ||
| 188 | struct powercap_zone_constraint_ops { | ||
| 189 | int (*set_power_limit_uw) (struct powercap_zone *, int, u64); | ||
| 190 | int (*get_power_limit_uw) (struct powercap_zone *, int, u64 *); | ||
| 191 | int (*set_time_window_us) (struct powercap_zone *, int, u64); | ||
| 192 | int (*get_time_window_us) (struct powercap_zone *, int, u64 *); | ||
| 193 | int (*get_max_power_uw) (struct powercap_zone *, int, u64 *); | ||
| 194 | int (*get_min_power_uw) (struct powercap_zone *, int, u64 *); | ||
| 195 | int (*get_max_time_window_us) (struct powercap_zone *, int, u64 *); | ||
| 196 | int (*get_min_time_window_us) (struct powercap_zone *, int, u64 *); | ||
| 197 | const char *(*get_name) (struct powercap_zone *, int); | ||
| 198 | }; | ||
| 199 | |||
| 200 | /** | ||
| 201 | * struct powercap_zone_constraint- Defines instance of a constraint | ||
| 202 | * @id: Instance Id of this constraint. | ||
| 203 | * @power_zone: Pointer to the power zone for this constraint. | ||
| 204 | * @ops: Pointer to the constraint callbacks. | ||
| 205 | * | ||
| 206 | * This defines a constraint instance. | ||
| 207 | */ | ||
| 208 | struct powercap_zone_constraint { | ||
| 209 | int id; | ||
| 210 | struct powercap_zone *power_zone; | ||
| 211 | struct powercap_zone_constraint_ops *ops; | ||
| 212 | }; | ||
| 213 | |||
| 214 | |||
| 215 | /* For clients to get their device pointer, may be used for dev_dbgs */ | ||
| 216 | #define POWERCAP_GET_DEV(power_zone) (&power_zone->dev) | ||
| 217 | |||
| 218 | /** | ||
| 219 | * powercap_set_zone_data() - Set private data for a zone | ||
| 220 | * @power_zone: A pointer to the valid zone instance. | ||
| 221 | * @pdata: A pointer to the user private data. | ||
| 222 | * | ||
| 223 | * Allows client drivers to associate some private data to zone instance. | ||
| 224 | */ | ||
| 225 | static inline void powercap_set_zone_data(struct powercap_zone *power_zone, | ||
| 226 | void *pdata) | ||
| 227 | { | ||
| 228 | if (power_zone) | ||
| 229 | power_zone->private_data = pdata; | ||
| 230 | } | ||
| 231 | |||
| 232 | /** | ||
| 233 | * powercap_get_zone_data() - Get private data for a zone | ||
| 234 | * @power_zone: A pointer to the valid zone instance. | ||
| 235 | * | ||
| 236 | * Allows client drivers to get private data associate with a zone, | ||
| 237 | * using call to powercap_set_zone_data. | ||
| 238 | */ | ||
| 239 | static inline void *powercap_get_zone_data(struct powercap_zone *power_zone) | ||
| 240 | { | ||
| 241 | if (power_zone) | ||
| 242 | return power_zone->private_data; | ||
| 243 | return NULL; | ||
| 244 | } | ||
| 245 | |||
| 246 | /** | ||
| 247 | * powercap_register_control_type() - Register a control_type with framework | ||
| 248 | * @control_type: Pointer to client allocated memory for the control type | ||
| 249 | * structure storage. If this is NULL, powercap framework | ||
| 250 | * will allocate memory and own it. | ||
| 251 | * Advantage of this parameter is that client can embed | ||
| 252 | * this data in its data structures and allocate in a | ||
| 253 | * single call, preventing multiple allocations. | ||
| 254 | * @control_type_name: The Name of this control_type, which will be shown | ||
| 255 | * in the sysfs Interface. | ||
| 256 | * @ops: Callbacks for control type. This parameter is optional. | ||
| 257 | * | ||
| 258 | * Used to create a control_type with the power capping class. Here control_type | ||
| 259 | * can represent a type of technology, which can control a range of power zones. | ||
| 260 | * For example a control_type can be RAPL (Running Average Power Limit) | ||
| 261 | * Intel® 64 and IA-32 Processor Architectures. The name can be any string | ||
| 262 | * which must be unique, otherwise this function returns NULL. | ||
| 263 | * A pointer to the control_type instance is returned on success. | ||
| 264 | */ | ||
| 265 | struct powercap_control_type *powercap_register_control_type( | ||
| 266 | struct powercap_control_type *control_type, | ||
| 267 | const char *name, | ||
| 268 | const struct powercap_control_type_ops *ops); | ||
| 269 | |||
| 270 | /** | ||
| 271 | * powercap_unregister_control_type() - Unregister a control_type from framework | ||
| 272 | * @instance: A pointer to the valid control_type instance. | ||
| 273 | * | ||
| 274 | * Used to unregister a control_type with the power capping class. | ||
| 275 | * All power zones registered under this control type have to be unregistered | ||
| 276 | * before calling this function, or it will fail with an error code. | ||
| 277 | */ | ||
| 278 | int powercap_unregister_control_type(struct powercap_control_type *instance); | ||
| 279 | |||
| 280 | /* Zone register/unregister API */ | ||
| 281 | |||
| 282 | /** | ||
| 283 | * powercap_register_zone() - Register a power zone | ||
| 284 | * @power_zone: Pointer to client allocated memory for the power zone structure | ||
| 285 | * storage. If this is NULL, powercap framework will allocate | ||
| 286 | * memory and own it. Advantage of this parameter is that client | ||
| 287 | * can embed this data in its data structures and allocate in a | ||
| 288 | * single call, preventing multiple allocations. | ||
| 289 | * @control_type: A control_type instance under which this zone operates. | ||
| 290 | * @name: A name for this zone. | ||
| 291 | * @parent: A pointer to the parent power zone instance if any or NULL | ||
| 292 | * @ops: Pointer to zone operation callback structure. | ||
| 293 | * @no_constraints: Number of constraints for this zone | ||
| 294 | * @const_ops: Pointer to constraint callback structure | ||
| 295 | * | ||
| 296 | * Register a power zone under a given control type. A power zone must register | ||
| 297 | * a pointer to a structure representing zone callbacks. | ||
| 298 | * A power zone can be located under a parent power zone, in which case @parent | ||
| 299 | * should point to it. Otherwise, if @parent is NULL, the new power zone will | ||
| 300 | * be located directly under the given control type | ||
| 301 | * For each power zone there may be a number of constraints that appear in the | ||
| 302 | * sysfs under that zone as attributes with unique numeric IDs. | ||
| 303 | * Returns pointer to the power_zone on success. | ||
| 304 | */ | ||
| 305 | struct powercap_zone *powercap_register_zone( | ||
| 306 | struct powercap_zone *power_zone, | ||
| 307 | struct powercap_control_type *control_type, | ||
| 308 | const char *name, | ||
| 309 | struct powercap_zone *parent, | ||
| 310 | const struct powercap_zone_ops *ops, | ||
| 311 | int nr_constraints, | ||
| 312 | struct powercap_zone_constraint_ops *const_ops); | ||
| 313 | |||
| 314 | /** | ||
| 315 | * powercap_unregister_zone() - Unregister a zone device | ||
| 316 | * @control_type: A pointer to the valid instance of a control_type. | ||
| 317 | * @power_zone: A pointer to the valid zone instance for a control_type | ||
| 318 | * | ||
| 319 | * Used to unregister a zone device for a control_type. Caller should | ||
| 320 | * make sure that children for this zone are unregistered first. | ||
| 321 | */ | ||
| 322 | int powercap_unregister_zone(struct powercap_control_type *control_type, | ||
| 323 | struct powercap_zone *power_zone); | ||
| 324 | |||
| 325 | #endif | ||
diff --git a/include/linux/random.h b/include/linux/random.h index 3b9377d6b7a5..6312dd9ba449 100644 --- a/include/linux/random.h +++ b/include/linux/random.h | |||
| @@ -17,6 +17,7 @@ extern void add_interrupt_randomness(int irq, int irq_flags); | |||
| 17 | extern void get_random_bytes(void *buf, int nbytes); | 17 | extern void get_random_bytes(void *buf, int nbytes); |
| 18 | extern void get_random_bytes_arch(void *buf, int nbytes); | 18 | extern void get_random_bytes_arch(void *buf, int nbytes); |
| 19 | void generate_random_uuid(unsigned char uuid_out[16]); | 19 | void generate_random_uuid(unsigned char uuid_out[16]); |
| 20 | extern int random_int_secret_init(void); | ||
| 20 | 21 | ||
| 21 | #ifndef MODULE | 22 | #ifndef MODULE |
| 22 | extern const struct file_operations random_fops, urandom_fops; | 23 | extern const struct file_operations random_fops, urandom_fops; |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 6682da36b293..e27baeeda3f4 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1394,11 +1394,10 @@ struct task_struct { | |||
| 1394 | } memcg_batch; | 1394 | } memcg_batch; |
| 1395 | unsigned int memcg_kmem_skip_account; | 1395 | unsigned int memcg_kmem_skip_account; |
| 1396 | struct memcg_oom_info { | 1396 | struct memcg_oom_info { |
| 1397 | struct mem_cgroup *memcg; | ||
| 1398 | gfp_t gfp_mask; | ||
| 1399 | int order; | ||
| 1397 | unsigned int may_oom:1; | 1400 | unsigned int may_oom:1; |
| 1398 | unsigned int in_memcg_oom:1; | ||
| 1399 | unsigned int oom_locked:1; | ||
| 1400 | int wakeups; | ||
| 1401 | struct mem_cgroup *wait_on_memcg; | ||
| 1402 | } memcg_oom; | 1401 | } memcg_oom; |
| 1403 | #endif | 1402 | #endif |
| 1404 | #ifdef CONFIG_UPROBES | 1403 | #ifdef CONFIG_UPROBES |
diff --git a/include/linux/timex.h b/include/linux/timex.h index dd3edd7dfc94..9d3f1a5b6178 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h | |||
| @@ -64,6 +64,20 @@ | |||
| 64 | 64 | ||
| 65 | #include <asm/timex.h> | 65 | #include <asm/timex.h> |
| 66 | 66 | ||
| 67 | #ifndef random_get_entropy | ||
| 68 | /* | ||
| 69 | * The random_get_entropy() function is used by the /dev/random driver | ||
| 70 | * in order to extract entropy via the relative unpredictability of | ||
| 71 | * when an interrupt takes places versus a high speed, fine-grained | ||
| 72 | * timing source or cycle counter. Since it will be occurred on every | ||
| 73 | * single interrupt, it must have a very low cost/overhead. | ||
| 74 | * | ||
| 75 | * By default we use get_cycles() for this purpose, but individual | ||
| 76 | * architectures may override this in their asm/timex.h header file. | ||
| 77 | */ | ||
| 78 | #define random_get_entropy() get_cycles() | ||
| 79 | #endif | ||
| 80 | |||
| 67 | /* | 81 | /* |
| 68 | * SHIFT_PLL is used as a dampening factor to define how much we | 82 | * SHIFT_PLL is used as a dampening factor to define how much we |
| 69 | * adjust the frequency correction for a given offset in PLL mode. | 83 | * adjust the frequency correction for a given offset in PLL mode. |
diff --git a/include/linux/usb/usb_phy_gen_xceiv.h b/include/linux/usb/usb_phy_gen_xceiv.h index f9a7e7bc925b..11d85b9c1b08 100644 --- a/include/linux/usb/usb_phy_gen_xceiv.h +++ b/include/linux/usb/usb_phy_gen_xceiv.h | |||
| @@ -12,7 +12,7 @@ struct usb_phy_gen_xceiv_platform_data { | |||
| 12 | unsigned int needs_reset:1; | 12 | unsigned int needs_reset:1; |
| 13 | }; | 13 | }; |
| 14 | 14 | ||
| 15 | #if IS_ENABLED(CONFIG_NOP_USB_XCEIV) | 15 | #if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) |
| 16 | /* sometimes transceivers are accessed only through e.g. ULPI */ | 16 | /* sometimes transceivers are accessed only through e.g. ULPI */ |
| 17 | extern void usb_nop_xceiv_register(void); | 17 | extern void usb_nop_xceiv_register(void); |
| 18 | extern void usb_nop_xceiv_unregister(void); | 18 | extern void usb_nop_xceiv_unregister(void); |
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h index bf99cd01be20..630356866030 100644 --- a/include/linux/usb_usual.h +++ b/include/linux/usb_usual.h | |||
| @@ -66,7 +66,9 @@ | |||
| 66 | US_FLAG(INITIAL_READ10, 0x00100000) \ | 66 | US_FLAG(INITIAL_READ10, 0x00100000) \ |
| 67 | /* Initial READ(10) (and others) must be retried */ \ | 67 | /* Initial READ(10) (and others) must be retried */ \ |
| 68 | US_FLAG(WRITE_CACHE, 0x00200000) \ | 68 | US_FLAG(WRITE_CACHE, 0x00200000) \ |
| 69 | /* Write Cache status is not available */ | 69 | /* Write Cache status is not available */ \ |
| 70 | US_FLAG(NEEDS_CAP16, 0x00400000) | ||
| 71 | /* cannot handle READ_CAPACITY_10 */ | ||
| 70 | 72 | ||
| 71 | #define US_FLAG(name, value) US_FL_##name = value , | 73 | #define US_FLAG(name, value) US_FL_##name = value , |
| 72 | enum { US_DO_ALL_FLAGS }; | 74 | enum { US_DO_ALL_FLAGS }; |
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index 80cf8173a65b..2c02f3a8d2ba 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h | |||
| @@ -65,15 +65,8 @@ struct pci_dev; | |||
| 65 | * out of the arbitration process (and can be safe to take | 65 | * out of the arbitration process (and can be safe to take |
| 66 | * interrupts at any time. | 66 | * interrupts at any time. |
| 67 | */ | 67 | */ |
| 68 | #if defined(CONFIG_VGA_ARB) | ||
| 69 | extern void vga_set_legacy_decoding(struct pci_dev *pdev, | 68 | extern void vga_set_legacy_decoding(struct pci_dev *pdev, |
| 70 | unsigned int decodes); | 69 | unsigned int decodes); |
| 71 | #else | ||
| 72 | static inline void vga_set_legacy_decoding(struct pci_dev *pdev, | ||
| 73 | unsigned int decodes) | ||
| 74 | { | ||
| 75 | } | ||
| 76 | #endif | ||
| 77 | 70 | ||
| 78 | /** | 71 | /** |
| 79 | * vga_get - acquire & locks VGA resources | 72 | * vga_get - acquire & locks VGA resources |
diff --git a/include/linux/yam.h b/include/linux/yam.h index 7fe28228b274..512cdc2fb80f 100644 --- a/include/linux/yam.h +++ b/include/linux/yam.h | |||
| @@ -77,6 +77,6 @@ struct yamdrv_ioctl_cfg { | |||
| 77 | 77 | ||
| 78 | struct yamdrv_ioctl_mcs { | 78 | struct yamdrv_ioctl_mcs { |
| 79 | int cmd; | 79 | int cmd; |
| 80 | int bitrate; | 80 | unsigned int bitrate; |
| 81 | unsigned char bits[YAM_FPGA_SIZE]; | 81 | unsigned char bits[YAM_FPGA_SIZE]; |
| 82 | }; | 82 | }; |
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h index a7a683e30b64..a8c2ef6d3b93 100644 --- a/include/net/cipso_ipv4.h +++ b/include/net/cipso_ipv4.h | |||
| @@ -290,6 +290,7 @@ static inline int cipso_v4_validate(const struct sk_buff *skb, | |||
| 290 | unsigned char err_offset = 0; | 290 | unsigned char err_offset = 0; |
| 291 | u8 opt_len = opt[1]; | 291 | u8 opt_len = opt[1]; |
| 292 | u8 opt_iter; | 292 | u8 opt_iter; |
| 293 | u8 tag_len; | ||
| 293 | 294 | ||
| 294 | if (opt_len < 8) { | 295 | if (opt_len < 8) { |
| 295 | err_offset = 1; | 296 | err_offset = 1; |
| @@ -302,11 +303,12 @@ static inline int cipso_v4_validate(const struct sk_buff *skb, | |||
| 302 | } | 303 | } |
| 303 | 304 | ||
| 304 | for (opt_iter = 6; opt_iter < opt_len;) { | 305 | for (opt_iter = 6; opt_iter < opt_len;) { |
| 305 | if (opt[opt_iter + 1] > (opt_len - opt_iter)) { | 306 | tag_len = opt[opt_iter + 1]; |
| 307 | if ((tag_len == 0) || (opt[opt_iter + 1] > (opt_len - opt_iter))) { | ||
| 306 | err_offset = opt_iter + 1; | 308 | err_offset = opt_iter + 1; |
| 307 | goto out; | 309 | goto out; |
| 308 | } | 310 | } |
| 309 | opt_iter += opt[opt_iter + 1]; | 311 | opt_iter += tag_len; |
| 310 | } | 312 | } |
| 311 | 313 | ||
| 312 | out: | 314 | out: |
diff --git a/include/net/dst.h b/include/net/dst.h index 3bc4865f8267..3c4c944096c9 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
| @@ -479,10 +479,22 @@ static inline struct dst_entry *xfrm_lookup(struct net *net, | |||
| 479 | { | 479 | { |
| 480 | return dst_orig; | 480 | return dst_orig; |
| 481 | } | 481 | } |
| 482 | |||
| 483 | static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst) | ||
| 484 | { | ||
| 485 | return NULL; | ||
| 486 | } | ||
| 487 | |||
| 482 | #else | 488 | #else |
| 483 | extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, | 489 | extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, |
| 484 | const struct flowi *fl, struct sock *sk, | 490 | const struct flowi *fl, struct sock *sk, |
| 485 | int flags); | 491 | int flags); |
| 492 | |||
| 493 | /* skb attached with this dst needs transformation if dst->xfrm is valid */ | ||
| 494 | static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst) | ||
| 495 | { | ||
| 496 | return dst->xfrm; | ||
| 497 | } | ||
| 486 | #endif | 498 | #endif |
| 487 | 499 | ||
| 488 | #endif /* _NET_DST_H */ | 500 | #endif /* _NET_DST_H */ |
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index f525e7038cca..2b786b7e3585 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
| @@ -194,11 +194,9 @@ static inline int ip6_skb_dst_mtu(struct sk_buff *skb) | |||
| 194 | skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb)); | 194 | skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb)); |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, struct in6_addr *dest) | 197 | static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt) |
| 198 | { | 198 | { |
| 199 | if (rt->rt6i_flags & RTF_GATEWAY) | 199 | return &rt->rt6i_gateway; |
| 200 | return &rt->rt6i_gateway; | ||
| 201 | return dest; | ||
| 202 | } | 200 | } |
| 203 | 201 | ||
| 204 | #endif | 202 | #endif |
diff --git a/include/net/mac802154.h b/include/net/mac802154.h index d0d11df9cba1..807d6b7a943f 100644 --- a/include/net/mac802154.h +++ b/include/net/mac802154.h | |||
| @@ -133,7 +133,7 @@ struct ieee802154_ops { | |||
| 133 | 133 | ||
| 134 | /* Basic interface to register ieee802154 device */ | 134 | /* Basic interface to register ieee802154 device */ |
| 135 | struct ieee802154_dev * | 135 | struct ieee802154_dev * |
| 136 | ieee802154_alloc_device(size_t priv_data_lex, struct ieee802154_ops *ops); | 136 | ieee802154_alloc_device(size_t priv_data_len, struct ieee802154_ops *ops); |
| 137 | void ieee802154_free_device(struct ieee802154_dev *dev); | 137 | void ieee802154_free_device(struct ieee802154_dev *dev); |
| 138 | int ieee802154_register_device(struct ieee802154_dev *dev); | 138 | int ieee802154_register_device(struct ieee802154_dev *dev); |
| 139 | void ieee802154_unregister_device(struct ieee802154_dev *dev); | 139 | void ieee802154_unregister_device(struct ieee802154_dev *dev); |
diff --git a/include/net/sock.h b/include/net/sock.h index 1d37a8086bed..808cbc2ec6c1 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -1630,16 +1630,14 @@ static inline void sk_filter_release(struct sk_filter *fp) | |||
| 1630 | 1630 | ||
| 1631 | static inline void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp) | 1631 | static inline void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp) |
| 1632 | { | 1632 | { |
| 1633 | unsigned int size = sk_filter_len(fp); | 1633 | atomic_sub(sk_filter_size(fp->len), &sk->sk_omem_alloc); |
| 1634 | |||
| 1635 | atomic_sub(size, &sk->sk_omem_alloc); | ||
| 1636 | sk_filter_release(fp); | 1634 | sk_filter_release(fp); |
| 1637 | } | 1635 | } |
| 1638 | 1636 | ||
| 1639 | static inline void sk_filter_charge(struct sock *sk, struct sk_filter *fp) | 1637 | static inline void sk_filter_charge(struct sock *sk, struct sk_filter *fp) |
| 1640 | { | 1638 | { |
| 1641 | atomic_inc(&fp->refcnt); | 1639 | atomic_inc(&fp->refcnt); |
| 1642 | atomic_add(sk_filter_len(fp), &sk->sk_omem_alloc); | 1640 | atomic_add(sk_filter_size(fp->len), &sk->sk_omem_alloc); |
| 1643 | } | 1641 | } |
| 1644 | 1642 | ||
| 1645 | /* | 1643 | /* |
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h index fe66533e9b7a..fb0a312bcb81 100644 --- a/include/sound/rcar_snd.h +++ b/include/sound/rcar_snd.h | |||
| @@ -68,6 +68,7 @@ struct rsnd_scu_platform_info { | |||
| 68 | * | 68 | * |
| 69 | * A : generation | 69 | * A : generation |
| 70 | */ | 70 | */ |
| 71 | #define RSND_GEN_MASK (0xF << 0) | ||
| 71 | #define RSND_GEN1 (1 << 0) /* fixme */ | 72 | #define RSND_GEN1 (1 << 0) /* fixme */ |
| 72 | #define RSND_GEN2 (2 << 0) /* fixme */ | 73 | #define RSND_GEN2 (2 << 0) /* fixme */ |
| 73 | 74 | ||
diff --git a/include/trace/events/target.h b/include/trace/events/target.h index aef8fc354025..da9cc0f05c93 100644 --- a/include/trace/events/target.h +++ b/include/trace/events/target.h | |||
| @@ -144,7 +144,7 @@ TRACE_EVENT(target_sequencer_start, | |||
| 144 | ), | 144 | ), |
| 145 | 145 | ||
| 146 | TP_fast_assign( | 146 | TP_fast_assign( |
| 147 | __entry->unpacked_lun = cmd->se_lun->unpacked_lun; | 147 | __entry->unpacked_lun = cmd->orig_fe_lun; |
| 148 | __entry->opcode = cmd->t_task_cdb[0]; | 148 | __entry->opcode = cmd->t_task_cdb[0]; |
| 149 | __entry->data_length = cmd->data_length; | 149 | __entry->data_length = cmd->data_length; |
| 150 | __entry->task_attribute = cmd->sam_task_attr; | 150 | __entry->task_attribute = cmd->sam_task_attr; |
| @@ -182,7 +182,7 @@ TRACE_EVENT(target_cmd_complete, | |||
| 182 | ), | 182 | ), |
| 183 | 183 | ||
| 184 | TP_fast_assign( | 184 | TP_fast_assign( |
| 185 | __entry->unpacked_lun = cmd->se_lun->unpacked_lun; | 185 | __entry->unpacked_lun = cmd->orig_fe_lun; |
| 186 | __entry->opcode = cmd->t_task_cdb[0]; | 186 | __entry->opcode = cmd->t_task_cdb[0]; |
| 187 | __entry->data_length = cmd->data_length; | 187 | __entry->data_length = cmd->data_length; |
| 188 | __entry->task_attribute = cmd->sam_task_attr; | 188 | __entry->task_attribute = cmd->sam_task_attr; |
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 550811712f78..28acbaf4a81e 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h | |||
| @@ -223,6 +223,8 @@ struct drm_mode_get_connector { | |||
| 223 | __u32 connection; | 223 | __u32 connection; |
| 224 | __u32 mm_width, mm_height; /**< HxW in millimeters */ | 224 | __u32 mm_width, mm_height; /**< HxW in millimeters */ |
| 225 | __u32 subpixel; | 225 | __u32 subpixel; |
| 226 | |||
| 227 | __u32 pad; | ||
| 226 | }; | 228 | }; |
| 227 | 229 | ||
| 228 | #define DRM_MODE_PROP_PENDING (1<<0) | 230 | #define DRM_MODE_PROP_PENDING (1<<0) |
diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild index 0623ec4e728f..56f121605c99 100644 --- a/include/uapi/linux/tc_act/Kbuild +++ b/include/uapi/linux/tc_act/Kbuild | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | # UAPI Header export list | 1 | # UAPI Header export list |
| 2 | header-y += tc_csum.h | 2 | header-y += tc_csum.h |
| 3 | header-y += tc_defact.h | ||
| 3 | header-y += tc_gact.h | 4 | header-y += tc_gact.h |
| 4 | header-y += tc_ipt.h | 5 | header-y += tc_ipt.h |
| 5 | header-y += tc_mirred.h | 6 | header-y += tc_mirred.h |
diff --git a/include/linux/tc_act/tc_defact.h b/include/uapi/linux/tc_act/tc_defact.h index 6f65d07c7ce2..17dddb40f740 100644 --- a/include/linux/tc_act/tc_defact.h +++ b/include/uapi/linux/tc_act/tc_defact.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | struct tc_defact { | 6 | struct tc_defact { |
| 7 | tc_gen; | 7 | tc_gen; |
| 8 | }; | 8 | }; |
| 9 | 9 | ||
| 10 | enum { | 10 | enum { |
| 11 | TCA_DEF_UNSPEC, | 11 | TCA_DEF_UNSPEC, |
| 12 | TCA_DEF_TM, | 12 | TCA_DEF_TM, |
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h index 0b233c56b0e4..e3ddd86c90a6 100644 --- a/include/uapi/rdma/ib_user_verbs.h +++ b/include/uapi/rdma/ib_user_verbs.h | |||
| @@ -87,8 +87,10 @@ enum { | |||
| 87 | IB_USER_VERBS_CMD_CLOSE_XRCD, | 87 | IB_USER_VERBS_CMD_CLOSE_XRCD, |
| 88 | IB_USER_VERBS_CMD_CREATE_XSRQ, | 88 | IB_USER_VERBS_CMD_CREATE_XSRQ, |
| 89 | IB_USER_VERBS_CMD_OPEN_QP, | 89 | IB_USER_VERBS_CMD_OPEN_QP, |
| 90 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 90 | IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD, | 91 | IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD, |
| 91 | IB_USER_VERBS_CMD_DESTROY_FLOW | 92 | IB_USER_VERBS_CMD_DESTROY_FLOW |
| 93 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 92 | }; | 94 | }; |
| 93 | 95 | ||
| 94 | /* | 96 | /* |
| @@ -126,6 +128,7 @@ struct ib_uverbs_cmd_hdr { | |||
| 126 | __u16 out_words; | 128 | __u16 out_words; |
| 127 | }; | 129 | }; |
| 128 | 130 | ||
| 131 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 129 | struct ib_uverbs_cmd_hdr_ex { | 132 | struct ib_uverbs_cmd_hdr_ex { |
| 130 | __u32 command; | 133 | __u32 command; |
| 131 | __u16 in_words; | 134 | __u16 in_words; |
| @@ -134,6 +137,7 @@ struct ib_uverbs_cmd_hdr_ex { | |||
| 134 | __u16 provider_out_words; | 137 | __u16 provider_out_words; |
| 135 | __u32 cmd_hdr_reserved; | 138 | __u32 cmd_hdr_reserved; |
| 136 | }; | 139 | }; |
| 140 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 137 | 141 | ||
| 138 | struct ib_uverbs_get_context { | 142 | struct ib_uverbs_get_context { |
| 139 | __u64 response; | 143 | __u64 response; |
| @@ -696,6 +700,7 @@ struct ib_uverbs_detach_mcast { | |||
| 696 | __u64 driver_data[0]; | 700 | __u64 driver_data[0]; |
| 697 | }; | 701 | }; |
| 698 | 702 | ||
| 703 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 699 | struct ib_kern_eth_filter { | 704 | struct ib_kern_eth_filter { |
| 700 | __u8 dst_mac[6]; | 705 | __u8 dst_mac[6]; |
| 701 | __u8 src_mac[6]; | 706 | __u8 src_mac[6]; |
| @@ -780,6 +785,7 @@ struct ib_uverbs_destroy_flow { | |||
| 780 | __u32 comp_mask; | 785 | __u32 comp_mask; |
| 781 | __u32 flow_handle; | 786 | __u32 flow_handle; |
| 782 | }; | 787 | }; |
| 788 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 783 | 789 | ||
| 784 | struct ib_uverbs_create_srq { | 790 | struct ib_uverbs_create_srq { |
| 785 | __u64 response; | 791 | __u64 response; |
diff --git a/init/main.c b/init/main.c index af310afbef28..63d3e8f2970c 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -76,6 +76,7 @@ | |||
| 76 | #include <linux/elevator.h> | 76 | #include <linux/elevator.h> |
| 77 | #include <linux/sched_clock.h> | 77 | #include <linux/sched_clock.h> |
| 78 | #include <linux/context_tracking.h> | 78 | #include <linux/context_tracking.h> |
| 79 | #include <linux/random.h> | ||
| 79 | 80 | ||
| 80 | #include <asm/io.h> | 81 | #include <asm/io.h> |
| 81 | #include <asm/bugs.h> | 82 | #include <asm/bugs.h> |
| @@ -780,6 +781,7 @@ static void __init do_basic_setup(void) | |||
| 780 | do_ctors(); | 781 | do_ctors(); |
| 781 | usermodehelper_enable(); | 782 | usermodehelper_enable(); |
| 782 | do_initcalls(); | 783 | do_initcalls(); |
| 784 | random_int_secret_init(); | ||
| 783 | } | 785 | } |
| 784 | 786 | ||
| 785 | static void __init do_pre_smp_initcalls(void) | 787 | static void __init do_pre_smp_initcalls(void) |
| @@ -1282,6 +1282,12 @@ static int semctl_setval(struct ipc_namespace *ns, int semid, int semnum, | |||
| 1282 | 1282 | ||
| 1283 | sem_lock(sma, NULL, -1); | 1283 | sem_lock(sma, NULL, -1); |
| 1284 | 1284 | ||
| 1285 | if (sma->sem_perm.deleted) { | ||
| 1286 | sem_unlock(sma, -1); | ||
| 1287 | rcu_read_unlock(); | ||
| 1288 | return -EIDRM; | ||
| 1289 | } | ||
| 1290 | |||
| 1285 | curr = &sma->sem_base[semnum]; | 1291 | curr = &sma->sem_base[semnum]; |
| 1286 | 1292 | ||
| 1287 | ipc_assert_locked_object(&sma->sem_perm); | 1293 | ipc_assert_locked_object(&sma->sem_perm); |
| @@ -1336,12 +1342,14 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum, | |||
| 1336 | int i; | 1342 | int i; |
| 1337 | 1343 | ||
| 1338 | sem_lock(sma, NULL, -1); | 1344 | sem_lock(sma, NULL, -1); |
| 1345 | if (sma->sem_perm.deleted) { | ||
| 1346 | err = -EIDRM; | ||
| 1347 | goto out_unlock; | ||
| 1348 | } | ||
| 1339 | if(nsems > SEMMSL_FAST) { | 1349 | if(nsems > SEMMSL_FAST) { |
| 1340 | if (!ipc_rcu_getref(sma)) { | 1350 | if (!ipc_rcu_getref(sma)) { |
| 1341 | sem_unlock(sma, -1); | ||
| 1342 | rcu_read_unlock(); | ||
| 1343 | err = -EIDRM; | 1351 | err = -EIDRM; |
| 1344 | goto out_free; | 1352 | goto out_unlock; |
| 1345 | } | 1353 | } |
| 1346 | sem_unlock(sma, -1); | 1354 | sem_unlock(sma, -1); |
| 1347 | rcu_read_unlock(); | 1355 | rcu_read_unlock(); |
| @@ -1354,10 +1362,8 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum, | |||
| 1354 | rcu_read_lock(); | 1362 | rcu_read_lock(); |
| 1355 | sem_lock_and_putref(sma); | 1363 | sem_lock_and_putref(sma); |
| 1356 | if (sma->sem_perm.deleted) { | 1364 | if (sma->sem_perm.deleted) { |
| 1357 | sem_unlock(sma, -1); | ||
| 1358 | rcu_read_unlock(); | ||
| 1359 | err = -EIDRM; | 1365 | err = -EIDRM; |
| 1360 | goto out_free; | 1366 | goto out_unlock; |
| 1361 | } | 1367 | } |
| 1362 | } | 1368 | } |
| 1363 | for (i = 0; i < sma->sem_nsems; i++) | 1369 | for (i = 0; i < sma->sem_nsems; i++) |
| @@ -1375,8 +1381,8 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum, | |||
| 1375 | struct sem_undo *un; | 1381 | struct sem_undo *un; |
| 1376 | 1382 | ||
| 1377 | if (!ipc_rcu_getref(sma)) { | 1383 | if (!ipc_rcu_getref(sma)) { |
| 1378 | rcu_read_unlock(); | 1384 | err = -EIDRM; |
| 1379 | return -EIDRM; | 1385 | goto out_rcu_wakeup; |
| 1380 | } | 1386 | } |
| 1381 | rcu_read_unlock(); | 1387 | rcu_read_unlock(); |
| 1382 | 1388 | ||
| @@ -1404,10 +1410,8 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum, | |||
| 1404 | rcu_read_lock(); | 1410 | rcu_read_lock(); |
| 1405 | sem_lock_and_putref(sma); | 1411 | sem_lock_and_putref(sma); |
| 1406 | if (sma->sem_perm.deleted) { | 1412 | if (sma->sem_perm.deleted) { |
| 1407 | sem_unlock(sma, -1); | ||
| 1408 | rcu_read_unlock(); | ||
| 1409 | err = -EIDRM; | 1413 | err = -EIDRM; |
| 1410 | goto out_free; | 1414 | goto out_unlock; |
| 1411 | } | 1415 | } |
| 1412 | 1416 | ||
| 1413 | for (i = 0; i < nsems; i++) | 1417 | for (i = 0; i < nsems; i++) |
| @@ -1431,6 +1435,10 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum, | |||
| 1431 | goto out_rcu_wakeup; | 1435 | goto out_rcu_wakeup; |
| 1432 | 1436 | ||
| 1433 | sem_lock(sma, NULL, -1); | 1437 | sem_lock(sma, NULL, -1); |
| 1438 | if (sma->sem_perm.deleted) { | ||
| 1439 | err = -EIDRM; | ||
| 1440 | goto out_unlock; | ||
| 1441 | } | ||
| 1434 | curr = &sma->sem_base[semnum]; | 1442 | curr = &sma->sem_base[semnum]; |
| 1435 | 1443 | ||
| 1436 | switch (cmd) { | 1444 | switch (cmd) { |
| @@ -1836,6 +1844,10 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops, | |||
| 1836 | if (error) | 1844 | if (error) |
| 1837 | goto out_rcu_wakeup; | 1845 | goto out_rcu_wakeup; |
| 1838 | 1846 | ||
| 1847 | error = -EIDRM; | ||
| 1848 | locknum = sem_lock(sma, sops, nsops); | ||
| 1849 | if (sma->sem_perm.deleted) | ||
| 1850 | goto out_unlock_free; | ||
| 1839 | /* | 1851 | /* |
| 1840 | * semid identifiers are not unique - find_alloc_undo may have | 1852 | * semid identifiers are not unique - find_alloc_undo may have |
| 1841 | * allocated an undo structure, it was invalidated by an RMID | 1853 | * allocated an undo structure, it was invalidated by an RMID |
| @@ -1843,8 +1855,6 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops, | |||
| 1843 | * This case can be detected checking un->semid. The existence of | 1855 | * This case can be detected checking un->semid. The existence of |
| 1844 | * "un" itself is guaranteed by rcu. | 1856 | * "un" itself is guaranteed by rcu. |
| 1845 | */ | 1857 | */ |
| 1846 | error = -EIDRM; | ||
| 1847 | locknum = sem_lock(sma, sops, nsops); | ||
| 1848 | if (un && un->semid == -1) | 1858 | if (un && un->semid == -1) |
| 1849 | goto out_unlock_free; | 1859 | goto out_unlock_free; |
| 1850 | 1860 | ||
| @@ -2057,6 +2067,12 @@ void exit_sem(struct task_struct *tsk) | |||
| 2057 | } | 2067 | } |
| 2058 | 2068 | ||
| 2059 | sem_lock(sma, NULL, -1); | 2069 | sem_lock(sma, NULL, -1); |
| 2070 | /* exit_sem raced with IPC_RMID, nothing to do */ | ||
| 2071 | if (sma->sem_perm.deleted) { | ||
| 2072 | sem_unlock(sma, -1); | ||
| 2073 | rcu_read_unlock(); | ||
| 2074 | continue; | ||
| 2075 | } | ||
| 2060 | un = __lookup_undo(ulp, semid); | 2076 | un = __lookup_undo(ulp, semid); |
| 2061 | if (un == NULL) { | 2077 | if (un == NULL) { |
| 2062 | /* exit_sem raced with IPC_RMID+semget() that created | 2078 | /* exit_sem raced with IPC_RMID+semget() that created |
diff --git a/ipc/util.c b/ipc/util.c index fdb8ae740775..7684f41bce76 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
| @@ -17,12 +17,27 @@ | |||
| 17 | * Pavel Emelianov <xemul@openvz.org> | 17 | * Pavel Emelianov <xemul@openvz.org> |
| 18 | * | 18 | * |
| 19 | * General sysv ipc locking scheme: | 19 | * General sysv ipc locking scheme: |
| 20 | * when doing ipc id lookups, take the ids->rwsem | 20 | * rcu_read_lock() |
| 21 | * rcu_read_lock() | 21 | * obtain the ipc object (kern_ipc_perm) by looking up the id in an idr |
| 22 | * obtain the ipc object (kern_ipc_perm) | 22 | * tree. |
| 23 | * perform security, capabilities, auditing and permission checks, etc. | 23 | * - perform initial checks (capabilities, auditing and permission, |
| 24 | * acquire the ipc lock (kern_ipc_perm.lock) throught ipc_lock_object() | 24 | * etc). |
| 25 | * perform data updates (ie: SET, RMID, LOCK/UNLOCK commands) | 25 | * - perform read-only operations, such as STAT, INFO commands. |
| 26 | * acquire the ipc lock (kern_ipc_perm.lock) through | ||
| 27 | * ipc_lock_object() | ||
| 28 | * - perform data updates, such as SET, RMID commands and | ||
| 29 | * mechanism-specific operations (semop/semtimedop, | ||
| 30 | * msgsnd/msgrcv, shmat/shmdt). | ||
| 31 | * drop the ipc lock, through ipc_unlock_object(). | ||
| 32 | * rcu_read_unlock() | ||
| 33 | * | ||
| 34 | * The ids->rwsem must be taken when: | ||
| 35 | * - creating, removing and iterating the existing entries in ipc | ||
| 36 | * identifier sets. | ||
| 37 | * - iterating through files under /proc/sysvipc/ | ||
| 38 | * | ||
| 39 | * Note that sems have a special fast path that avoids kern_ipc_perm.lock - | ||
| 40 | * see sem_lock(). | ||
| 26 | */ | 41 | */ |
| 27 | 42 | ||
| 28 | #include <linux/mm.h> | 43 | #include <linux/mm.h> |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 2418b6e71a85..8bd9cfdc70d7 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -2039,7 +2039,7 @@ static int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk, | |||
| 2039 | 2039 | ||
| 2040 | /* @tsk either already exited or can't exit until the end */ | 2040 | /* @tsk either already exited or can't exit until the end */ |
| 2041 | if (tsk->flags & PF_EXITING) | 2041 | if (tsk->flags & PF_EXITING) |
| 2042 | continue; | 2042 | goto next; |
| 2043 | 2043 | ||
| 2044 | /* as per above, nr_threads may decrease, but not increase. */ | 2044 | /* as per above, nr_threads may decrease, but not increase. */ |
| 2045 | BUG_ON(i >= group_size); | 2045 | BUG_ON(i >= group_size); |
| @@ -2047,7 +2047,7 @@ static int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk, | |||
| 2047 | ent.cgrp = task_cgroup_from_root(tsk, root); | 2047 | ent.cgrp = task_cgroup_from_root(tsk, root); |
| 2048 | /* nothing to do if this task is already in the cgroup */ | 2048 | /* nothing to do if this task is already in the cgroup */ |
| 2049 | if (ent.cgrp == cgrp) | 2049 | if (ent.cgrp == cgrp) |
| 2050 | continue; | 2050 | goto next; |
| 2051 | /* | 2051 | /* |
| 2052 | * saying GFP_ATOMIC has no effect here because we did prealloc | 2052 | * saying GFP_ATOMIC has no effect here because we did prealloc |
| 2053 | * earlier, but it's good form to communicate our expectations. | 2053 | * earlier, but it's good form to communicate our expectations. |
| @@ -2055,7 +2055,7 @@ static int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk, | |||
| 2055 | retval = flex_array_put(group, i, &ent, GFP_ATOMIC); | 2055 | retval = flex_array_put(group, i, &ent, GFP_ATOMIC); |
| 2056 | BUG_ON(retval != 0); | 2056 | BUG_ON(retval != 0); |
| 2057 | i++; | 2057 | i++; |
| 2058 | 2058 | next: | |
| 2059 | if (!threadgroup) | 2059 | if (!threadgroup) |
| 2060 | break; | 2060 | break; |
| 2061 | } while_each_thread(leader, tsk); | 2061 | } while_each_thread(leader, tsk); |
| @@ -3188,11 +3188,9 @@ css_next_descendant_post(struct cgroup_subsys_state *pos, | |||
| 3188 | 3188 | ||
| 3189 | WARN_ON_ONCE(!rcu_read_lock_held()); | 3189 | WARN_ON_ONCE(!rcu_read_lock_held()); |
| 3190 | 3190 | ||
| 3191 | /* if first iteration, visit the leftmost descendant */ | 3191 | /* if first iteration, visit leftmost descendant which may be @root */ |
| 3192 | if (!pos) { | 3192 | if (!pos) |
| 3193 | next = css_leftmost_descendant(root); | 3193 | return css_leftmost_descendant(root); |
| 3194 | return next != root ? next : NULL; | ||
| 3195 | } | ||
| 3196 | 3194 | ||
| 3197 | /* if we visited @root, we're done */ | 3195 | /* if we visited @root, we're done */ |
| 3198 | if (pos == root) | 3196 | if (pos == root) |
diff --git a/kernel/events/core.c b/kernel/events/core.c index cb4238e85b38..953c14348375 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
| @@ -6767,6 +6767,10 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, | |||
| 6767 | if (ret) | 6767 | if (ret) |
| 6768 | return -EFAULT; | 6768 | return -EFAULT; |
| 6769 | 6769 | ||
| 6770 | /* disabled for now */ | ||
| 6771 | if (attr->mmap2) | ||
| 6772 | return -EINVAL; | ||
| 6773 | |||
| 6770 | if (attr->__reserved_1) | 6774 | if (attr->__reserved_1) |
| 6771 | return -EINVAL; | 6775 | return -EINVAL; |
| 6772 | 6776 | ||
| @@ -7234,15 +7238,15 @@ void perf_pmu_migrate_context(struct pmu *pmu, int src_cpu, int dst_cpu) | |||
| 7234 | perf_remove_from_context(event); | 7238 | perf_remove_from_context(event); |
| 7235 | unaccount_event_cpu(event, src_cpu); | 7239 | unaccount_event_cpu(event, src_cpu); |
| 7236 | put_ctx(src_ctx); | 7240 | put_ctx(src_ctx); |
| 7237 | list_add(&event->event_entry, &events); | 7241 | list_add(&event->migrate_entry, &events); |
| 7238 | } | 7242 | } |
| 7239 | mutex_unlock(&src_ctx->mutex); | 7243 | mutex_unlock(&src_ctx->mutex); |
| 7240 | 7244 | ||
| 7241 | synchronize_rcu(); | 7245 | synchronize_rcu(); |
| 7242 | 7246 | ||
| 7243 | mutex_lock(&dst_ctx->mutex); | 7247 | mutex_lock(&dst_ctx->mutex); |
| 7244 | list_for_each_entry_safe(event, tmp, &events, event_entry) { | 7248 | list_for_each_entry_safe(event, tmp, &events, migrate_entry) { |
| 7245 | list_del(&event->event_entry); | 7249 | list_del(&event->migrate_entry); |
| 7246 | if (event->state >= PERF_EVENT_STATE_OFF) | 7250 | if (event->state >= PERF_EVENT_STATE_OFF) |
| 7247 | event->state = PERF_EVENT_STATE_INACTIVE; | 7251 | event->state = PERF_EVENT_STATE_INACTIVE; |
| 7248 | account_event_cpu(event, dst_cpu); | 7252 | account_event_cpu(event, dst_cpu); |
diff --git a/kernel/mutex.c b/kernel/mutex.c index 6d647aedffea..d24105b1b794 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c | |||
| @@ -410,7 +410,7 @@ ww_mutex_set_context_fastpath(struct ww_mutex *lock, | |||
| 410 | static __always_inline int __sched | 410 | static __always_inline int __sched |
| 411 | __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, | 411 | __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, |
| 412 | struct lockdep_map *nest_lock, unsigned long ip, | 412 | struct lockdep_map *nest_lock, unsigned long ip, |
| 413 | struct ww_acquire_ctx *ww_ctx) | 413 | struct ww_acquire_ctx *ww_ctx, const bool use_ww_ctx) |
| 414 | { | 414 | { |
| 415 | struct task_struct *task = current; | 415 | struct task_struct *task = current; |
| 416 | struct mutex_waiter waiter; | 416 | struct mutex_waiter waiter; |
| @@ -450,7 +450,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, | |||
| 450 | struct task_struct *owner; | 450 | struct task_struct *owner; |
| 451 | struct mspin_node node; | 451 | struct mspin_node node; |
| 452 | 452 | ||
| 453 | if (!__builtin_constant_p(ww_ctx == NULL) && ww_ctx->acquired > 0) { | 453 | if (use_ww_ctx && ww_ctx->acquired > 0) { |
| 454 | struct ww_mutex *ww; | 454 | struct ww_mutex *ww; |
| 455 | 455 | ||
| 456 | ww = container_of(lock, struct ww_mutex, base); | 456 | ww = container_of(lock, struct ww_mutex, base); |
| @@ -480,7 +480,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, | |||
| 480 | if ((atomic_read(&lock->count) == 1) && | 480 | if ((atomic_read(&lock->count) == 1) && |
| 481 | (atomic_cmpxchg(&lock->count, 1, 0) == 1)) { | 481 | (atomic_cmpxchg(&lock->count, 1, 0) == 1)) { |
| 482 | lock_acquired(&lock->dep_map, ip); | 482 | lock_acquired(&lock->dep_map, ip); |
| 483 | if (!__builtin_constant_p(ww_ctx == NULL)) { | 483 | if (use_ww_ctx) { |
| 484 | struct ww_mutex *ww; | 484 | struct ww_mutex *ww; |
| 485 | ww = container_of(lock, struct ww_mutex, base); | 485 | ww = container_of(lock, struct ww_mutex, base); |
| 486 | 486 | ||
| @@ -551,7 +551,7 @@ slowpath: | |||
| 551 | goto err; | 551 | goto err; |
| 552 | } | 552 | } |
| 553 | 553 | ||
| 554 | if (!__builtin_constant_p(ww_ctx == NULL) && ww_ctx->acquired > 0) { | 554 | if (use_ww_ctx && ww_ctx->acquired > 0) { |
| 555 | ret = __mutex_lock_check_stamp(lock, ww_ctx); | 555 | ret = __mutex_lock_check_stamp(lock, ww_ctx); |
| 556 | if (ret) | 556 | if (ret) |
| 557 | goto err; | 557 | goto err; |
| @@ -575,7 +575,7 @@ skip_wait: | |||
| 575 | lock_acquired(&lock->dep_map, ip); | 575 | lock_acquired(&lock->dep_map, ip); |
| 576 | mutex_set_owner(lock); | 576 | mutex_set_owner(lock); |
| 577 | 577 | ||
| 578 | if (!__builtin_constant_p(ww_ctx == NULL)) { | 578 | if (use_ww_ctx) { |
| 579 | struct ww_mutex *ww = container_of(lock, struct ww_mutex, base); | 579 | struct ww_mutex *ww = container_of(lock, struct ww_mutex, base); |
| 580 | struct mutex_waiter *cur; | 580 | struct mutex_waiter *cur; |
| 581 | 581 | ||
| @@ -615,7 +615,7 @@ mutex_lock_nested(struct mutex *lock, unsigned int subclass) | |||
| 615 | { | 615 | { |
| 616 | might_sleep(); | 616 | might_sleep(); |
| 617 | __mutex_lock_common(lock, TASK_UNINTERRUPTIBLE, | 617 | __mutex_lock_common(lock, TASK_UNINTERRUPTIBLE, |
| 618 | subclass, NULL, _RET_IP_, NULL); | 618 | subclass, NULL, _RET_IP_, NULL, 0); |
| 619 | } | 619 | } |
| 620 | 620 | ||
| 621 | EXPORT_SYMBOL_GPL(mutex_lock_nested); | 621 | EXPORT_SYMBOL_GPL(mutex_lock_nested); |
| @@ -625,7 +625,7 @@ _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest) | |||
| 625 | { | 625 | { |
| 626 | might_sleep(); | 626 | might_sleep(); |
| 627 | __mutex_lock_common(lock, TASK_UNINTERRUPTIBLE, | 627 | __mutex_lock_common(lock, TASK_UNINTERRUPTIBLE, |
| 628 | 0, nest, _RET_IP_, NULL); | 628 | 0, nest, _RET_IP_, NULL, 0); |
| 629 | } | 629 | } |
| 630 | 630 | ||
| 631 | EXPORT_SYMBOL_GPL(_mutex_lock_nest_lock); | 631 | EXPORT_SYMBOL_GPL(_mutex_lock_nest_lock); |
| @@ -635,7 +635,7 @@ mutex_lock_killable_nested(struct mutex *lock, unsigned int subclass) | |||
| 635 | { | 635 | { |
| 636 | might_sleep(); | 636 | might_sleep(); |
| 637 | return __mutex_lock_common(lock, TASK_KILLABLE, | 637 | return __mutex_lock_common(lock, TASK_KILLABLE, |
| 638 | subclass, NULL, _RET_IP_, NULL); | 638 | subclass, NULL, _RET_IP_, NULL, 0); |
| 639 | } | 639 | } |
| 640 | EXPORT_SYMBOL_GPL(mutex_lock_killable_nested); | 640 | EXPORT_SYMBOL_GPL(mutex_lock_killable_nested); |
| 641 | 641 | ||
| @@ -644,7 +644,7 @@ mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass) | |||
| 644 | { | 644 | { |
| 645 | might_sleep(); | 645 | might_sleep(); |
| 646 | return __mutex_lock_common(lock, TASK_INTERRUPTIBLE, | 646 | return __mutex_lock_common(lock, TASK_INTERRUPTIBLE, |
| 647 | subclass, NULL, _RET_IP_, NULL); | 647 | subclass, NULL, _RET_IP_, NULL, 0); |
| 648 | } | 648 | } |
| 649 | 649 | ||
| 650 | EXPORT_SYMBOL_GPL(mutex_lock_interruptible_nested); | 650 | EXPORT_SYMBOL_GPL(mutex_lock_interruptible_nested); |
| @@ -682,7 +682,7 @@ __ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx) | |||
| 682 | 682 | ||
| 683 | might_sleep(); | 683 | might_sleep(); |
| 684 | ret = __mutex_lock_common(&lock->base, TASK_UNINTERRUPTIBLE, | 684 | ret = __mutex_lock_common(&lock->base, TASK_UNINTERRUPTIBLE, |
| 685 | 0, &ctx->dep_map, _RET_IP_, ctx); | 685 | 0, &ctx->dep_map, _RET_IP_, ctx, 1); |
| 686 | if (!ret && ctx->acquired > 1) | 686 | if (!ret && ctx->acquired > 1) |
| 687 | return ww_mutex_deadlock_injection(lock, ctx); | 687 | return ww_mutex_deadlock_injection(lock, ctx); |
| 688 | 688 | ||
| @@ -697,7 +697,7 @@ __ww_mutex_lock_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ctx) | |||
| 697 | 697 | ||
| 698 | might_sleep(); | 698 | might_sleep(); |
| 699 | ret = __mutex_lock_common(&lock->base, TASK_INTERRUPTIBLE, | 699 | ret = __mutex_lock_common(&lock->base, TASK_INTERRUPTIBLE, |
| 700 | 0, &ctx->dep_map, _RET_IP_, ctx); | 700 | 0, &ctx->dep_map, _RET_IP_, ctx, 1); |
| 701 | 701 | ||
| 702 | if (!ret && ctx->acquired > 1) | 702 | if (!ret && ctx->acquired > 1) |
| 703 | return ww_mutex_deadlock_injection(lock, ctx); | 703 | return ww_mutex_deadlock_injection(lock, ctx); |
| @@ -809,28 +809,28 @@ __mutex_lock_slowpath(atomic_t *lock_count) | |||
| 809 | struct mutex *lock = container_of(lock_count, struct mutex, count); | 809 | struct mutex *lock = container_of(lock_count, struct mutex, count); |
| 810 | 810 | ||
| 811 | __mutex_lock_common(lock, TASK_UNINTERRUPTIBLE, 0, | 811 | __mutex_lock_common(lock, TASK_UNINTERRUPTIBLE, 0, |
| 812 | NULL, _RET_IP_, NULL); | 812 | NULL, _RET_IP_, NULL, 0); |
| 813 | } | 813 | } |
| 814 | 814 | ||
| 815 | static noinline int __sched | 815 | static noinline int __sched |
| 816 | __mutex_lock_killable_slowpath(struct mutex *lock) | 816 | __mutex_lock_killable_slowpath(struct mutex *lock) |
| 817 | { | 817 | { |
| 818 | return __mutex_lock_common(lock, TASK_KILLABLE, 0, | 818 | return __mutex_lock_common(lock, TASK_KILLABLE, 0, |
| 819 | NULL, _RET_IP_, NULL); | 819 | NULL, _RET_IP_, NULL, 0); |
| 820 | } | 820 | } |
| 821 | 821 | ||
| 822 | static noinline int __sched | 822 | static noinline int __sched |
| 823 | __mutex_lock_interruptible_slowpath(struct mutex *lock) | 823 | __mutex_lock_interruptible_slowpath(struct mutex *lock) |
| 824 | { | 824 | { |
| 825 | return __mutex_lock_common(lock, TASK_INTERRUPTIBLE, 0, | 825 | return __mutex_lock_common(lock, TASK_INTERRUPTIBLE, 0, |
| 826 | NULL, _RET_IP_, NULL); | 826 | NULL, _RET_IP_, NULL, 0); |
| 827 | } | 827 | } |
| 828 | 828 | ||
| 829 | static noinline int __sched | 829 | static noinline int __sched |
| 830 | __ww_mutex_lock_slowpath(struct ww_mutex *lock, struct ww_acquire_ctx *ctx) | 830 | __ww_mutex_lock_slowpath(struct ww_mutex *lock, struct ww_acquire_ctx *ctx) |
| 831 | { | 831 | { |
| 832 | return __mutex_lock_common(&lock->base, TASK_UNINTERRUPTIBLE, 0, | 832 | return __mutex_lock_common(&lock->base, TASK_UNINTERRUPTIBLE, 0, |
| 833 | NULL, _RET_IP_, ctx); | 833 | NULL, _RET_IP_, ctx, 1); |
| 834 | } | 834 | } |
| 835 | 835 | ||
| 836 | static noinline int __sched | 836 | static noinline int __sched |
| @@ -838,7 +838,7 @@ __ww_mutex_lock_interruptible_slowpath(struct ww_mutex *lock, | |||
| 838 | struct ww_acquire_ctx *ctx) | 838 | struct ww_acquire_ctx *ctx) |
| 839 | { | 839 | { |
| 840 | return __mutex_lock_common(&lock->base, TASK_INTERRUPTIBLE, 0, | 840 | return __mutex_lock_common(&lock->base, TASK_INTERRUPTIBLE, 0, |
| 841 | NULL, _RET_IP_, ctx); | 841 | NULL, _RET_IP_, ctx, 1); |
| 842 | } | 842 | } |
| 843 | 843 | ||
| 844 | #endif | 844 | #endif |
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index d444c4e834f4..2fac9cc79b3d 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig | |||
| @@ -178,6 +178,22 @@ config PM_SLEEP_DEBUG | |||
| 178 | def_bool y | 178 | def_bool y |
| 179 | depends on PM_DEBUG && PM_SLEEP | 179 | depends on PM_DEBUG && PM_SLEEP |
| 180 | 180 | ||
| 181 | config DPM_WATCHDOG | ||
| 182 | bool "Device suspend/resume watchdog" | ||
| 183 | depends on PM_DEBUG && PSTORE | ||
| 184 | ---help--- | ||
| 185 | Sets up a watchdog timer to capture drivers that are | ||
| 186 | locked up attempting to suspend/resume a device. | ||
| 187 | A detected lockup causes system panic with message | ||
| 188 | captured in pstore device for inspection in subsequent | ||
| 189 | boot session. | ||
| 190 | |||
| 191 | config DPM_WATCHDOG_TIMEOUT | ||
| 192 | int "Watchdog timeout in seconds" | ||
| 193 | range 1 120 | ||
| 194 | default 12 | ||
| 195 | depends on DPM_WATCHDOG | ||
| 196 | |||
| 181 | config PM_TRACE | 197 | config PM_TRACE |
| 182 | bool | 198 | bool |
| 183 | help | 199 | help |
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index c9c759d5a15c..0121dab83f43 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c | |||
| @@ -846,7 +846,7 @@ static int software_resume(void) | |||
| 846 | goto Finish; | 846 | goto Finish; |
| 847 | } | 847 | } |
| 848 | 848 | ||
| 849 | late_initcall(software_resume); | 849 | late_initcall_sync(software_resume); |
| 850 | 850 | ||
| 851 | 851 | ||
| 852 | static const char * const hibernation_modes[] = { | 852 | static const char * const hibernation_modes[] = { |
diff --git a/kernel/power/qos.c b/kernel/power/qos.c index a394297f8b2f..8dff9b48075a 100644 --- a/kernel/power/qos.c +++ b/kernel/power/qos.c | |||
| @@ -558,30 +558,12 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf, | |||
| 558 | if (count == sizeof(s32)) { | 558 | if (count == sizeof(s32)) { |
| 559 | if (copy_from_user(&value, buf, sizeof(s32))) | 559 | if (copy_from_user(&value, buf, sizeof(s32))) |
| 560 | return -EFAULT; | 560 | return -EFAULT; |
| 561 | } else if (count <= 11) { /* ASCII perhaps? */ | 561 | } else { |
| 562 | char ascii_value[11]; | ||
| 563 | unsigned long int ulval; | ||
| 564 | int ret; | 562 | int ret; |
| 565 | 563 | ||
| 566 | if (copy_from_user(ascii_value, buf, count)) | 564 | ret = kstrtos32_from_user(buf, count, 16, &value); |
| 567 | return -EFAULT; | 565 | if (ret) |
| 568 | 566 | return ret; | |
| 569 | if (count > 10) { | ||
| 570 | if (ascii_value[10] == '\n') | ||
| 571 | ascii_value[10] = '\0'; | ||
| 572 | else | ||
| 573 | return -EINVAL; | ||
| 574 | } else { | ||
| 575 | ascii_value[count] = '\0'; | ||
| 576 | } | ||
| 577 | ret = kstrtoul(ascii_value, 16, &ulval); | ||
| 578 | if (ret) { | ||
| 579 | pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret); | ||
| 580 | return -EINVAL; | ||
| 581 | } | ||
| 582 | value = (s32)lower_32_bits(ulval); | ||
| 583 | } else { | ||
| 584 | return -EINVAL; | ||
| 585 | } | 567 | } |
| 586 | 568 | ||
| 587 | req = filp->private_data; | 569 | req = filp->private_data; |
diff --git a/kernel/power/user.c b/kernel/power/user.c index 957f06164ad1..24850270c802 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c | |||
| @@ -36,9 +36,9 @@ static struct snapshot_data { | |||
| 36 | struct snapshot_handle handle; | 36 | struct snapshot_handle handle; |
| 37 | int swap; | 37 | int swap; |
| 38 | int mode; | 38 | int mode; |
| 39 | char frozen; | 39 | bool frozen; |
| 40 | char ready; | 40 | bool ready; |
| 41 | char platform_support; | 41 | bool platform_support; |
| 42 | bool free_bitmaps; | 42 | bool free_bitmaps; |
| 43 | } snapshot_state; | 43 | } snapshot_state; |
| 44 | 44 | ||
| @@ -93,9 +93,9 @@ static int snapshot_open(struct inode *inode, struct file *filp) | |||
| 93 | if (error) | 93 | if (error) |
| 94 | atomic_inc(&snapshot_device_available); | 94 | atomic_inc(&snapshot_device_available); |
| 95 | 95 | ||
| 96 | data->frozen = 0; | 96 | data->frozen = false; |
| 97 | data->ready = 0; | 97 | data->ready = false; |
| 98 | data->platform_support = 0; | 98 | data->platform_support = false; |
| 99 | 99 | ||
| 100 | Unlock: | 100 | Unlock: |
| 101 | unlock_system_sleep(); | 101 | unlock_system_sleep(); |
| @@ -229,7 +229,7 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, | |||
| 229 | if (error) | 229 | if (error) |
| 230 | thaw_processes(); | 230 | thaw_processes(); |
| 231 | else | 231 | else |
| 232 | data->frozen = 1; | 232 | data->frozen = true; |
| 233 | 233 | ||
| 234 | break; | 234 | break; |
| 235 | 235 | ||
| @@ -240,7 +240,7 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, | |||
| 240 | free_basic_memory_bitmaps(); | 240 | free_basic_memory_bitmaps(); |
| 241 | data->free_bitmaps = false; | 241 | data->free_bitmaps = false; |
| 242 | thaw_processes(); | 242 | thaw_processes(); |
| 243 | data->frozen = 0; | 243 | data->frozen = false; |
| 244 | break; | 244 | break; |
| 245 | 245 | ||
| 246 | case SNAPSHOT_CREATE_IMAGE: | 246 | case SNAPSHOT_CREATE_IMAGE: |
| @@ -270,7 +270,7 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, | |||
| 270 | case SNAPSHOT_FREE: | 270 | case SNAPSHOT_FREE: |
| 271 | swsusp_free(); | 271 | swsusp_free(); |
| 272 | memset(&data->handle, 0, sizeof(struct snapshot_handle)); | 272 | memset(&data->handle, 0, sizeof(struct snapshot_handle)); |
| 273 | data->ready = 0; | 273 | data->ready = false; |
| 274 | /* | 274 | /* |
| 275 | * It is necessary to thaw kernel threads here, because | 275 | * It is necessary to thaw kernel threads here, because |
| 276 | * SNAPSHOT_CREATE_IMAGE may be invoked directly after | 276 | * SNAPSHOT_CREATE_IMAGE may be invoked directly after |
| @@ -334,7 +334,7 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, | |||
| 334 | * PM_HIBERNATION_PREPARE | 334 | * PM_HIBERNATION_PREPARE |
| 335 | */ | 335 | */ |
| 336 | error = suspend_devices_and_enter(PM_SUSPEND_MEM); | 336 | error = suspend_devices_and_enter(PM_SUSPEND_MEM); |
| 337 | data->ready = 0; | 337 | data->ready = false; |
| 338 | break; | 338 | break; |
| 339 | 339 | ||
| 340 | case SNAPSHOT_PLATFORM_SUPPORT: | 340 | case SNAPSHOT_PLATFORM_SUPPORT: |
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 38959c866789..662c5798a685 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c | |||
| @@ -33,29 +33,64 @@ struct ce_unbind { | |||
| 33 | int res; | 33 | int res; |
| 34 | }; | 34 | }; |
| 35 | 35 | ||
| 36 | /** | 36 | static u64 cev_delta2ns(unsigned long latch, struct clock_event_device *evt, |
| 37 | * clockevents_delta2ns - Convert a latch value (device ticks) to nanoseconds | 37 | bool ismax) |
| 38 | * @latch: value to convert | ||
| 39 | * @evt: pointer to clock event device descriptor | ||
| 40 | * | ||
| 41 | * Math helper, returns latch value converted to nanoseconds (bound checked) | ||
| 42 | */ | ||
| 43 | u64 clockevent_delta2ns(unsigned long latch, struct clock_event_device *evt) | ||
| 44 | { | 38 | { |
| 45 | u64 clc = (u64) latch << evt->shift; | 39 | u64 clc = (u64) latch << evt->shift; |
| 40 | u64 rnd; | ||
| 46 | 41 | ||
| 47 | if (unlikely(!evt->mult)) { | 42 | if (unlikely(!evt->mult)) { |
| 48 | evt->mult = 1; | 43 | evt->mult = 1; |
| 49 | WARN_ON(1); | 44 | WARN_ON(1); |
| 50 | } | 45 | } |
| 46 | rnd = (u64) evt->mult - 1; | ||
| 47 | |||
| 48 | /* | ||
| 49 | * Upper bound sanity check. If the backwards conversion is | ||
| 50 | * not equal latch, we know that the above shift overflowed. | ||
| 51 | */ | ||
| 52 | if ((clc >> evt->shift) != (u64)latch) | ||
| 53 | clc = ~0ULL; | ||
| 54 | |||
| 55 | /* | ||
| 56 | * Scaled math oddities: | ||
| 57 | * | ||
| 58 | * For mult <= (1 << shift) we can safely add mult - 1 to | ||
| 59 | * prevent integer rounding loss. So the backwards conversion | ||
| 60 | * from nsec to device ticks will be correct. | ||
| 61 | * | ||
| 62 | * For mult > (1 << shift), i.e. device frequency is > 1GHz we | ||
| 63 | * need to be careful. Adding mult - 1 will result in a value | ||
| 64 | * which when converted back to device ticks can be larger | ||
| 65 | * than latch by up to (mult - 1) >> shift. For the min_delta | ||
| 66 | * calculation we still want to apply this in order to stay | ||
| 67 | * above the minimum device ticks limit. For the upper limit | ||
| 68 | * we would end up with a latch value larger than the upper | ||
| 69 | * limit of the device, so we omit the add to stay below the | ||
| 70 | * device upper boundary. | ||
| 71 | * | ||
| 72 | * Also omit the add if it would overflow the u64 boundary. | ||
| 73 | */ | ||
| 74 | if ((~0ULL - clc > rnd) && | ||
| 75 | (!ismax || evt->mult <= (1U << evt->shift))) | ||
| 76 | clc += rnd; | ||
| 51 | 77 | ||
| 52 | do_div(clc, evt->mult); | 78 | do_div(clc, evt->mult); |
| 53 | if (clc < 1000) | ||
| 54 | clc = 1000; | ||
| 55 | if (clc > KTIME_MAX) | ||
| 56 | clc = KTIME_MAX; | ||
| 57 | 79 | ||
| 58 | return clc; | 80 | /* Deltas less than 1usec are pointless noise */ |
| 81 | return clc > 1000 ? clc : 1000; | ||
| 82 | } | ||
| 83 | |||
| 84 | /** | ||
| 85 | * clockevents_delta2ns - Convert a latch value (device ticks) to nanoseconds | ||
| 86 | * @latch: value to convert | ||
| 87 | * @evt: pointer to clock event device descriptor | ||
| 88 | * | ||
| 89 | * Math helper, returns latch value converted to nanoseconds (bound checked) | ||
| 90 | */ | ||
| 91 | u64 clockevent_delta2ns(unsigned long latch, struct clock_event_device *evt) | ||
| 92 | { | ||
| 93 | return cev_delta2ns(latch, evt, false); | ||
| 59 | } | 94 | } |
| 60 | EXPORT_SYMBOL_GPL(clockevent_delta2ns); | 95 | EXPORT_SYMBOL_GPL(clockevent_delta2ns); |
| 61 | 96 | ||
| @@ -380,8 +415,8 @@ void clockevents_config(struct clock_event_device *dev, u32 freq) | |||
| 380 | sec = 600; | 415 | sec = 600; |
| 381 | 416 | ||
| 382 | clockevents_calc_mult_shift(dev, freq, sec); | 417 | clockevents_calc_mult_shift(dev, freq, sec); |
| 383 | dev->min_delta_ns = clockevent_delta2ns(dev->min_delta_ticks, dev); | 418 | dev->min_delta_ns = cev_delta2ns(dev->min_delta_ticks, dev, false); |
| 384 | dev->max_delta_ns = clockevent_delta2ns(dev->max_delta_ticks, dev); | 419 | dev->max_delta_ns = cev_delta2ns(dev->max_delta_ticks, dev, true); |
| 385 | } | 420 | } |
| 386 | 421 | ||
| 387 | /** | 422 | /** |
diff --git a/lib/kobject.c b/lib/kobject.c index 669bf190d4fb..084f7b18d0c0 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
| @@ -592,7 +592,7 @@ static void kobject_release(struct kref *kref) | |||
| 592 | { | 592 | { |
| 593 | struct kobject *kobj = container_of(kref, struct kobject, kref); | 593 | struct kobject *kobj = container_of(kref, struct kobject, kref); |
| 594 | #ifdef CONFIG_DEBUG_KOBJECT_RELEASE | 594 | #ifdef CONFIG_DEBUG_KOBJECT_RELEASE |
| 595 | pr_debug("kobject: '%s' (%p): %s, parent %p (delayed)\n", | 595 | pr_info("kobject: '%s' (%p): %s, parent %p (delayed)\n", |
| 596 | kobject_name(kobj), kobj, __func__, kobj->parent); | 596 | kobject_name(kobj), kobj, __func__, kobj->parent); |
| 597 | INIT_DELAYED_WORK(&kobj->release, kobject_delayed_cleanup); | 597 | INIT_DELAYED_WORK(&kobj->release, kobject_delayed_cleanup); |
| 598 | schedule_delayed_work(&kobj->release, HZ); | 598 | schedule_delayed_work(&kobj->release, HZ); |
diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c index 7deeb6297a48..1a53d497a8c5 100644 --- a/lib/percpu-refcount.c +++ b/lib/percpu-refcount.c | |||
| @@ -53,6 +53,7 @@ int percpu_ref_init(struct percpu_ref *ref, percpu_ref_func_t *release) | |||
| 53 | ref->release = release; | 53 | ref->release = release; |
| 54 | return 0; | 54 | return 0; |
| 55 | } | 55 | } |
| 56 | EXPORT_SYMBOL_GPL(percpu_ref_init); | ||
| 56 | 57 | ||
| 57 | /** | 58 | /** |
| 58 | * percpu_ref_cancel_init - cancel percpu_ref_init() | 59 | * percpu_ref_cancel_init - cancel percpu_ref_init() |
| @@ -84,6 +85,7 @@ void percpu_ref_cancel_init(struct percpu_ref *ref) | |||
| 84 | free_percpu(ref->pcpu_count); | 85 | free_percpu(ref->pcpu_count); |
| 85 | } | 86 | } |
| 86 | } | 87 | } |
| 88 | EXPORT_SYMBOL_GPL(percpu_ref_cancel_init); | ||
| 87 | 89 | ||
| 88 | static void percpu_ref_kill_rcu(struct rcu_head *rcu) | 90 | static void percpu_ref_kill_rcu(struct rcu_head *rcu) |
| 89 | { | 91 | { |
| @@ -156,3 +158,4 @@ void percpu_ref_kill_and_confirm(struct percpu_ref *ref, | |||
| 156 | 158 | ||
| 157 | call_rcu_sched(&ref->rcu, percpu_ref_kill_rcu); | 159 | call_rcu_sched(&ref->rcu, percpu_ref_kill_rcu); |
| 158 | } | 160 | } |
| 161 | EXPORT_SYMBOL_GPL(percpu_ref_kill_and_confirm); | ||
diff --git a/mm/filemap.c b/mm/filemap.c index 1e6aec4a2d2e..ae4846ff4849 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -1616,7 +1616,6 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
| 1616 | struct inode *inode = mapping->host; | 1616 | struct inode *inode = mapping->host; |
| 1617 | pgoff_t offset = vmf->pgoff; | 1617 | pgoff_t offset = vmf->pgoff; |
| 1618 | struct page *page; | 1618 | struct page *page; |
| 1619 | bool memcg_oom; | ||
| 1620 | pgoff_t size; | 1619 | pgoff_t size; |
| 1621 | int ret = 0; | 1620 | int ret = 0; |
| 1622 | 1621 | ||
| @@ -1625,11 +1624,7 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
| 1625 | return VM_FAULT_SIGBUS; | 1624 | return VM_FAULT_SIGBUS; |
| 1626 | 1625 | ||
| 1627 | /* | 1626 | /* |
| 1628 | * Do we have something in the page cache already? Either | 1627 | * Do we have something in the page cache already? |
| 1629 | * way, try readahead, but disable the memcg OOM killer for it | ||
| 1630 | * as readahead is optional and no errors are propagated up | ||
| 1631 | * the fault stack. The OOM killer is enabled while trying to | ||
| 1632 | * instantiate the faulting page individually below. | ||
| 1633 | */ | 1628 | */ |
| 1634 | page = find_get_page(mapping, offset); | 1629 | page = find_get_page(mapping, offset); |
| 1635 | if (likely(page) && !(vmf->flags & FAULT_FLAG_TRIED)) { | 1630 | if (likely(page) && !(vmf->flags & FAULT_FLAG_TRIED)) { |
| @@ -1637,14 +1632,10 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
| 1637 | * We found the page, so try async readahead before | 1632 | * We found the page, so try async readahead before |
| 1638 | * waiting for the lock. | 1633 | * waiting for the lock. |
| 1639 | */ | 1634 | */ |
| 1640 | memcg_oom = mem_cgroup_toggle_oom(false); | ||
| 1641 | do_async_mmap_readahead(vma, ra, file, page, offset); | 1635 | do_async_mmap_readahead(vma, ra, file, page, offset); |
| 1642 | mem_cgroup_toggle_oom(memcg_oom); | ||
| 1643 | } else if (!page) { | 1636 | } else if (!page) { |
| 1644 | /* No page in the page cache at all */ | 1637 | /* No page in the page cache at all */ |
| 1645 | memcg_oom = mem_cgroup_toggle_oom(false); | ||
| 1646 | do_sync_mmap_readahead(vma, ra, file, offset); | 1638 | do_sync_mmap_readahead(vma, ra, file, offset); |
| 1647 | mem_cgroup_toggle_oom(memcg_oom); | ||
| 1648 | count_vm_event(PGMAJFAULT); | 1639 | count_vm_event(PGMAJFAULT); |
| 1649 | mem_cgroup_count_vm_event(vma->vm_mm, PGMAJFAULT); | 1640 | mem_cgroup_count_vm_event(vma->vm_mm, PGMAJFAULT); |
| 1650 | ret = VM_FAULT_MAJOR; | 1641 | ret = VM_FAULT_MAJOR; |
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 7489884682d8..610e3df2768a 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c | |||
| @@ -2697,6 +2697,7 @@ void __split_huge_page_pmd(struct vm_area_struct *vma, unsigned long address, | |||
| 2697 | 2697 | ||
| 2698 | mmun_start = haddr; | 2698 | mmun_start = haddr; |
| 2699 | mmun_end = haddr + HPAGE_PMD_SIZE; | 2699 | mmun_end = haddr + HPAGE_PMD_SIZE; |
| 2700 | again: | ||
| 2700 | mmu_notifier_invalidate_range_start(mm, mmun_start, mmun_end); | 2701 | mmu_notifier_invalidate_range_start(mm, mmun_start, mmun_end); |
| 2701 | spin_lock(&mm->page_table_lock); | 2702 | spin_lock(&mm->page_table_lock); |
| 2702 | if (unlikely(!pmd_trans_huge(*pmd))) { | 2703 | if (unlikely(!pmd_trans_huge(*pmd))) { |
| @@ -2719,7 +2720,14 @@ void __split_huge_page_pmd(struct vm_area_struct *vma, unsigned long address, | |||
| 2719 | split_huge_page(page); | 2720 | split_huge_page(page); |
| 2720 | 2721 | ||
| 2721 | put_page(page); | 2722 | put_page(page); |
| 2722 | BUG_ON(pmd_trans_huge(*pmd)); | 2723 | |
| 2724 | /* | ||
| 2725 | * We don't always have down_write of mmap_sem here: a racing | ||
| 2726 | * do_huge_pmd_wp_page() might have copied-on-write to another | ||
| 2727 | * huge page before our split_huge_page() got the anon_vma lock. | ||
| 2728 | */ | ||
| 2729 | if (unlikely(pmd_trans_huge(*pmd))) | ||
| 2730 | goto again; | ||
| 2723 | } | 2731 | } |
| 2724 | 2732 | ||
| 2725 | void split_huge_page_pmd_mm(struct mm_struct *mm, unsigned long address, | 2733 | void split_huge_page_pmd_mm(struct mm_struct *mm, unsigned long address, |
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index b49579c7f2a5..0b7656e804d1 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -653,6 +653,7 @@ static void free_huge_page(struct page *page) | |||
| 653 | BUG_ON(page_count(page)); | 653 | BUG_ON(page_count(page)); |
| 654 | BUG_ON(page_mapcount(page)); | 654 | BUG_ON(page_mapcount(page)); |
| 655 | restore_reserve = PagePrivate(page); | 655 | restore_reserve = PagePrivate(page); |
| 656 | ClearPagePrivate(page); | ||
| 656 | 657 | ||
| 657 | spin_lock(&hugetlb_lock); | 658 | spin_lock(&hugetlb_lock); |
| 658 | hugetlb_cgroup_uncharge_page(hstate_index(h), | 659 | hugetlb_cgroup_uncharge_page(hstate_index(h), |
| @@ -695,8 +696,22 @@ static void prep_compound_gigantic_page(struct page *page, unsigned long order) | |||
| 695 | /* we rely on prep_new_huge_page to set the destructor */ | 696 | /* we rely on prep_new_huge_page to set the destructor */ |
| 696 | set_compound_order(page, order); | 697 | set_compound_order(page, order); |
| 697 | __SetPageHead(page); | 698 | __SetPageHead(page); |
| 699 | __ClearPageReserved(page); | ||
| 698 | for (i = 1; i < nr_pages; i++, p = mem_map_next(p, page, i)) { | 700 | for (i = 1; i < nr_pages; i++, p = mem_map_next(p, page, i)) { |
| 699 | __SetPageTail(p); | 701 | __SetPageTail(p); |
| 702 | /* | ||
| 703 | * For gigantic hugepages allocated through bootmem at | ||
| 704 | * boot, it's safer to be consistent with the not-gigantic | ||
| 705 | * hugepages and clear the PG_reserved bit from all tail pages | ||
| 706 | * too. Otherwse drivers using get_user_pages() to access tail | ||
| 707 | * pages may get the reference counting wrong if they see | ||
| 708 | * PG_reserved set on a tail page (despite the head page not | ||
| 709 | * having PG_reserved set). Enforcing this consistency between | ||
| 710 | * head and tail pages allows drivers to optimize away a check | ||
| 711 | * on the head page when they need know if put_page() is needed | ||
| 712 | * after get_user_pages(). | ||
| 713 | */ | ||
| 714 | __ClearPageReserved(p); | ||
| 700 | set_page_count(p, 0); | 715 | set_page_count(p, 0); |
| 701 | p->first_page = page; | 716 | p->first_page = page; |
| 702 | } | 717 | } |
| @@ -1329,9 +1344,9 @@ static void __init gather_bootmem_prealloc(void) | |||
| 1329 | #else | 1344 | #else |
| 1330 | page = virt_to_page(m); | 1345 | page = virt_to_page(m); |
| 1331 | #endif | 1346 | #endif |
| 1332 | __ClearPageReserved(page); | ||
| 1333 | WARN_ON(page_count(page) != 1); | 1347 | WARN_ON(page_count(page) != 1); |
| 1334 | prep_compound_huge_page(page, h->order); | 1348 | prep_compound_huge_page(page, h->order); |
| 1349 | WARN_ON(PageReserved(page)); | ||
| 1335 | prep_new_huge_page(h, page, page_to_nid(page)); | 1350 | prep_new_huge_page(h, page, page_to_nid(page)); |
| 1336 | /* | 1351 | /* |
| 1337 | * If we had gigantic hugepages allocated at boot time, we need | 1352 | * If we had gigantic hugepages allocated at boot time, we need |
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 1c52ddbc839b..34d3ca9572d6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
| @@ -866,6 +866,7 @@ static unsigned long mem_cgroup_read_events(struct mem_cgroup *memcg, | |||
| 866 | unsigned long val = 0; | 866 | unsigned long val = 0; |
| 867 | int cpu; | 867 | int cpu; |
| 868 | 868 | ||
| 869 | get_online_cpus(); | ||
| 869 | for_each_online_cpu(cpu) | 870 | for_each_online_cpu(cpu) |
| 870 | val += per_cpu(memcg->stat->events[idx], cpu); | 871 | val += per_cpu(memcg->stat->events[idx], cpu); |
| 871 | #ifdef CONFIG_HOTPLUG_CPU | 872 | #ifdef CONFIG_HOTPLUG_CPU |
| @@ -873,6 +874,7 @@ static unsigned long mem_cgroup_read_events(struct mem_cgroup *memcg, | |||
| 873 | val += memcg->nocpu_base.events[idx]; | 874 | val += memcg->nocpu_base.events[idx]; |
| 874 | spin_unlock(&memcg->pcp_counter_lock); | 875 | spin_unlock(&memcg->pcp_counter_lock); |
| 875 | #endif | 876 | #endif |
| 877 | put_online_cpus(); | ||
| 876 | return val; | 878 | return val; |
| 877 | } | 879 | } |
| 878 | 880 | ||
| @@ -2159,110 +2161,59 @@ static void memcg_oom_recover(struct mem_cgroup *memcg) | |||
| 2159 | memcg_wakeup_oom(memcg); | 2161 | memcg_wakeup_oom(memcg); |
| 2160 | } | 2162 | } |
| 2161 | 2163 | ||
| 2162 | /* | ||
| 2163 | * try to call OOM killer | ||
| 2164 | */ | ||
| 2165 | static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order) | 2164 | static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order) |
| 2166 | { | 2165 | { |
| 2167 | bool locked; | ||
| 2168 | int wakeups; | ||
| 2169 | |||
| 2170 | if (!current->memcg_oom.may_oom) | 2166 | if (!current->memcg_oom.may_oom) |
| 2171 | return; | 2167 | return; |
| 2172 | |||
| 2173 | current->memcg_oom.in_memcg_oom = 1; | ||
| 2174 | |||
| 2175 | /* | 2168 | /* |
| 2176 | * As with any blocking lock, a contender needs to start | 2169 | * We are in the middle of the charge context here, so we |
| 2177 | * listening for wakeups before attempting the trylock, | 2170 | * don't want to block when potentially sitting on a callstack |
| 2178 | * otherwise it can miss the wakeup from the unlock and sleep | 2171 | * that holds all kinds of filesystem and mm locks. |
| 2179 | * indefinitely. This is just open-coded because our locking | 2172 | * |
| 2180 | * is so particular to memcg hierarchies. | 2173 | * Also, the caller may handle a failed allocation gracefully |
| 2174 | * (like optional page cache readahead) and so an OOM killer | ||
| 2175 | * invocation might not even be necessary. | ||
| 2176 | * | ||
| 2177 | * That's why we don't do anything here except remember the | ||
| 2178 | * OOM context and then deal with it at the end of the page | ||
| 2179 | * fault when the stack is unwound, the locks are released, | ||
| 2180 | * and when we know whether the fault was overall successful. | ||
| 2181 | */ | 2181 | */ |
| 2182 | wakeups = atomic_read(&memcg->oom_wakeups); | 2182 | css_get(&memcg->css); |
| 2183 | mem_cgroup_mark_under_oom(memcg); | 2183 | current->memcg_oom.memcg = memcg; |
| 2184 | 2184 | current->memcg_oom.gfp_mask = mask; | |
| 2185 | locked = mem_cgroup_oom_trylock(memcg); | 2185 | current->memcg_oom.order = order; |
| 2186 | |||
| 2187 | if (locked) | ||
| 2188 | mem_cgroup_oom_notify(memcg); | ||
| 2189 | |||
| 2190 | if (locked && !memcg->oom_kill_disable) { | ||
| 2191 | mem_cgroup_unmark_under_oom(memcg); | ||
| 2192 | mem_cgroup_out_of_memory(memcg, mask, order); | ||
| 2193 | mem_cgroup_oom_unlock(memcg); | ||
| 2194 | /* | ||
| 2195 | * There is no guarantee that an OOM-lock contender | ||
| 2196 | * sees the wakeups triggered by the OOM kill | ||
| 2197 | * uncharges. Wake any sleepers explicitely. | ||
| 2198 | */ | ||
| 2199 | memcg_oom_recover(memcg); | ||
| 2200 | } else { | ||
| 2201 | /* | ||
| 2202 | * A system call can just return -ENOMEM, but if this | ||
| 2203 | * is a page fault and somebody else is handling the | ||
| 2204 | * OOM already, we need to sleep on the OOM waitqueue | ||
| 2205 | * for this memcg until the situation is resolved. | ||
| 2206 | * Which can take some time because it might be | ||
| 2207 | * handled by a userspace task. | ||
| 2208 | * | ||
| 2209 | * However, this is the charge context, which means | ||
| 2210 | * that we may sit on a large call stack and hold | ||
| 2211 | * various filesystem locks, the mmap_sem etc. and we | ||
| 2212 | * don't want the OOM handler to deadlock on them | ||
| 2213 | * while we sit here and wait. Store the current OOM | ||
| 2214 | * context in the task_struct, then return -ENOMEM. | ||
| 2215 | * At the end of the page fault handler, with the | ||
| 2216 | * stack unwound, pagefault_out_of_memory() will check | ||
| 2217 | * back with us by calling | ||
| 2218 | * mem_cgroup_oom_synchronize(), possibly putting the | ||
| 2219 | * task to sleep. | ||
| 2220 | */ | ||
| 2221 | current->memcg_oom.oom_locked = locked; | ||
| 2222 | current->memcg_oom.wakeups = wakeups; | ||
| 2223 | css_get(&memcg->css); | ||
| 2224 | current->memcg_oom.wait_on_memcg = memcg; | ||
| 2225 | } | ||
| 2226 | } | 2186 | } |
| 2227 | 2187 | ||
| 2228 | /** | 2188 | /** |
| 2229 | * mem_cgroup_oom_synchronize - complete memcg OOM handling | 2189 | * mem_cgroup_oom_synchronize - complete memcg OOM handling |
| 2190 | * @handle: actually kill/wait or just clean up the OOM state | ||
| 2230 | * | 2191 | * |
| 2231 | * This has to be called at the end of a page fault if the the memcg | 2192 | * This has to be called at the end of a page fault if the memcg OOM |
| 2232 | * OOM handler was enabled and the fault is returning %VM_FAULT_OOM. | 2193 | * handler was enabled. |
| 2233 | * | 2194 | * |
| 2234 | * Memcg supports userspace OOM handling, so failed allocations must | 2195 | * Memcg supports userspace OOM handling where failed allocations must |
| 2235 | * sleep on a waitqueue until the userspace task resolves the | 2196 | * sleep on a waitqueue until the userspace task resolves the |
| 2236 | * situation. Sleeping directly in the charge context with all kinds | 2197 | * situation. Sleeping directly in the charge context with all kinds |
| 2237 | * of locks held is not a good idea, instead we remember an OOM state | 2198 | * of locks held is not a good idea, instead we remember an OOM state |
| 2238 | * in the task and mem_cgroup_oom_synchronize() has to be called at | 2199 | * in the task and mem_cgroup_oom_synchronize() has to be called at |
| 2239 | * the end of the page fault to put the task to sleep and clean up the | 2200 | * the end of the page fault to complete the OOM handling. |
| 2240 | * OOM state. | ||
| 2241 | * | 2201 | * |
| 2242 | * Returns %true if an ongoing memcg OOM situation was detected and | 2202 | * Returns %true if an ongoing memcg OOM situation was detected and |
| 2243 | * finalized, %false otherwise. | 2203 | * completed, %false otherwise. |
| 2244 | */ | 2204 | */ |
| 2245 | bool mem_cgroup_oom_synchronize(void) | 2205 | bool mem_cgroup_oom_synchronize(bool handle) |
| 2246 | { | 2206 | { |
| 2207 | struct mem_cgroup *memcg = current->memcg_oom.memcg; | ||
| 2247 | struct oom_wait_info owait; | 2208 | struct oom_wait_info owait; |
| 2248 | struct mem_cgroup *memcg; | 2209 | bool locked; |
| 2249 | 2210 | ||
| 2250 | /* OOM is global, do not handle */ | 2211 | /* OOM is global, do not handle */ |
| 2251 | if (!current->memcg_oom.in_memcg_oom) | ||
| 2252 | return false; | ||
| 2253 | |||
| 2254 | /* | ||
| 2255 | * We invoked the OOM killer but there is a chance that a kill | ||
| 2256 | * did not free up any charges. Everybody else might already | ||
| 2257 | * be sleeping, so restart the fault and keep the rampage | ||
| 2258 | * going until some charges are released. | ||
| 2259 | */ | ||
| 2260 | memcg = current->memcg_oom.wait_on_memcg; | ||
| 2261 | if (!memcg) | 2212 | if (!memcg) |
| 2262 | goto out; | 2213 | return false; |
| 2263 | 2214 | ||
| 2264 | if (test_thread_flag(TIF_MEMDIE) || fatal_signal_pending(current)) | 2215 | if (!handle) |
| 2265 | goto out_memcg; | 2216 | goto cleanup; |
| 2266 | 2217 | ||
| 2267 | owait.memcg = memcg; | 2218 | owait.memcg = memcg; |
| 2268 | owait.wait.flags = 0; | 2219 | owait.wait.flags = 0; |
| @@ -2271,13 +2222,25 @@ bool mem_cgroup_oom_synchronize(void) | |||
| 2271 | INIT_LIST_HEAD(&owait.wait.task_list); | 2222 | INIT_LIST_HEAD(&owait.wait.task_list); |
| 2272 | 2223 | ||
| 2273 | prepare_to_wait(&memcg_oom_waitq, &owait.wait, TASK_KILLABLE); | 2224 | prepare_to_wait(&memcg_oom_waitq, &owait.wait, TASK_KILLABLE); |
| 2274 | /* Only sleep if we didn't miss any wakeups since OOM */ | 2225 | mem_cgroup_mark_under_oom(memcg); |
| 2275 | if (atomic_read(&memcg->oom_wakeups) == current->memcg_oom.wakeups) | 2226 | |
| 2227 | locked = mem_cgroup_oom_trylock(memcg); | ||
| 2228 | |||
| 2229 | if (locked) | ||
| 2230 | mem_cgroup_oom_notify(memcg); | ||
| 2231 | |||
| 2232 | if (locked && !memcg->oom_kill_disable) { | ||
| 2233 | mem_cgroup_unmark_under_oom(memcg); | ||
| 2234 | finish_wait(&memcg_oom_waitq, &owait.wait); | ||
| 2235 | mem_cgroup_out_of_memory(memcg, current->memcg_oom.gfp_mask, | ||
| 2236 | current->memcg_oom.order); | ||
| 2237 | } else { | ||
| 2276 | schedule(); | 2238 | schedule(); |
| 2277 | finish_wait(&memcg_oom_waitq, &owait.wait); | 2239 | mem_cgroup_unmark_under_oom(memcg); |
| 2278 | out_memcg: | 2240 | finish_wait(&memcg_oom_waitq, &owait.wait); |
| 2279 | mem_cgroup_unmark_under_oom(memcg); | 2241 | } |
| 2280 | if (current->memcg_oom.oom_locked) { | 2242 | |
| 2243 | if (locked) { | ||
| 2281 | mem_cgroup_oom_unlock(memcg); | 2244 | mem_cgroup_oom_unlock(memcg); |
| 2282 | /* | 2245 | /* |
| 2283 | * There is no guarantee that an OOM-lock contender | 2246 | * There is no guarantee that an OOM-lock contender |
| @@ -2286,10 +2249,9 @@ out_memcg: | |||
| 2286 | */ | 2249 | */ |
| 2287 | memcg_oom_recover(memcg); | 2250 | memcg_oom_recover(memcg); |
| 2288 | } | 2251 | } |
| 2252 | cleanup: | ||
| 2253 | current->memcg_oom.memcg = NULL; | ||
| 2289 | css_put(&memcg->css); | 2254 | css_put(&memcg->css); |
| 2290 | current->memcg_oom.wait_on_memcg = NULL; | ||
| 2291 | out: | ||
| 2292 | current->memcg_oom.in_memcg_oom = 0; | ||
| 2293 | return true; | 2255 | return true; |
| 2294 | } | 2256 | } |
| 2295 | 2257 | ||
| @@ -2703,6 +2665,9 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm, | |||
| 2703 | || fatal_signal_pending(current))) | 2665 | || fatal_signal_pending(current))) |
| 2704 | goto bypass; | 2666 | goto bypass; |
| 2705 | 2667 | ||
| 2668 | if (unlikely(task_in_memcg_oom(current))) | ||
| 2669 | goto bypass; | ||
| 2670 | |||
| 2706 | /* | 2671 | /* |
| 2707 | * We always charge the cgroup the mm_struct belongs to. | 2672 | * We always charge the cgroup the mm_struct belongs to. |
| 2708 | * The mm_struct's mem_cgroup changes on task migration if the | 2673 | * The mm_struct's mem_cgroup changes on task migration if the |
| @@ -2801,6 +2766,8 @@ done: | |||
| 2801 | return 0; | 2766 | return 0; |
| 2802 | nomem: | 2767 | nomem: |
| 2803 | *ptr = NULL; | 2768 | *ptr = NULL; |
| 2769 | if (gfp_mask & __GFP_NOFAIL) | ||
| 2770 | return 0; | ||
| 2804 | return -ENOMEM; | 2771 | return -ENOMEM; |
| 2805 | bypass: | 2772 | bypass: |
| 2806 | *ptr = root_mem_cgroup; | 2773 | *ptr = root_mem_cgroup; |
diff --git a/mm/memory.c b/mm/memory.c index ca0003947115..1311f26497e6 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -837,6 +837,8 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, | |||
| 837 | */ | 837 | */ |
| 838 | make_migration_entry_read(&entry); | 838 | make_migration_entry_read(&entry); |
| 839 | pte = swp_entry_to_pte(entry); | 839 | pte = swp_entry_to_pte(entry); |
| 840 | if (pte_swp_soft_dirty(*src_pte)) | ||
| 841 | pte = pte_swp_mksoft_dirty(pte); | ||
| 840 | set_pte_at(src_mm, addr, src_pte, pte); | 842 | set_pte_at(src_mm, addr, src_pte, pte); |
| 841 | } | 843 | } |
| 842 | } | 844 | } |
| @@ -3863,15 +3865,21 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, | |||
| 3863 | * space. Kernel faults are handled more gracefully. | 3865 | * space. Kernel faults are handled more gracefully. |
| 3864 | */ | 3866 | */ |
| 3865 | if (flags & FAULT_FLAG_USER) | 3867 | if (flags & FAULT_FLAG_USER) |
| 3866 | mem_cgroup_enable_oom(); | 3868 | mem_cgroup_oom_enable(); |
| 3867 | 3869 | ||
| 3868 | ret = __handle_mm_fault(mm, vma, address, flags); | 3870 | ret = __handle_mm_fault(mm, vma, address, flags); |
| 3869 | 3871 | ||
| 3870 | if (flags & FAULT_FLAG_USER) | 3872 | if (flags & FAULT_FLAG_USER) { |
| 3871 | mem_cgroup_disable_oom(); | 3873 | mem_cgroup_oom_disable(); |
| 3872 | 3874 | /* | |
| 3873 | if (WARN_ON(task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM))) | 3875 | * The task may have entered a memcg OOM situation but |
| 3874 | mem_cgroup_oom_synchronize(); | 3876 | * if the allocation error was handled gracefully (no |
| 3877 | * VM_FAULT_OOM), there is no need to kill anything. | ||
| 3878 | * Just clean up the OOM state peacefully. | ||
| 3879 | */ | ||
| 3880 | if (task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM)) | ||
| 3881 | mem_cgroup_oom_synchronize(false); | ||
| 3882 | } | ||
| 3875 | 3883 | ||
| 3876 | return ret; | 3884 | return ret; |
| 3877 | } | 3885 | } |
diff --git a/mm/migrate.c b/mm/migrate.c index a26bccd44ccb..7a7325ee1d08 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
| @@ -161,6 +161,8 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma, | |||
| 161 | 161 | ||
| 162 | get_page(new); | 162 | get_page(new); |
| 163 | pte = pte_mkold(mk_pte(new, vma->vm_page_prot)); | 163 | pte = pte_mkold(mk_pte(new, vma->vm_page_prot)); |
| 164 | if (pte_swp_soft_dirty(*ptep)) | ||
| 165 | pte = pte_mksoft_dirty(pte); | ||
| 164 | if (is_write_migration_entry(entry)) | 166 | if (is_write_migration_entry(entry)) |
| 165 | pte = pte_mkwrite(pte); | 167 | pte = pte_mkwrite(pte); |
| 166 | #ifdef CONFIG_HUGETLB_PAGE | 168 | #ifdef CONFIG_HUGETLB_PAGE |
diff --git a/mm/mprotect.c b/mm/mprotect.c index 94722a4d6b43..a3af058f68e4 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c | |||
| @@ -94,13 +94,16 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd, | |||
| 94 | swp_entry_t entry = pte_to_swp_entry(oldpte); | 94 | swp_entry_t entry = pte_to_swp_entry(oldpte); |
| 95 | 95 | ||
| 96 | if (is_write_migration_entry(entry)) { | 96 | if (is_write_migration_entry(entry)) { |
| 97 | pte_t newpte; | ||
| 97 | /* | 98 | /* |
| 98 | * A protection check is difficult so | 99 | * A protection check is difficult so |
| 99 | * just be safe and disable write | 100 | * just be safe and disable write |
| 100 | */ | 101 | */ |
| 101 | make_migration_entry_read(&entry); | 102 | make_migration_entry_read(&entry); |
| 102 | set_pte_at(mm, addr, pte, | 103 | newpte = swp_entry_to_pte(entry); |
| 103 | swp_entry_to_pte(entry)); | 104 | if (pte_swp_soft_dirty(oldpte)) |
| 105 | newpte = pte_swp_mksoft_dirty(newpte); | ||
| 106 | set_pte_at(mm, addr, pte, newpte); | ||
| 104 | } | 107 | } |
| 105 | pages++; | 108 | pages++; |
| 106 | } | 109 | } |
diff --git a/mm/mremap.c b/mm/mremap.c index 91b13d6a16d4..0843feb66f3d 100644 --- a/mm/mremap.c +++ b/mm/mremap.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <asm/uaccess.h> | 25 | #include <asm/uaccess.h> |
| 26 | #include <asm/cacheflush.h> | 26 | #include <asm/cacheflush.h> |
| 27 | #include <asm/tlbflush.h> | 27 | #include <asm/tlbflush.h> |
| 28 | #include <asm/pgalloc.h> | ||
| 29 | 28 | ||
| 30 | #include "internal.h" | 29 | #include "internal.h" |
| 31 | 30 | ||
| @@ -63,10 +62,8 @@ static pmd_t *alloc_new_pmd(struct mm_struct *mm, struct vm_area_struct *vma, | |||
| 63 | return NULL; | 62 | return NULL; |
| 64 | 63 | ||
| 65 | pmd = pmd_alloc(mm, pud, addr); | 64 | pmd = pmd_alloc(mm, pud, addr); |
| 66 | if (!pmd) { | 65 | if (!pmd) |
| 67 | pud_free(mm, pud); | ||
| 68 | return NULL; | 66 | return NULL; |
| 69 | } | ||
| 70 | 67 | ||
| 71 | VM_BUG_ON(pmd_trans_huge(*pmd)); | 68 | VM_BUG_ON(pmd_trans_huge(*pmd)); |
| 72 | 69 | ||
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 314e9d274381..6738c47f1f72 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
| @@ -680,7 +680,7 @@ void pagefault_out_of_memory(void) | |||
| 680 | { | 680 | { |
| 681 | struct zonelist *zonelist; | 681 | struct zonelist *zonelist; |
| 682 | 682 | ||
| 683 | if (mem_cgroup_oom_synchronize()) | 683 | if (mem_cgroup_oom_synchronize(true)) |
| 684 | return; | 684 | return; |
| 685 | 685 | ||
| 686 | zonelist = node_zonelist(first_online_node, GFP_KERNEL); | 686 | zonelist = node_zonelist(first_online_node, GFP_KERNEL); |
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index f5236f804aa6..63807583d8e8 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
| @@ -1210,11 +1210,11 @@ static unsigned long dirty_poll_interval(unsigned long dirty, | |||
| 1210 | return 1; | 1210 | return 1; |
| 1211 | } | 1211 | } |
| 1212 | 1212 | ||
| 1213 | static long bdi_max_pause(struct backing_dev_info *bdi, | 1213 | static unsigned long bdi_max_pause(struct backing_dev_info *bdi, |
| 1214 | unsigned long bdi_dirty) | 1214 | unsigned long bdi_dirty) |
| 1215 | { | 1215 | { |
| 1216 | long bw = bdi->avg_write_bandwidth; | 1216 | unsigned long bw = bdi->avg_write_bandwidth; |
| 1217 | long t; | 1217 | unsigned long t; |
| 1218 | 1218 | ||
| 1219 | /* | 1219 | /* |
| 1220 | * Limit pause time for small memory systems. If sleeping for too long | 1220 | * Limit pause time for small memory systems. If sleeping for too long |
| @@ -1226,7 +1226,7 @@ static long bdi_max_pause(struct backing_dev_info *bdi, | |||
| 1226 | t = bdi_dirty / (1 + bw / roundup_pow_of_two(1 + HZ / 8)); | 1226 | t = bdi_dirty / (1 + bw / roundup_pow_of_two(1 + HZ / 8)); |
| 1227 | t++; | 1227 | t++; |
| 1228 | 1228 | ||
| 1229 | return min_t(long, t, MAX_PAUSE); | 1229 | return min_t(unsigned long, t, MAX_PAUSE); |
| 1230 | } | 1230 | } |
| 1231 | 1231 | ||
| 1232 | static long bdi_min_pause(struct backing_dev_info *bdi, | 1232 | static long bdi_min_pause(struct backing_dev_info *bdi, |
diff --git a/mm/slab_common.c b/mm/slab_common.c index a3443278ce3a..e2e98af703ea 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c | |||
| @@ -56,6 +56,7 @@ static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name, | |||
| 56 | continue; | 56 | continue; |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | #if !defined(CONFIG_SLUB) || !defined(CONFIG_SLUB_DEBUG_ON) | ||
| 59 | /* | 60 | /* |
| 60 | * For simplicity, we won't check this in the list of memcg | 61 | * For simplicity, we won't check this in the list of memcg |
| 61 | * caches. We have control over memcg naming, and if there | 62 | * caches. We have control over memcg naming, and if there |
| @@ -69,6 +70,7 @@ static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name, | |||
| 69 | s = NULL; | 70 | s = NULL; |
| 70 | return -EINVAL; | 71 | return -EINVAL; |
| 71 | } | 72 | } |
| 73 | #endif | ||
| 72 | } | 74 | } |
| 73 | 75 | ||
| 74 | WARN_ON(strchr(name, ' ')); /* It confuses parsers */ | 76 | WARN_ON(strchr(name, ' ')); /* It confuses parsers */ |
diff --git a/mm/swapfile.c b/mm/swapfile.c index 3963fc24fcc1..de7c904e52e5 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
| @@ -1824,6 +1824,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) | |||
| 1824 | struct filename *pathname; | 1824 | struct filename *pathname; |
| 1825 | int i, type, prev; | 1825 | int i, type, prev; |
| 1826 | int err; | 1826 | int err; |
| 1827 | unsigned int old_block_size; | ||
| 1827 | 1828 | ||
| 1828 | if (!capable(CAP_SYS_ADMIN)) | 1829 | if (!capable(CAP_SYS_ADMIN)) |
| 1829 | return -EPERM; | 1830 | return -EPERM; |
| @@ -1914,6 +1915,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) | |||
| 1914 | } | 1915 | } |
| 1915 | 1916 | ||
| 1916 | swap_file = p->swap_file; | 1917 | swap_file = p->swap_file; |
| 1918 | old_block_size = p->old_block_size; | ||
| 1917 | p->swap_file = NULL; | 1919 | p->swap_file = NULL; |
| 1918 | p->max = 0; | 1920 | p->max = 0; |
| 1919 | swap_map = p->swap_map; | 1921 | swap_map = p->swap_map; |
| @@ -1938,7 +1940,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) | |||
| 1938 | inode = mapping->host; | 1940 | inode = mapping->host; |
| 1939 | if (S_ISBLK(inode->i_mode)) { | 1941 | if (S_ISBLK(inode->i_mode)) { |
| 1940 | struct block_device *bdev = I_BDEV(inode); | 1942 | struct block_device *bdev = I_BDEV(inode); |
| 1941 | set_blocksize(bdev, p->old_block_size); | 1943 | set_blocksize(bdev, old_block_size); |
| 1942 | blkdev_put(bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL); | 1944 | blkdev_put(bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL); |
| 1943 | } else { | 1945 | } else { |
| 1944 | mutex_lock(&inode->i_mutex); | 1946 | mutex_lock(&inode->i_mutex); |
diff --git a/mm/vmscan.c b/mm/vmscan.c index 53f2f82f83ae..eea668d9cff6 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
| @@ -211,6 +211,7 @@ void unregister_shrinker(struct shrinker *shrinker) | |||
| 211 | down_write(&shrinker_rwsem); | 211 | down_write(&shrinker_rwsem); |
| 212 | list_del(&shrinker->list); | 212 | list_del(&shrinker->list); |
| 213 | up_write(&shrinker_rwsem); | 213 | up_write(&shrinker_rwsem); |
| 214 | kfree(shrinker->nr_deferred); | ||
| 214 | } | 215 | } |
| 215 | EXPORT_SYMBOL(unregister_shrinker); | 216 | EXPORT_SYMBOL(unregister_shrinker); |
| 216 | 217 | ||
diff --git a/mm/zswap.c b/mm/zswap.c index 841e35f1db22..d93510c6aa2d 100644 --- a/mm/zswap.c +++ b/mm/zswap.c | |||
| @@ -804,6 +804,10 @@ static void zswap_frontswap_invalidate_area(unsigned type) | |||
| 804 | } | 804 | } |
| 805 | tree->rbroot = RB_ROOT; | 805 | tree->rbroot = RB_ROOT; |
| 806 | spin_unlock(&tree->lock); | 806 | spin_unlock(&tree->lock); |
| 807 | |||
| 808 | zbud_destroy_pool(tree->pool); | ||
| 809 | kfree(tree); | ||
| 810 | zswap_trees[type] = NULL; | ||
| 807 | } | 811 | } |
| 808 | 812 | ||
| 809 | static struct zbud_ops zswap_zbud_ops = { | 813 | static struct zbud_ops zswap_zbud_ops = { |
diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c index 309129732285..c7e634af8516 100644 --- a/net/8021q/vlan_netlink.c +++ b/net/8021q/vlan_netlink.c | |||
| @@ -171,7 +171,7 @@ static size_t vlan_get_size(const struct net_device *dev) | |||
| 171 | 171 | ||
| 172 | return nla_total_size(2) + /* IFLA_VLAN_PROTOCOL */ | 172 | return nla_total_size(2) + /* IFLA_VLAN_PROTOCOL */ |
| 173 | nla_total_size(2) + /* IFLA_VLAN_ID */ | 173 | nla_total_size(2) + /* IFLA_VLAN_ID */ |
| 174 | sizeof(struct ifla_vlan_flags) + /* IFLA_VLAN_FLAGS */ | 174 | nla_total_size(sizeof(struct ifla_vlan_flags)) + /* IFLA_VLAN_FLAGS */ |
| 175 | vlan_qos_map_size(vlan->nr_ingress_mappings) + | 175 | vlan_qos_map_size(vlan->nr_ingress_mappings) + |
| 176 | vlan_qos_map_size(vlan->nr_egress_mappings); | 176 | vlan_qos_map_size(vlan->nr_egress_mappings); |
| 177 | } | 177 | } |
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index c72d1bcdcf49..1356af660b5b 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c | |||
| @@ -65,6 +65,7 @@ static int __init batadv_init(void) | |||
| 65 | batadv_recv_handler_init(); | 65 | batadv_recv_handler_init(); |
| 66 | 66 | ||
| 67 | batadv_iv_init(); | 67 | batadv_iv_init(); |
| 68 | batadv_nc_init(); | ||
| 68 | 69 | ||
| 69 | batadv_event_workqueue = create_singlethread_workqueue("bat_events"); | 70 | batadv_event_workqueue = create_singlethread_workqueue("bat_events"); |
| 70 | 71 | ||
| @@ -142,7 +143,7 @@ int batadv_mesh_init(struct net_device *soft_iface) | |||
| 142 | if (ret < 0) | 143 | if (ret < 0) |
| 143 | goto err; | 144 | goto err; |
| 144 | 145 | ||
| 145 | ret = batadv_nc_init(bat_priv); | 146 | ret = batadv_nc_mesh_init(bat_priv); |
| 146 | if (ret < 0) | 147 | if (ret < 0) |
| 147 | goto err; | 148 | goto err; |
| 148 | 149 | ||
| @@ -167,7 +168,7 @@ void batadv_mesh_free(struct net_device *soft_iface) | |||
| 167 | batadv_vis_quit(bat_priv); | 168 | batadv_vis_quit(bat_priv); |
| 168 | 169 | ||
| 169 | batadv_gw_node_purge(bat_priv); | 170 | batadv_gw_node_purge(bat_priv); |
| 170 | batadv_nc_free(bat_priv); | 171 | batadv_nc_mesh_free(bat_priv); |
| 171 | batadv_dat_free(bat_priv); | 172 | batadv_dat_free(bat_priv); |
| 172 | batadv_bla_free(bat_priv); | 173 | batadv_bla_free(bat_priv); |
| 173 | 174 | ||
diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index a487d46e0aec..4ecc0b6bf8ab 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c | |||
| @@ -35,6 +35,20 @@ static int batadv_nc_recv_coded_packet(struct sk_buff *skb, | |||
| 35 | struct batadv_hard_iface *recv_if); | 35 | struct batadv_hard_iface *recv_if); |
| 36 | 36 | ||
| 37 | /** | 37 | /** |
| 38 | * batadv_nc_init - one-time initialization for network coding | ||
| 39 | */ | ||
| 40 | int __init batadv_nc_init(void) | ||
| 41 | { | ||
| 42 | int ret; | ||
| 43 | |||
| 44 | /* Register our packet type */ | ||
| 45 | ret = batadv_recv_handler_register(BATADV_CODED, | ||
| 46 | batadv_nc_recv_coded_packet); | ||
| 47 | |||
| 48 | return ret; | ||
| 49 | } | ||
| 50 | |||
| 51 | /** | ||
| 38 | * batadv_nc_start_timer - initialise the nc periodic worker | 52 | * batadv_nc_start_timer - initialise the nc periodic worker |
| 39 | * @bat_priv: the bat priv with all the soft interface information | 53 | * @bat_priv: the bat priv with all the soft interface information |
| 40 | */ | 54 | */ |
| @@ -45,10 +59,10 @@ static void batadv_nc_start_timer(struct batadv_priv *bat_priv) | |||
| 45 | } | 59 | } |
| 46 | 60 | ||
| 47 | /** | 61 | /** |
| 48 | * batadv_nc_init - initialise coding hash table and start house keeping | 62 | * batadv_nc_mesh_init - initialise coding hash table and start house keeping |
| 49 | * @bat_priv: the bat priv with all the soft interface information | 63 | * @bat_priv: the bat priv with all the soft interface information |
| 50 | */ | 64 | */ |
| 51 | int batadv_nc_init(struct batadv_priv *bat_priv) | 65 | int batadv_nc_mesh_init(struct batadv_priv *bat_priv) |
| 52 | { | 66 | { |
| 53 | bat_priv->nc.timestamp_fwd_flush = jiffies; | 67 | bat_priv->nc.timestamp_fwd_flush = jiffies; |
| 54 | bat_priv->nc.timestamp_sniffed_purge = jiffies; | 68 | bat_priv->nc.timestamp_sniffed_purge = jiffies; |
| @@ -70,11 +84,6 @@ int batadv_nc_init(struct batadv_priv *bat_priv) | |||
| 70 | batadv_hash_set_lock_class(bat_priv->nc.coding_hash, | 84 | batadv_hash_set_lock_class(bat_priv->nc.coding_hash, |
| 71 | &batadv_nc_decoding_hash_lock_class_key); | 85 | &batadv_nc_decoding_hash_lock_class_key); |
| 72 | 86 | ||
| 73 | /* Register our packet type */ | ||
| 74 | if (batadv_recv_handler_register(BATADV_CODED, | ||
| 75 | batadv_nc_recv_coded_packet) < 0) | ||
| 76 | goto err; | ||
| 77 | |||
| 78 | INIT_DELAYED_WORK(&bat_priv->nc.work, batadv_nc_worker); | 87 | INIT_DELAYED_WORK(&bat_priv->nc.work, batadv_nc_worker); |
| 79 | batadv_nc_start_timer(bat_priv); | 88 | batadv_nc_start_timer(bat_priv); |
| 80 | 89 | ||
| @@ -1721,12 +1730,11 @@ free_nc_packet: | |||
| 1721 | } | 1730 | } |
| 1722 | 1731 | ||
| 1723 | /** | 1732 | /** |
| 1724 | * batadv_nc_free - clean up network coding memory | 1733 | * batadv_nc_mesh_free - clean up network coding memory |
| 1725 | * @bat_priv: the bat priv with all the soft interface information | 1734 | * @bat_priv: the bat priv with all the soft interface information |
| 1726 | */ | 1735 | */ |
| 1727 | void batadv_nc_free(struct batadv_priv *bat_priv) | 1736 | void batadv_nc_mesh_free(struct batadv_priv *bat_priv) |
| 1728 | { | 1737 | { |
| 1729 | batadv_recv_handler_unregister(BATADV_CODED); | ||
| 1730 | cancel_delayed_work_sync(&bat_priv->nc.work); | 1738 | cancel_delayed_work_sync(&bat_priv->nc.work); |
| 1731 | 1739 | ||
| 1732 | batadv_nc_purge_paths(bat_priv, bat_priv->nc.coding_hash, NULL); | 1740 | batadv_nc_purge_paths(bat_priv, bat_priv->nc.coding_hash, NULL); |
diff --git a/net/batman-adv/network-coding.h b/net/batman-adv/network-coding.h index 85a4ec81ad50..ddfa618e80bf 100644 --- a/net/batman-adv/network-coding.h +++ b/net/batman-adv/network-coding.h | |||
| @@ -22,8 +22,9 @@ | |||
| 22 | 22 | ||
| 23 | #ifdef CONFIG_BATMAN_ADV_NC | 23 | #ifdef CONFIG_BATMAN_ADV_NC |
| 24 | 24 | ||
| 25 | int batadv_nc_init(struct batadv_priv *bat_priv); | 25 | int batadv_nc_init(void); |
| 26 | void batadv_nc_free(struct batadv_priv *bat_priv); | 26 | int batadv_nc_mesh_init(struct batadv_priv *bat_priv); |
| 27 | void batadv_nc_mesh_free(struct batadv_priv *bat_priv); | ||
| 27 | void batadv_nc_update_nc_node(struct batadv_priv *bat_priv, | 28 | void batadv_nc_update_nc_node(struct batadv_priv *bat_priv, |
| 28 | struct batadv_orig_node *orig_node, | 29 | struct batadv_orig_node *orig_node, |
| 29 | struct batadv_orig_node *orig_neigh_node, | 30 | struct batadv_orig_node *orig_neigh_node, |
| @@ -46,12 +47,17 @@ int batadv_nc_init_debugfs(struct batadv_priv *bat_priv); | |||
| 46 | 47 | ||
| 47 | #else /* ifdef CONFIG_BATMAN_ADV_NC */ | 48 | #else /* ifdef CONFIG_BATMAN_ADV_NC */ |
| 48 | 49 | ||
| 49 | static inline int batadv_nc_init(struct batadv_priv *bat_priv) | 50 | static inline int batadv_nc_init(void) |
| 50 | { | 51 | { |
| 51 | return 0; | 52 | return 0; |
| 52 | } | 53 | } |
| 53 | 54 | ||
| 54 | static inline void batadv_nc_free(struct batadv_priv *bat_priv) | 55 | static inline int batadv_nc_mesh_init(struct batadv_priv *bat_priv) |
| 56 | { | ||
| 57 | return 0; | ||
| 58 | } | ||
| 59 | |||
| 60 | static inline void batadv_nc_mesh_free(struct batadv_priv *bat_priv) | ||
| 55 | { | 61 | { |
| 56 | return; | 62 | return; |
| 57 | } | 63 | } |
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index ffd5874f2592..33e8f23acddd 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
| @@ -700,7 +700,7 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], | |||
| 700 | 700 | ||
| 701 | vid = nla_get_u16(tb[NDA_VLAN]); | 701 | vid = nla_get_u16(tb[NDA_VLAN]); |
| 702 | 702 | ||
| 703 | if (vid >= VLAN_N_VID) { | 703 | if (!vid || vid >= VLAN_VID_MASK) { |
| 704 | pr_info("bridge: RTM_NEWNEIGH with invalid vlan id %d\n", | 704 | pr_info("bridge: RTM_NEWNEIGH with invalid vlan id %d\n", |
| 705 | vid); | 705 | vid); |
| 706 | return -EINVAL; | 706 | return -EINVAL; |
| @@ -794,7 +794,7 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], | |||
| 794 | 794 | ||
| 795 | vid = nla_get_u16(tb[NDA_VLAN]); | 795 | vid = nla_get_u16(tb[NDA_VLAN]); |
| 796 | 796 | ||
| 797 | if (vid >= VLAN_N_VID) { | 797 | if (!vid || vid >= VLAN_VID_MASK) { |
| 798 | pr_info("bridge: RTM_NEWNEIGH with invalid vlan id %d\n", | 798 | pr_info("bridge: RTM_NEWNEIGH with invalid vlan id %d\n", |
| 799 | vid); | 799 | vid); |
| 800 | return -EINVAL; | 800 | return -EINVAL; |
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 85a09bb5ca51..b7b1914dfa25 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c | |||
| @@ -453,7 +453,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry) | |||
| 453 | call_rcu_bh(&p->rcu, br_multicast_free_pg); | 453 | call_rcu_bh(&p->rcu, br_multicast_free_pg); |
| 454 | err = 0; | 454 | err = 0; |
| 455 | 455 | ||
| 456 | if (!mp->ports && !mp->mglist && mp->timer_armed && | 456 | if (!mp->ports && !mp->mglist && |
| 457 | netif_running(br->dev)) | 457 | netif_running(br->dev)) |
| 458 | mod_timer(&mp->timer, jiffies); | 458 | mod_timer(&mp->timer, jiffies); |
| 459 | break; | 459 | break; |
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index d1c578630678..8b0b610ca2c9 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c | |||
| @@ -272,7 +272,7 @@ static void br_multicast_del_pg(struct net_bridge *br, | |||
| 272 | del_timer(&p->timer); | 272 | del_timer(&p->timer); |
| 273 | call_rcu_bh(&p->rcu, br_multicast_free_pg); | 273 | call_rcu_bh(&p->rcu, br_multicast_free_pg); |
| 274 | 274 | ||
| 275 | if (!mp->ports && !mp->mglist && mp->timer_armed && | 275 | if (!mp->ports && !mp->mglist && |
| 276 | netif_running(br->dev)) | 276 | netif_running(br->dev)) |
| 277 | mod_timer(&mp->timer, jiffies); | 277 | mod_timer(&mp->timer, jiffies); |
| 278 | 278 | ||
| @@ -620,7 +620,6 @@ rehash: | |||
| 620 | 620 | ||
| 621 | mp->br = br; | 621 | mp->br = br; |
| 622 | mp->addr = *group; | 622 | mp->addr = *group; |
| 623 | |||
| 624 | setup_timer(&mp->timer, br_multicast_group_expired, | 623 | setup_timer(&mp->timer, br_multicast_group_expired, |
| 625 | (unsigned long)mp); | 624 | (unsigned long)mp); |
| 626 | 625 | ||
| @@ -660,6 +659,7 @@ static int br_multicast_add_group(struct net_bridge *br, | |||
| 660 | struct net_bridge_mdb_entry *mp; | 659 | struct net_bridge_mdb_entry *mp; |
| 661 | struct net_bridge_port_group *p; | 660 | struct net_bridge_port_group *p; |
| 662 | struct net_bridge_port_group __rcu **pp; | 661 | struct net_bridge_port_group __rcu **pp; |
| 662 | unsigned long now = jiffies; | ||
| 663 | int err; | 663 | int err; |
| 664 | 664 | ||
| 665 | spin_lock(&br->multicast_lock); | 665 | spin_lock(&br->multicast_lock); |
| @@ -674,6 +674,7 @@ static int br_multicast_add_group(struct net_bridge *br, | |||
| 674 | 674 | ||
| 675 | if (!port) { | 675 | if (!port) { |
| 676 | mp->mglist = true; | 676 | mp->mglist = true; |
| 677 | mod_timer(&mp->timer, now + br->multicast_membership_interval); | ||
| 677 | goto out; | 678 | goto out; |
| 678 | } | 679 | } |
| 679 | 680 | ||
| @@ -681,7 +682,7 @@ static int br_multicast_add_group(struct net_bridge *br, | |||
| 681 | (p = mlock_dereference(*pp, br)) != NULL; | 682 | (p = mlock_dereference(*pp, br)) != NULL; |
| 682 | pp = &p->next) { | 683 | pp = &p->next) { |
| 683 | if (p->port == port) | 684 | if (p->port == port) |
| 684 | goto out; | 685 | goto found; |
| 685 | if ((unsigned long)p->port < (unsigned long)port) | 686 | if ((unsigned long)p->port < (unsigned long)port) |
| 686 | break; | 687 | break; |
| 687 | } | 688 | } |
| @@ -692,6 +693,8 @@ static int br_multicast_add_group(struct net_bridge *br, | |||
| 692 | rcu_assign_pointer(*pp, p); | 693 | rcu_assign_pointer(*pp, p); |
| 693 | br_mdb_notify(br->dev, port, group, RTM_NEWMDB); | 694 | br_mdb_notify(br->dev, port, group, RTM_NEWMDB); |
| 694 | 695 | ||
| 696 | found: | ||
| 697 | mod_timer(&p->timer, now + br->multicast_membership_interval); | ||
| 695 | out: | 698 | out: |
| 696 | err = 0; | 699 | err = 0; |
| 697 | 700 | ||
| @@ -1191,9 +1194,6 @@ static int br_ip4_multicast_query(struct net_bridge *br, | |||
| 1191 | if (!mp) | 1194 | if (!mp) |
| 1192 | goto out; | 1195 | goto out; |
| 1193 | 1196 | ||
| 1194 | mod_timer(&mp->timer, now + br->multicast_membership_interval); | ||
| 1195 | mp->timer_armed = true; | ||
| 1196 | |||
| 1197 | max_delay *= br->multicast_last_member_count; | 1197 | max_delay *= br->multicast_last_member_count; |
| 1198 | 1198 | ||
| 1199 | if (mp->mglist && | 1199 | if (mp->mglist && |
| @@ -1270,9 +1270,6 @@ static int br_ip6_multicast_query(struct net_bridge *br, | |||
| 1270 | if (!mp) | 1270 | if (!mp) |
| 1271 | goto out; | 1271 | goto out; |
| 1272 | 1272 | ||
| 1273 | mod_timer(&mp->timer, now + br->multicast_membership_interval); | ||
| 1274 | mp->timer_armed = true; | ||
| 1275 | |||
| 1276 | max_delay *= br->multicast_last_member_count; | 1273 | max_delay *= br->multicast_last_member_count; |
| 1277 | if (mp->mglist && | 1274 | if (mp->mglist && |
| 1278 | (timer_pending(&mp->timer) ? | 1275 | (timer_pending(&mp->timer) ? |
| @@ -1358,7 +1355,7 @@ static void br_multicast_leave_group(struct net_bridge *br, | |||
| 1358 | call_rcu_bh(&p->rcu, br_multicast_free_pg); | 1355 | call_rcu_bh(&p->rcu, br_multicast_free_pg); |
| 1359 | br_mdb_notify(br->dev, port, group, RTM_DELMDB); | 1356 | br_mdb_notify(br->dev, port, group, RTM_DELMDB); |
| 1360 | 1357 | ||
| 1361 | if (!mp->ports && !mp->mglist && mp->timer_armed && | 1358 | if (!mp->ports && !mp->mglist && |
| 1362 | netif_running(br->dev)) | 1359 | netif_running(br->dev)) |
| 1363 | mod_timer(&mp->timer, jiffies); | 1360 | mod_timer(&mp->timer, jiffies); |
| 1364 | } | 1361 | } |
| @@ -1370,12 +1367,30 @@ static void br_multicast_leave_group(struct net_bridge *br, | |||
| 1370 | br->multicast_last_member_interval; | 1367 | br->multicast_last_member_interval; |
| 1371 | 1368 | ||
| 1372 | if (!port) { | 1369 | if (!port) { |
| 1373 | if (mp->mglist && mp->timer_armed && | 1370 | if (mp->mglist && |
| 1374 | (timer_pending(&mp->timer) ? | 1371 | (timer_pending(&mp->timer) ? |
| 1375 | time_after(mp->timer.expires, time) : | 1372 | time_after(mp->timer.expires, time) : |
| 1376 | try_to_del_timer_sync(&mp->timer) >= 0)) { | 1373 | try_to_del_timer_sync(&mp->timer) >= 0)) { |
| 1377 | mod_timer(&mp->timer, time); | 1374 | mod_timer(&mp->timer, time); |
| 1378 | } | 1375 | } |
| 1376 | |||
| 1377 | goto out; | ||
| 1378 | } | ||
| 1379 | |||
| 1380 | for (p = mlock_dereference(mp->ports, br); | ||
| 1381 | p != NULL; | ||
| 1382 | p = mlock_dereference(p->next, br)) { | ||
| 1383 | if (p->port != port) | ||
| 1384 | continue; | ||
| 1385 | |||
| 1386 | if (!hlist_unhashed(&p->mglist) && | ||
| 1387 | (timer_pending(&p->timer) ? | ||
| 1388 | time_after(p->timer.expires, time) : | ||
| 1389 | try_to_del_timer_sync(&p->timer) >= 0)) { | ||
| 1390 | mod_timer(&p->timer, time); | ||
| 1391 | } | ||
| 1392 | |||
| 1393 | break; | ||
| 1379 | } | 1394 | } |
| 1380 | out: | 1395 | out: |
| 1381 | spin_unlock(&br->multicast_lock); | 1396 | spin_unlock(&br->multicast_lock); |
| @@ -1798,7 +1813,6 @@ void br_multicast_stop(struct net_bridge *br) | |||
| 1798 | hlist_for_each_entry_safe(mp, n, &mdb->mhash[i], | 1813 | hlist_for_each_entry_safe(mp, n, &mdb->mhash[i], |
| 1799 | hlist[ver]) { | 1814 | hlist[ver]) { |
| 1800 | del_timer(&mp->timer); | 1815 | del_timer(&mp->timer); |
| 1801 | mp->timer_armed = false; | ||
| 1802 | call_rcu_bh(&mp->rcu, br_multicast_free_group); | 1816 | call_rcu_bh(&mp->rcu, br_multicast_free_group); |
| 1803 | } | 1817 | } |
| 1804 | } | 1818 | } |
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index e74ddc1c29a8..f75d92e4f96b 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c | |||
| @@ -243,7 +243,7 @@ static int br_afspec(struct net_bridge *br, | |||
| 243 | 243 | ||
| 244 | vinfo = nla_data(tb[IFLA_BRIDGE_VLAN_INFO]); | 244 | vinfo = nla_data(tb[IFLA_BRIDGE_VLAN_INFO]); |
| 245 | 245 | ||
| 246 | if (vinfo->vid >= VLAN_N_VID) | 246 | if (!vinfo->vid || vinfo->vid >= VLAN_VID_MASK) |
| 247 | return -EINVAL; | 247 | return -EINVAL; |
| 248 | 248 | ||
| 249 | switch (cmd) { | 249 | switch (cmd) { |
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index efb57d911569..e14c33b42f75 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
| @@ -126,7 +126,6 @@ struct net_bridge_mdb_entry | |||
| 126 | struct timer_list timer; | 126 | struct timer_list timer; |
| 127 | struct br_ip addr; | 127 | struct br_ip addr; |
| 128 | bool mglist; | 128 | bool mglist; |
| 129 | bool timer_armed; | ||
| 130 | }; | 129 | }; |
| 131 | 130 | ||
| 132 | struct net_bridge_mdb_htable | 131 | struct net_bridge_mdb_htable |
| @@ -643,9 +642,7 @@ static inline u16 br_get_pvid(const struct net_port_vlans *v) | |||
| 643 | * vid wasn't set | 642 | * vid wasn't set |
| 644 | */ | 643 | */ |
| 645 | smp_rmb(); | 644 | smp_rmb(); |
| 646 | return (v->pvid & VLAN_TAG_PRESENT) ? | 645 | return v->pvid ?: VLAN_N_VID; |
| 647 | (v->pvid & ~VLAN_TAG_PRESENT) : | ||
| 648 | VLAN_N_VID; | ||
| 649 | } | 646 | } |
| 650 | 647 | ||
| 651 | #else | 648 | #else |
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 108084a04671..656a6f3e40de 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c | |||
| @@ -134,7 +134,7 @@ static void br_stp_start(struct net_bridge *br) | |||
| 134 | 134 | ||
| 135 | if (br->bridge_forward_delay < BR_MIN_FORWARD_DELAY) | 135 | if (br->bridge_forward_delay < BR_MIN_FORWARD_DELAY) |
| 136 | __br_set_forward_delay(br, BR_MIN_FORWARD_DELAY); | 136 | __br_set_forward_delay(br, BR_MIN_FORWARD_DELAY); |
| 137 | else if (br->bridge_forward_delay < BR_MAX_FORWARD_DELAY) | 137 | else if (br->bridge_forward_delay > BR_MAX_FORWARD_DELAY) |
| 138 | __br_set_forward_delay(br, BR_MAX_FORWARD_DELAY); | 138 | __br_set_forward_delay(br, BR_MAX_FORWARD_DELAY); |
| 139 | 139 | ||
| 140 | if (r == 0) { | 140 | if (r == 0) { |
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 9a9ffe7e4019..53f0990eab58 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c | |||
| @@ -45,37 +45,34 @@ static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags) | |||
| 45 | return 0; | 45 | return 0; |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | if (vid) { | 48 | if (v->port_idx) { |
| 49 | if (v->port_idx) { | 49 | p = v->parent.port; |
| 50 | p = v->parent.port; | 50 | br = p->br; |
| 51 | br = p->br; | 51 | dev = p->dev; |
| 52 | dev = p->dev; | 52 | } else { |
| 53 | } else { | 53 | br = v->parent.br; |
| 54 | br = v->parent.br; | 54 | dev = br->dev; |
| 55 | dev = br->dev; | 55 | } |
| 56 | } | 56 | ops = dev->netdev_ops; |
| 57 | ops = dev->netdev_ops; | 57 | |
| 58 | 58 | if (p && (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) { | |
| 59 | if (p && (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) { | 59 | /* Add VLAN to the device filter if it is supported. |
| 60 | /* Add VLAN to the device filter if it is supported. | 60 | * Stricly speaking, this is not necessary now, since |
| 61 | * Stricly speaking, this is not necessary now, since | 61 | * devices are made promiscuous by the bridge, but if |
| 62 | * devices are made promiscuous by the bridge, but if | 62 | * that ever changes this code will allow tagged |
| 63 | * that ever changes this code will allow tagged | 63 | * traffic to enter the bridge. |
| 64 | * traffic to enter the bridge. | 64 | */ |
| 65 | */ | 65 | err = ops->ndo_vlan_rx_add_vid(dev, htons(ETH_P_8021Q), |
| 66 | err = ops->ndo_vlan_rx_add_vid(dev, htons(ETH_P_8021Q), | 66 | vid); |
| 67 | vid); | 67 | if (err) |
| 68 | if (err) | 68 | return err; |
| 69 | return err; | 69 | } |
| 70 | } | ||
| 71 | |||
| 72 | err = br_fdb_insert(br, p, dev->dev_addr, vid); | ||
| 73 | if (err) { | ||
| 74 | br_err(br, "failed insert local address into bridge " | ||
| 75 | "forwarding table\n"); | ||
| 76 | goto out_filt; | ||
| 77 | } | ||
| 78 | 70 | ||
| 71 | err = br_fdb_insert(br, p, dev->dev_addr, vid); | ||
| 72 | if (err) { | ||
| 73 | br_err(br, "failed insert local address into bridge " | ||
| 74 | "forwarding table\n"); | ||
| 75 | goto out_filt; | ||
| 79 | } | 76 | } |
| 80 | 77 | ||
| 81 | set_bit(vid, v->vlan_bitmap); | 78 | set_bit(vid, v->vlan_bitmap); |
| @@ -98,7 +95,7 @@ static int __vlan_del(struct net_port_vlans *v, u16 vid) | |||
| 98 | __vlan_delete_pvid(v, vid); | 95 | __vlan_delete_pvid(v, vid); |
| 99 | clear_bit(vid, v->untagged_bitmap); | 96 | clear_bit(vid, v->untagged_bitmap); |
| 100 | 97 | ||
| 101 | if (v->port_idx && vid) { | 98 | if (v->port_idx) { |
| 102 | struct net_device *dev = v->parent.port->dev; | 99 | struct net_device *dev = v->parent.port->dev; |
| 103 | const struct net_device_ops *ops = dev->netdev_ops; | 100 | const struct net_device_ops *ops = dev->netdev_ops; |
| 104 | 101 | ||
| @@ -192,6 +189,8 @@ out: | |||
| 192 | bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v, | 189 | bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v, |
| 193 | struct sk_buff *skb, u16 *vid) | 190 | struct sk_buff *skb, u16 *vid) |
| 194 | { | 191 | { |
| 192 | int err; | ||
| 193 | |||
| 195 | /* If VLAN filtering is disabled on the bridge, all packets are | 194 | /* If VLAN filtering is disabled on the bridge, all packets are |
| 196 | * permitted. | 195 | * permitted. |
| 197 | */ | 196 | */ |
| @@ -204,20 +203,32 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v, | |||
| 204 | if (!v) | 203 | if (!v) |
| 205 | return false; | 204 | return false; |
| 206 | 205 | ||
| 207 | if (br_vlan_get_tag(skb, vid)) { | 206 | err = br_vlan_get_tag(skb, vid); |
| 207 | if (!*vid) { | ||
| 208 | u16 pvid = br_get_pvid(v); | 208 | u16 pvid = br_get_pvid(v); |
| 209 | 209 | ||
| 210 | /* Frame did not have a tag. See if pvid is set | 210 | /* Frame had a tag with VID 0 or did not have a tag. |
| 211 | * on this port. That tells us which vlan untagged | 211 | * See if pvid is set on this port. That tells us which |
| 212 | * traffic belongs to. | 212 | * vlan untagged or priority-tagged traffic belongs to. |
| 213 | */ | 213 | */ |
| 214 | if (pvid == VLAN_N_VID) | 214 | if (pvid == VLAN_N_VID) |
| 215 | return false; | 215 | return false; |
| 216 | 216 | ||
| 217 | /* PVID is set on this port. Any untagged ingress | 217 | /* PVID is set on this port. Any untagged or priority-tagged |
| 218 | * frame is considered to belong to this vlan. | 218 | * ingress frame is considered to belong to this vlan. |
| 219 | */ | 219 | */ |
| 220 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), pvid); | 220 | *vid = pvid; |
| 221 | if (likely(err)) | ||
| 222 | /* Untagged Frame. */ | ||
| 223 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), pvid); | ||
| 224 | else | ||
| 225 | /* Priority-tagged Frame. | ||
| 226 | * At this point, We know that skb->vlan_tci had | ||
| 227 | * VLAN_TAG_PRESENT bit and its VID field was 0x000. | ||
| 228 | * We update only VID field and preserve PCP field. | ||
| 229 | */ | ||
| 230 | skb->vlan_tci |= pvid; | ||
| 231 | |||
| 221 | return true; | 232 | return true; |
| 222 | } | 233 | } |
| 223 | 234 | ||
| @@ -248,7 +259,9 @@ bool br_allowed_egress(struct net_bridge *br, | |||
| 248 | return false; | 259 | return false; |
| 249 | } | 260 | } |
| 250 | 261 | ||
| 251 | /* Must be protected by RTNL */ | 262 | /* Must be protected by RTNL. |
| 263 | * Must be called with vid in range from 1 to 4094 inclusive. | ||
| 264 | */ | ||
| 252 | int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags) | 265 | int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags) |
| 253 | { | 266 | { |
| 254 | struct net_port_vlans *pv = NULL; | 267 | struct net_port_vlans *pv = NULL; |
| @@ -278,7 +291,9 @@ out: | |||
| 278 | return err; | 291 | return err; |
| 279 | } | 292 | } |
| 280 | 293 | ||
| 281 | /* Must be protected by RTNL */ | 294 | /* Must be protected by RTNL. |
| 295 | * Must be called with vid in range from 1 to 4094 inclusive. | ||
| 296 | */ | ||
| 282 | int br_vlan_delete(struct net_bridge *br, u16 vid) | 297 | int br_vlan_delete(struct net_bridge *br, u16 vid) |
| 283 | { | 298 | { |
| 284 | struct net_port_vlans *pv; | 299 | struct net_port_vlans *pv; |
| @@ -289,14 +304,9 @@ int br_vlan_delete(struct net_bridge *br, u16 vid) | |||
| 289 | if (!pv) | 304 | if (!pv) |
| 290 | return -EINVAL; | 305 | return -EINVAL; |
| 291 | 306 | ||
| 292 | if (vid) { | 307 | spin_lock_bh(&br->hash_lock); |
| 293 | /* If the VID !=0 remove fdb for this vid. VID 0 is special | 308 | fdb_delete_by_addr(br, br->dev->dev_addr, vid); |
| 294 | * in that it's the default and is always there in the fdb. | 309 | spin_unlock_bh(&br->hash_lock); |
| 295 | */ | ||
| 296 | spin_lock_bh(&br->hash_lock); | ||
| 297 | fdb_delete_by_addr(br, br->dev->dev_addr, vid); | ||
| 298 | spin_unlock_bh(&br->hash_lock); | ||
| 299 | } | ||
| 300 | 310 | ||
| 301 | __vlan_del(pv, vid); | 311 | __vlan_del(pv, vid); |
| 302 | return 0; | 312 | return 0; |
| @@ -329,7 +339,9 @@ unlock: | |||
| 329 | return 0; | 339 | return 0; |
| 330 | } | 340 | } |
| 331 | 341 | ||
| 332 | /* Must be protected by RTNL */ | 342 | /* Must be protected by RTNL. |
| 343 | * Must be called with vid in range from 1 to 4094 inclusive. | ||
| 344 | */ | ||
| 333 | int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags) | 345 | int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags) |
| 334 | { | 346 | { |
| 335 | struct net_port_vlans *pv = NULL; | 347 | struct net_port_vlans *pv = NULL; |
| @@ -363,7 +375,9 @@ clean_up: | |||
| 363 | return err; | 375 | return err; |
| 364 | } | 376 | } |
| 365 | 377 | ||
| 366 | /* Must be protected by RTNL */ | 378 | /* Must be protected by RTNL. |
| 379 | * Must be called with vid in range from 1 to 4094 inclusive. | ||
| 380 | */ | ||
| 367 | int nbp_vlan_delete(struct net_bridge_port *port, u16 vid) | 381 | int nbp_vlan_delete(struct net_bridge_port *port, u16 vid) |
| 368 | { | 382 | { |
| 369 | struct net_port_vlans *pv; | 383 | struct net_port_vlans *pv; |
| @@ -374,14 +388,9 @@ int nbp_vlan_delete(struct net_bridge_port *port, u16 vid) | |||
| 374 | if (!pv) | 388 | if (!pv) |
| 375 | return -EINVAL; | 389 | return -EINVAL; |
| 376 | 390 | ||
| 377 | if (vid) { | 391 | spin_lock_bh(&port->br->hash_lock); |
| 378 | /* If the VID !=0 remove fdb for this vid. VID 0 is special | 392 | fdb_delete_by_addr(port->br, port->dev->dev_addr, vid); |
| 379 | * in that it's the default and is always there in the fdb. | 393 | spin_unlock_bh(&port->br->hash_lock); |
| 380 | */ | ||
| 381 | spin_lock_bh(&port->br->hash_lock); | ||
| 382 | fdb_delete_by_addr(port->br, port->dev->dev_addr, vid); | ||
| 383 | spin_unlock_bh(&port->br->hash_lock); | ||
| 384 | } | ||
| 385 | 394 | ||
| 386 | return __vlan_del(pv, vid); | 395 | return __vlan_del(pv, vid); |
| 387 | } | 396 | } |
diff --git a/net/compat.c b/net/compat.c index f0a1ba6c8086..89032580bd1d 100644 --- a/net/compat.c +++ b/net/compat.c | |||
| @@ -71,6 +71,8 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg) | |||
| 71 | __get_user(kmsg->msg_controllen, &umsg->msg_controllen) || | 71 | __get_user(kmsg->msg_controllen, &umsg->msg_controllen) || |
| 72 | __get_user(kmsg->msg_flags, &umsg->msg_flags)) | 72 | __get_user(kmsg->msg_flags, &umsg->msg_flags)) |
| 73 | return -EFAULT; | 73 | return -EFAULT; |
| 74 | if (kmsg->msg_namelen > sizeof(struct sockaddr_storage)) | ||
| 75 | return -EINVAL; | ||
| 74 | kmsg->msg_name = compat_ptr(tmp1); | 76 | kmsg->msg_name = compat_ptr(tmp1); |
| 75 | kmsg->msg_iov = compat_ptr(tmp2); | 77 | kmsg->msg_iov = compat_ptr(tmp2); |
| 76 | kmsg->msg_control = compat_ptr(tmp3); | 78 | kmsg->msg_control = compat_ptr(tmp3); |
diff --git a/net/core/dev.c b/net/core/dev.c index 65f829cfd928..3430b1ed12e5 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -1917,7 +1917,8 @@ static struct xps_map *expand_xps_map(struct xps_map *map, | |||
| 1917 | return new_map; | 1917 | return new_map; |
| 1918 | } | 1918 | } |
| 1919 | 1919 | ||
| 1920 | int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask, u16 index) | 1920 | int netif_set_xps_queue(struct net_device *dev, const struct cpumask *mask, |
| 1921 | u16 index) | ||
| 1921 | { | 1922 | { |
| 1922 | struct xps_dev_maps *dev_maps, *new_dev_maps = NULL; | 1923 | struct xps_dev_maps *dev_maps, *new_dev_maps = NULL; |
| 1923 | struct xps_map *map, *new_map; | 1924 | struct xps_map *map, *new_map; |
diff --git a/net/core/filter.c b/net/core/filter.c index 6438f29ff266..01b780856db2 100644 --- a/net/core/filter.c +++ b/net/core/filter.c | |||
| @@ -644,7 +644,6 @@ void sk_filter_release_rcu(struct rcu_head *rcu) | |||
| 644 | struct sk_filter *fp = container_of(rcu, struct sk_filter, rcu); | 644 | struct sk_filter *fp = container_of(rcu, struct sk_filter, rcu); |
| 645 | 645 | ||
| 646 | bpf_jit_free(fp); | 646 | bpf_jit_free(fp); |
| 647 | kfree(fp); | ||
| 648 | } | 647 | } |
| 649 | EXPORT_SYMBOL(sk_filter_release_rcu); | 648 | EXPORT_SYMBOL(sk_filter_release_rcu); |
| 650 | 649 | ||
| @@ -683,7 +682,7 @@ int sk_unattached_filter_create(struct sk_filter **pfp, | |||
| 683 | if (fprog->filter == NULL) | 682 | if (fprog->filter == NULL) |
| 684 | return -EINVAL; | 683 | return -EINVAL; |
| 685 | 684 | ||
| 686 | fp = kmalloc(fsize + sizeof(*fp), GFP_KERNEL); | 685 | fp = kmalloc(sk_filter_size(fprog->len), GFP_KERNEL); |
| 687 | if (!fp) | 686 | if (!fp) |
| 688 | return -ENOMEM; | 687 | return -ENOMEM; |
| 689 | memcpy(fp->insns, fprog->filter, fsize); | 688 | memcpy(fp->insns, fprog->filter, fsize); |
| @@ -723,6 +722,7 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk) | |||
| 723 | { | 722 | { |
| 724 | struct sk_filter *fp, *old_fp; | 723 | struct sk_filter *fp, *old_fp; |
| 725 | unsigned int fsize = sizeof(struct sock_filter) * fprog->len; | 724 | unsigned int fsize = sizeof(struct sock_filter) * fprog->len; |
| 725 | unsigned int sk_fsize = sk_filter_size(fprog->len); | ||
| 726 | int err; | 726 | int err; |
| 727 | 727 | ||
| 728 | if (sock_flag(sk, SOCK_FILTER_LOCKED)) | 728 | if (sock_flag(sk, SOCK_FILTER_LOCKED)) |
| @@ -732,11 +732,11 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk) | |||
| 732 | if (fprog->filter == NULL) | 732 | if (fprog->filter == NULL) |
| 733 | return -EINVAL; | 733 | return -EINVAL; |
| 734 | 734 | ||
| 735 | fp = sock_kmalloc(sk, fsize+sizeof(*fp), GFP_KERNEL); | 735 | fp = sock_kmalloc(sk, sk_fsize, GFP_KERNEL); |
| 736 | if (!fp) | 736 | if (!fp) |
| 737 | return -ENOMEM; | 737 | return -ENOMEM; |
| 738 | if (copy_from_user(fp->insns, fprog->filter, fsize)) { | 738 | if (copy_from_user(fp->insns, fprog->filter, fsize)) { |
| 739 | sock_kfree_s(sk, fp, fsize+sizeof(*fp)); | 739 | sock_kfree_s(sk, fp, sk_fsize); |
| 740 | return -EFAULT; | 740 | return -EFAULT; |
| 741 | } | 741 | } |
| 742 | 742 | ||
diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c index 3f1ec1586ae1..8d9d05edd2eb 100644 --- a/net/core/secure_seq.c +++ b/net/core/secure_seq.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | #include <net/secure_seq.h> | 11 | #include <net/secure_seq.h> |
| 12 | 12 | ||
| 13 | #if IS_ENABLED(CONFIG_IPV6) || IS_ENABLED(CONFIG_INET) | ||
| 13 | #define NET_SECRET_SIZE (MD5_MESSAGE_BYTES / 4) | 14 | #define NET_SECRET_SIZE (MD5_MESSAGE_BYTES / 4) |
| 14 | 15 | ||
| 15 | static u32 net_secret[NET_SECRET_SIZE] ____cacheline_aligned; | 16 | static u32 net_secret[NET_SECRET_SIZE] ____cacheline_aligned; |
| @@ -29,6 +30,7 @@ static void net_secret_init(void) | |||
| 29 | cmpxchg(&net_secret[--i], 0, tmp); | 30 | cmpxchg(&net_secret[--i], 0, tmp); |
| 30 | } | 31 | } |
| 31 | } | 32 | } |
| 33 | #endif | ||
| 32 | 34 | ||
| 33 | #ifdef CONFIG_INET | 35 | #ifdef CONFIG_INET |
| 34 | static u32 seq_scale(u32 seq) | 36 | static u32 seq_scale(u32 seq) |
diff --git a/net/core/sock.c b/net/core/sock.c index 5b6beba494a3..0b39e7ae4383 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
| @@ -2319,6 +2319,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) | |||
| 2319 | sk->sk_ll_usec = sysctl_net_busy_read; | 2319 | sk->sk_ll_usec = sysctl_net_busy_read; |
| 2320 | #endif | 2320 | #endif |
| 2321 | 2321 | ||
| 2322 | sk->sk_pacing_rate = ~0U; | ||
| 2322 | /* | 2323 | /* |
| 2323 | * Before updating sk_refcnt, we must commit prior changes to memory | 2324 | * Before updating sk_refcnt, we must commit prior changes to memory |
| 2324 | * (Documentation/RCU/rculist_nulls.txt for details) | 2325 | * (Documentation/RCU/rculist_nulls.txt for details) |
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c index c85e71e0c7ff..ff41b4d60d30 100644 --- a/net/ieee802154/6lowpan.c +++ b/net/ieee802154/6lowpan.c | |||
| @@ -1372,6 +1372,8 @@ static int lowpan_newlink(struct net *src_net, struct net_device *dev, | |||
| 1372 | real_dev = dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK])); | 1372 | real_dev = dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK])); |
| 1373 | if (!real_dev) | 1373 | if (!real_dev) |
| 1374 | return -ENODEV; | 1374 | return -ENODEV; |
| 1375 | if (real_dev->type != ARPHRD_IEEE802154) | ||
| 1376 | return -EINVAL; | ||
| 1375 | 1377 | ||
| 1376 | lowpan_dev_info(dev)->real_dev = real_dev; | 1378 | lowpan_dev_info(dev)->real_dev = real_dev; |
| 1377 | lowpan_dev_info(dev)->fragment_tag = 0; | 1379 | lowpan_dev_info(dev)->fragment_tag = 0; |
| @@ -1386,6 +1388,9 @@ static int lowpan_newlink(struct net *src_net, struct net_device *dev, | |||
| 1386 | 1388 | ||
| 1387 | entry->ldev = dev; | 1389 | entry->ldev = dev; |
| 1388 | 1390 | ||
| 1391 | /* Set the lowpan harware address to the wpan hardware address. */ | ||
| 1392 | memcpy(dev->dev_addr, real_dev->dev_addr, IEEE802154_ADDR_LEN); | ||
| 1393 | |||
| 1389 | mutex_lock(&lowpan_dev_info(dev)->dev_list_mtx); | 1394 | mutex_lock(&lowpan_dev_info(dev)->dev_list_mtx); |
| 1390 | INIT_LIST_HEAD(&entry->list); | 1395 | INIT_LIST_HEAD(&entry->list); |
| 1391 | list_add_tail(&entry->list, &lowpan_devices); | 1396 | list_add_tail(&entry->list, &lowpan_devices); |
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 7bd8983dbfcf..96da9c77deca 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c | |||
| @@ -287,7 +287,7 @@ begintw: | |||
| 287 | if (unlikely(!INET_TW_MATCH(sk, net, acookie, | 287 | if (unlikely(!INET_TW_MATCH(sk, net, acookie, |
| 288 | saddr, daddr, ports, | 288 | saddr, daddr, ports, |
| 289 | dif))) { | 289 | dif))) { |
| 290 | sock_put(sk); | 290 | inet_twsk_put(inet_twsk(sk)); |
| 291 | goto begintw; | 291 | goto begintw; |
| 292 | } | 292 | } |
| 293 | goto out; | 293 | goto out; |
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index a04d872c54f9..3982eabf61e1 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c | |||
| @@ -772,15 +772,20 @@ static inline int ip_ufo_append_data(struct sock *sk, | |||
| 772 | /* initialize protocol header pointer */ | 772 | /* initialize protocol header pointer */ |
| 773 | skb->transport_header = skb->network_header + fragheaderlen; | 773 | skb->transport_header = skb->network_header + fragheaderlen; |
| 774 | 774 | ||
| 775 | skb->ip_summed = CHECKSUM_PARTIAL; | ||
| 776 | skb->csum = 0; | 775 | skb->csum = 0; |
| 777 | 776 | ||
| 778 | /* specify the length of each IP datagram fragment */ | 777 | |
| 779 | skb_shinfo(skb)->gso_size = maxfraglen - fragheaderlen; | ||
| 780 | skb_shinfo(skb)->gso_type = SKB_GSO_UDP; | ||
| 781 | __skb_queue_tail(queue, skb); | 778 | __skb_queue_tail(queue, skb); |
| 779 | } else if (skb_is_gso(skb)) { | ||
| 780 | goto append; | ||
| 782 | } | 781 | } |
| 783 | 782 | ||
| 783 | skb->ip_summed = CHECKSUM_PARTIAL; | ||
| 784 | /* specify the length of each IP datagram fragment */ | ||
| 785 | skb_shinfo(skb)->gso_size = maxfraglen - fragheaderlen; | ||
| 786 | skb_shinfo(skb)->gso_type = SKB_GSO_UDP; | ||
| 787 | |||
| 788 | append: | ||
| 784 | return skb_append_datato_frags(sk, skb, getfrag, from, | 789 | return skb_append_datato_frags(sk, skb, getfrag, from, |
| 785 | (length - transhdrlen)); | 790 | (length - transhdrlen)); |
| 786 | } | 791 | } |
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index e805e7b3030e..6e87f853d033 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c | |||
| @@ -125,8 +125,17 @@ static int vti_rcv(struct sk_buff *skb) | |||
| 125 | iph->saddr, iph->daddr, 0); | 125 | iph->saddr, iph->daddr, 0); |
| 126 | if (tunnel != NULL) { | 126 | if (tunnel != NULL) { |
| 127 | struct pcpu_tstats *tstats; | 127 | struct pcpu_tstats *tstats; |
| 128 | u32 oldmark = skb->mark; | ||
| 129 | int ret; | ||
| 128 | 130 | ||
| 129 | if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) | 131 | |
| 132 | /* temporarily mark the skb with the tunnel o_key, to | ||
| 133 | * only match policies with this mark. | ||
| 134 | */ | ||
| 135 | skb->mark = be32_to_cpu(tunnel->parms.o_key); | ||
| 136 | ret = xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb); | ||
| 137 | skb->mark = oldmark; | ||
| 138 | if (!ret) | ||
| 130 | return -1; | 139 | return -1; |
| 131 | 140 | ||
| 132 | tstats = this_cpu_ptr(tunnel->dev->tstats); | 141 | tstats = this_cpu_ptr(tunnel->dev->tstats); |
| @@ -135,7 +144,6 @@ static int vti_rcv(struct sk_buff *skb) | |||
| 135 | tstats->rx_bytes += skb->len; | 144 | tstats->rx_bytes += skb->len; |
| 136 | u64_stats_update_end(&tstats->syncp); | 145 | u64_stats_update_end(&tstats->syncp); |
| 137 | 146 | ||
| 138 | skb->mark = 0; | ||
| 139 | secpath_reset(skb); | 147 | secpath_reset(skb); |
| 140 | skb->dev = tunnel->dev; | 148 | skb->dev = tunnel->dev; |
| 141 | return 1; | 149 | return 1; |
| @@ -167,7 +175,7 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 167 | 175 | ||
| 168 | memset(&fl4, 0, sizeof(fl4)); | 176 | memset(&fl4, 0, sizeof(fl4)); |
| 169 | flowi4_init_output(&fl4, tunnel->parms.link, | 177 | flowi4_init_output(&fl4, tunnel->parms.link, |
| 170 | be32_to_cpu(tunnel->parms.i_key), RT_TOS(tos), | 178 | be32_to_cpu(tunnel->parms.o_key), RT_TOS(tos), |
| 171 | RT_SCOPE_UNIVERSE, | 179 | RT_SCOPE_UNIVERSE, |
| 172 | IPPROTO_IPIP, 0, | 180 | IPPROTO_IPIP, 0, |
| 173 | dst, tiph->saddr, 0, 0); | 181 | dst, tiph->saddr, 0, 0); |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 727f4365bcdf..6011615e810d 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
| @@ -2072,7 +2072,7 @@ struct rtable *__ip_route_output_key(struct net *net, struct flowi4 *fl4) | |||
| 2072 | RT_SCOPE_LINK); | 2072 | RT_SCOPE_LINK); |
| 2073 | goto make_route; | 2073 | goto make_route; |
| 2074 | } | 2074 | } |
| 2075 | if (fl4->saddr) { | 2075 | if (!fl4->saddr) { |
| 2076 | if (ipv4_is_multicast(fl4->daddr)) | 2076 | if (ipv4_is_multicast(fl4->daddr)) |
| 2077 | fl4->saddr = inet_select_addr(dev_out, 0, | 2077 | fl4->saddr = inet_select_addr(dev_out, 0, |
| 2078 | fl4->flowi4_scope); | 2078 | fl4->flowi4_scope); |
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 25a89eaa669d..a16b01b537ba 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -1284,7 +1284,10 @@ static bool tcp_shifted_skb(struct sock *sk, struct sk_buff *skb, | |||
| 1284 | tp->lost_cnt_hint -= tcp_skb_pcount(prev); | 1284 | tp->lost_cnt_hint -= tcp_skb_pcount(prev); |
| 1285 | } | 1285 | } |
| 1286 | 1286 | ||
| 1287 | TCP_SKB_CB(skb)->tcp_flags |= TCP_SKB_CB(prev)->tcp_flags; | 1287 | TCP_SKB_CB(prev)->tcp_flags |= TCP_SKB_CB(skb)->tcp_flags; |
| 1288 | if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN) | ||
| 1289 | TCP_SKB_CB(prev)->end_seq++; | ||
| 1290 | |||
| 1288 | if (skb == tcp_highest_sack(sk)) | 1291 | if (skb == tcp_highest_sack(sk)) |
| 1289 | tcp_advance_highest_sack(sk, skb); | 1292 | tcp_advance_highest_sack(sk, skb); |
| 1290 | 1293 | ||
| @@ -3288,7 +3291,7 @@ static void tcp_process_tlp_ack(struct sock *sk, u32 ack, int flag) | |||
| 3288 | tcp_init_cwnd_reduction(sk, true); | 3291 | tcp_init_cwnd_reduction(sk, true); |
| 3289 | tcp_set_ca_state(sk, TCP_CA_CWR); | 3292 | tcp_set_ca_state(sk, TCP_CA_CWR); |
| 3290 | tcp_end_cwnd_reduction(sk); | 3293 | tcp_end_cwnd_reduction(sk); |
| 3291 | tcp_set_ca_state(sk, TCP_CA_Open); | 3294 | tcp_try_keep_open(sk); |
| 3292 | NET_INC_STATS_BH(sock_net(sk), | 3295 | NET_INC_STATS_BH(sock_net(sk), |
| 3293 | LINUX_MIB_TCPLOSSPROBERECOVERY); | 3296 | LINUX_MIB_TCPLOSSPROBERECOVERY); |
| 3294 | } | 3297 | } |
| @@ -5709,6 +5712,8 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, | |||
| 5709 | } else | 5712 | } else |
| 5710 | tcp_init_metrics(sk); | 5713 | tcp_init_metrics(sk); |
| 5711 | 5714 | ||
| 5715 | tcp_update_pacing_rate(sk); | ||
| 5716 | |||
| 5712 | /* Prevent spurious tcp_cwnd_restart() on first data packet */ | 5717 | /* Prevent spurious tcp_cwnd_restart() on first data packet */ |
| 5713 | tp->lsndtime = tcp_time_stamp; | 5718 | tp->lsndtime = tcp_time_stamp; |
| 5714 | 5719 | ||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index e6bb8256e59f..d46f2143305c 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -637,6 +637,8 @@ static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb | |||
| 637 | unsigned int size = 0; | 637 | unsigned int size = 0; |
| 638 | unsigned int eff_sacks; | 638 | unsigned int eff_sacks; |
| 639 | 639 | ||
| 640 | opts->options = 0; | ||
| 641 | |||
| 640 | #ifdef CONFIG_TCP_MD5SIG | 642 | #ifdef CONFIG_TCP_MD5SIG |
| 641 | *md5 = tp->af_specific->md5_lookup(sk, sk); | 643 | *md5 = tp->af_specific->md5_lookup(sk, sk); |
| 642 | if (unlikely(*md5)) { | 644 | if (unlikely(*md5)) { |
| @@ -984,8 +986,10 @@ static void tcp_queue_skb(struct sock *sk, struct sk_buff *skb) | |||
| 984 | static void tcp_set_skb_tso_segs(const struct sock *sk, struct sk_buff *skb, | 986 | static void tcp_set_skb_tso_segs(const struct sock *sk, struct sk_buff *skb, |
| 985 | unsigned int mss_now) | 987 | unsigned int mss_now) |
| 986 | { | 988 | { |
| 987 | if (skb->len <= mss_now || !sk_can_gso(sk) || | 989 | /* Make sure we own this skb before messing gso_size/gso_segs */ |
| 988 | skb->ip_summed == CHECKSUM_NONE) { | 990 | WARN_ON_ONCE(skb_cloned(skb)); |
| 991 | |||
| 992 | if (skb->len <= mss_now || skb->ip_summed == CHECKSUM_NONE) { | ||
| 989 | /* Avoid the costly divide in the normal | 993 | /* Avoid the costly divide in the normal |
| 990 | * non-TSO case. | 994 | * non-TSO case. |
| 991 | */ | 995 | */ |
| @@ -1065,9 +1069,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, | |||
| 1065 | if (nsize < 0) | 1069 | if (nsize < 0) |
| 1066 | nsize = 0; | 1070 | nsize = 0; |
| 1067 | 1071 | ||
| 1068 | if (skb_cloned(skb) && | 1072 | if (skb_unclone(skb, GFP_ATOMIC)) |
| 1069 | skb_is_nonlinear(skb) && | ||
| 1070 | pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) | ||
| 1071 | return -ENOMEM; | 1073 | return -ENOMEM; |
| 1072 | 1074 | ||
| 1073 | /* Get a new skb... force flag on. */ | 1075 | /* Get a new skb... force flag on. */ |
| @@ -2342,6 +2344,8 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb) | |||
| 2342 | int oldpcount = tcp_skb_pcount(skb); | 2344 | int oldpcount = tcp_skb_pcount(skb); |
| 2343 | 2345 | ||
| 2344 | if (unlikely(oldpcount > 1)) { | 2346 | if (unlikely(oldpcount > 1)) { |
| 2347 | if (skb_unclone(skb, GFP_ATOMIC)) | ||
| 2348 | return -ENOMEM; | ||
| 2345 | tcp_init_tso_segs(sk, skb, cur_mss); | 2349 | tcp_init_tso_segs(sk, skb, cur_mss); |
| 2346 | tcp_adjust_pcount(sk, skb, oldpcount - tcp_skb_pcount(skb)); | 2350 | tcp_adjust_pcount(sk, skb, oldpcount - tcp_skb_pcount(skb)); |
| 2347 | } | 2351 | } |
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index 9a459be24af7..ccde54248c8c 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c | |||
| @@ -107,6 +107,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) | |||
| 107 | 107 | ||
| 108 | memset(fl4, 0, sizeof(struct flowi4)); | 108 | memset(fl4, 0, sizeof(struct flowi4)); |
| 109 | fl4->flowi4_mark = skb->mark; | 109 | fl4->flowi4_mark = skb->mark; |
| 110 | fl4->flowi4_oif = skb_dst(skb)->dev->ifindex; | ||
| 110 | 111 | ||
| 111 | if (!ip_is_fragment(iph)) { | 112 | if (!ip_is_fragment(iph)) { |
| 112 | switch (iph->protocol) { | 113 | switch (iph->protocol) { |
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index 73784c3d4642..82e1da3a40b9 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c | |||
| @@ -618,8 +618,7 @@ static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
| 618 | struct ip_auth_hdr *ah = (struct ip_auth_hdr*)(skb->data+offset); | 618 | struct ip_auth_hdr *ah = (struct ip_auth_hdr*)(skb->data+offset); |
| 619 | struct xfrm_state *x; | 619 | struct xfrm_state *x; |
| 620 | 620 | ||
| 621 | if (type != ICMPV6_DEST_UNREACH && | 621 | if (type != ICMPV6_PKT_TOOBIG && |
| 622 | type != ICMPV6_PKT_TOOBIG && | ||
| 623 | type != NDISC_REDIRECT) | 622 | type != NDISC_REDIRECT) |
| 624 | return; | 623 | return; |
| 625 | 624 | ||
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index d3618a78fcac..e67e63f9858d 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
| @@ -436,8 +436,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
| 436 | struct ip_esp_hdr *esph = (struct ip_esp_hdr *)(skb->data + offset); | 436 | struct ip_esp_hdr *esph = (struct ip_esp_hdr *)(skb->data + offset); |
| 437 | struct xfrm_state *x; | 437 | struct xfrm_state *x; |
| 438 | 438 | ||
| 439 | if (type != ICMPV6_DEST_UNREACH && | 439 | if (type != ICMPV6_PKT_TOOBIG && |
| 440 | type != ICMPV6_PKT_TOOBIG && | ||
| 441 | type != NDISC_REDIRECT) | 440 | type != NDISC_REDIRECT) |
| 442 | return; | 441 | return; |
| 443 | 442 | ||
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 32b4a1675d82..066640e0ba8e 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c | |||
| @@ -116,7 +116,7 @@ begintw: | |||
| 116 | } | 116 | } |
| 117 | if (unlikely(!INET6_TW_MATCH(sk, net, saddr, daddr, | 117 | if (unlikely(!INET6_TW_MATCH(sk, net, saddr, daddr, |
| 118 | ports, dif))) { | 118 | ports, dif))) { |
| 119 | sock_put(sk); | 119 | inet_twsk_put(inet_twsk(sk)); |
| 120 | goto begintw; | 120 | goto begintw; |
| 121 | } | 121 | } |
| 122 | goto out; | 122 | goto out; |
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 7bb5446b9d73..bf4a9a084de5 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c | |||
| @@ -976,6 +976,7 @@ static void ip6gre_tnl_link_config(struct ip6_tnl *t, int set_mtu) | |||
| 976 | if (t->parms.o_flags&GRE_SEQ) | 976 | if (t->parms.o_flags&GRE_SEQ) |
| 977 | addend += 4; | 977 | addend += 4; |
| 978 | } | 978 | } |
| 979 | t->hlen = addend; | ||
| 979 | 980 | ||
| 980 | if (p->flags & IP6_TNL_F_CAP_XMIT) { | 981 | if (p->flags & IP6_TNL_F_CAP_XMIT) { |
| 981 | int strict = (ipv6_addr_type(&p->raddr) & | 982 | int strict = (ipv6_addr_type(&p->raddr) & |
| @@ -1002,8 +1003,6 @@ static void ip6gre_tnl_link_config(struct ip6_tnl *t, int set_mtu) | |||
| 1002 | } | 1003 | } |
| 1003 | ip6_rt_put(rt); | 1004 | ip6_rt_put(rt); |
| 1004 | } | 1005 | } |
| 1005 | |||
| 1006 | t->hlen = addend; | ||
| 1007 | } | 1006 | } |
| 1008 | 1007 | ||
| 1009 | static int ip6gre_tnl_change(struct ip6_tnl *t, | 1008 | static int ip6gre_tnl_change(struct ip6_tnl *t, |
| @@ -1173,9 +1172,8 @@ done: | |||
| 1173 | 1172 | ||
| 1174 | static int ip6gre_tunnel_change_mtu(struct net_device *dev, int new_mtu) | 1173 | static int ip6gre_tunnel_change_mtu(struct net_device *dev, int new_mtu) |
| 1175 | { | 1174 | { |
| 1176 | struct ip6_tnl *tunnel = netdev_priv(dev); | ||
| 1177 | if (new_mtu < 68 || | 1175 | if (new_mtu < 68 || |
| 1178 | new_mtu > 0xFFF8 - dev->hard_header_len - tunnel->hlen) | 1176 | new_mtu > 0xFFF8 - dev->hard_header_len) |
| 1179 | return -EINVAL; | 1177 | return -EINVAL; |
| 1180 | dev->mtu = new_mtu; | 1178 | dev->mtu = new_mtu; |
| 1181 | return 0; | 1179 | return 0; |
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index a54c45ce4a48..91fb4e8212f5 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
| @@ -105,7 +105,7 @@ static int ip6_finish_output2(struct sk_buff *skb) | |||
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | rcu_read_lock_bh(); | 107 | rcu_read_lock_bh(); |
| 108 | nexthop = rt6_nexthop((struct rt6_info *)dst, &ipv6_hdr(skb)->daddr); | 108 | nexthop = rt6_nexthop((struct rt6_info *)dst); |
| 109 | neigh = __ipv6_neigh_lookup_noref(dst->dev, nexthop); | 109 | neigh = __ipv6_neigh_lookup_noref(dst->dev, nexthop); |
| 110 | if (unlikely(!neigh)) | 110 | if (unlikely(!neigh)) |
| 111 | neigh = __neigh_create(&nd_tbl, nexthop, dst->dev, false); | 111 | neigh = __neigh_create(&nd_tbl, nexthop, dst->dev, false); |
| @@ -874,7 +874,7 @@ static int ip6_dst_lookup_tail(struct sock *sk, | |||
| 874 | */ | 874 | */ |
| 875 | rt = (struct rt6_info *) *dst; | 875 | rt = (struct rt6_info *) *dst; |
| 876 | rcu_read_lock_bh(); | 876 | rcu_read_lock_bh(); |
| 877 | n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt, &fl6->daddr)); | 877 | n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt)); |
| 878 | err = n && !(n->nud_state & NUD_VALID) ? -EINVAL : 0; | 878 | err = n && !(n->nud_state & NUD_VALID) ? -EINVAL : 0; |
| 879 | rcu_read_unlock_bh(); | 879 | rcu_read_unlock_bh(); |
| 880 | 880 | ||
| @@ -1008,6 +1008,7 @@ static inline int ip6_ufo_append_data(struct sock *sk, | |||
| 1008 | 1008 | ||
| 1009 | { | 1009 | { |
| 1010 | struct sk_buff *skb; | 1010 | struct sk_buff *skb; |
| 1011 | struct frag_hdr fhdr; | ||
| 1011 | int err; | 1012 | int err; |
| 1012 | 1013 | ||
| 1013 | /* There is support for UDP large send offload by network | 1014 | /* There is support for UDP large send offload by network |
| @@ -1015,8 +1016,6 @@ static inline int ip6_ufo_append_data(struct sock *sk, | |||
| 1015 | * udp datagram | 1016 | * udp datagram |
| 1016 | */ | 1017 | */ |
| 1017 | if ((skb = skb_peek_tail(&sk->sk_write_queue)) == NULL) { | 1018 | if ((skb = skb_peek_tail(&sk->sk_write_queue)) == NULL) { |
| 1018 | struct frag_hdr fhdr; | ||
| 1019 | |||
| 1020 | skb = sock_alloc_send_skb(sk, | 1019 | skb = sock_alloc_send_skb(sk, |
| 1021 | hh_len + fragheaderlen + transhdrlen + 20, | 1020 | hh_len + fragheaderlen + transhdrlen + 20, |
| 1022 | (flags & MSG_DONTWAIT), &err); | 1021 | (flags & MSG_DONTWAIT), &err); |
| @@ -1036,20 +1035,24 @@ static inline int ip6_ufo_append_data(struct sock *sk, | |||
| 1036 | skb->transport_header = skb->network_header + fragheaderlen; | 1035 | skb->transport_header = skb->network_header + fragheaderlen; |
| 1037 | 1036 | ||
| 1038 | skb->protocol = htons(ETH_P_IPV6); | 1037 | skb->protocol = htons(ETH_P_IPV6); |
| 1039 | skb->ip_summed = CHECKSUM_PARTIAL; | ||
| 1040 | skb->csum = 0; | 1038 | skb->csum = 0; |
| 1041 | 1039 | ||
| 1042 | /* Specify the length of each IPv6 datagram fragment. | ||
| 1043 | * It has to be a multiple of 8. | ||
| 1044 | */ | ||
| 1045 | skb_shinfo(skb)->gso_size = (mtu - fragheaderlen - | ||
| 1046 | sizeof(struct frag_hdr)) & ~7; | ||
| 1047 | skb_shinfo(skb)->gso_type = SKB_GSO_UDP; | ||
| 1048 | ipv6_select_ident(&fhdr, rt); | ||
| 1049 | skb_shinfo(skb)->ip6_frag_id = fhdr.identification; | ||
| 1050 | __skb_queue_tail(&sk->sk_write_queue, skb); | 1040 | __skb_queue_tail(&sk->sk_write_queue, skb); |
| 1041 | } else if (skb_is_gso(skb)) { | ||
| 1042 | goto append; | ||
| 1051 | } | 1043 | } |
| 1052 | 1044 | ||
| 1045 | skb->ip_summed = CHECKSUM_PARTIAL; | ||
| 1046 | /* Specify the length of each IPv6 datagram fragment. | ||
| 1047 | * It has to be a multiple of 8. | ||
| 1048 | */ | ||
| 1049 | skb_shinfo(skb)->gso_size = (mtu - fragheaderlen - | ||
| 1050 | sizeof(struct frag_hdr)) & ~7; | ||
| 1051 | skb_shinfo(skb)->gso_type = SKB_GSO_UDP; | ||
| 1052 | ipv6_select_ident(&fhdr, rt); | ||
| 1053 | skb_shinfo(skb)->ip6_frag_id = fhdr.identification; | ||
| 1054 | |||
| 1055 | append: | ||
| 1053 | return skb_append_datato_frags(sk, skb, getfrag, from, | 1056 | return skb_append_datato_frags(sk, skb, getfrag, from, |
| 1054 | (length - transhdrlen)); | 1057 | (length - transhdrlen)); |
| 1055 | } | 1058 | } |
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index a791552e0422..583b77e2f69b 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
| @@ -1430,9 +1430,17 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 1430 | static int | 1430 | static int |
| 1431 | ip6_tnl_change_mtu(struct net_device *dev, int new_mtu) | 1431 | ip6_tnl_change_mtu(struct net_device *dev, int new_mtu) |
| 1432 | { | 1432 | { |
| 1433 | if (new_mtu < IPV6_MIN_MTU) { | 1433 | struct ip6_tnl *tnl = netdev_priv(dev); |
| 1434 | return -EINVAL; | 1434 | |
| 1435 | if (tnl->parms.proto == IPPROTO_IPIP) { | ||
| 1436 | if (new_mtu < 68) | ||
| 1437 | return -EINVAL; | ||
| 1438 | } else { | ||
| 1439 | if (new_mtu < IPV6_MIN_MTU) | ||
| 1440 | return -EINVAL; | ||
| 1435 | } | 1441 | } |
| 1442 | if (new_mtu > 0xFFF8 - dev->hard_header_len) | ||
| 1443 | return -EINVAL; | ||
| 1436 | dev->mtu = new_mtu; | 1444 | dev->mtu = new_mtu; |
| 1437 | return 0; | 1445 | return 0; |
| 1438 | } | 1446 | } |
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index 5636a912074a..ce507d9e1c90 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c | |||
| @@ -64,8 +64,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
| 64 | (struct ip_comp_hdr *)(skb->data + offset); | 64 | (struct ip_comp_hdr *)(skb->data + offset); |
| 65 | struct xfrm_state *x; | 65 | struct xfrm_state *x; |
| 66 | 66 | ||
| 67 | if (type != ICMPV6_DEST_UNREACH && | 67 | if (type != ICMPV6_PKT_TOOBIG && |
| 68 | type != ICMPV6_PKT_TOOBIG && | ||
| 69 | type != NDISC_REDIRECT) | 68 | type != NDISC_REDIRECT) |
| 70 | return; | 69 | return; |
| 71 | 70 | ||
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index c979dd96d82a..f54e3a101098 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
| @@ -476,6 +476,24 @@ out: | |||
| 476 | } | 476 | } |
| 477 | 477 | ||
| 478 | #ifdef CONFIG_IPV6_ROUTER_PREF | 478 | #ifdef CONFIG_IPV6_ROUTER_PREF |
| 479 | struct __rt6_probe_work { | ||
| 480 | struct work_struct work; | ||
| 481 | struct in6_addr target; | ||
| 482 | struct net_device *dev; | ||
| 483 | }; | ||
| 484 | |||
| 485 | static void rt6_probe_deferred(struct work_struct *w) | ||
| 486 | { | ||
| 487 | struct in6_addr mcaddr; | ||
| 488 | struct __rt6_probe_work *work = | ||
| 489 | container_of(w, struct __rt6_probe_work, work); | ||
| 490 | |||
| 491 | addrconf_addr_solict_mult(&work->target, &mcaddr); | ||
| 492 | ndisc_send_ns(work->dev, NULL, &work->target, &mcaddr, NULL); | ||
| 493 | dev_put(work->dev); | ||
| 494 | kfree(w); | ||
| 495 | } | ||
| 496 | |||
| 479 | static void rt6_probe(struct rt6_info *rt) | 497 | static void rt6_probe(struct rt6_info *rt) |
| 480 | { | 498 | { |
| 481 | struct neighbour *neigh; | 499 | struct neighbour *neigh; |
| @@ -499,17 +517,23 @@ static void rt6_probe(struct rt6_info *rt) | |||
| 499 | 517 | ||
| 500 | if (!neigh || | 518 | if (!neigh || |
| 501 | time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) { | 519 | time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) { |
| 502 | struct in6_addr mcaddr; | 520 | struct __rt6_probe_work *work; |
| 503 | struct in6_addr *target; | ||
| 504 | 521 | ||
| 505 | if (neigh) { | 522 | work = kmalloc(sizeof(*work), GFP_ATOMIC); |
| 523 | |||
| 524 | if (neigh && work) | ||
| 506 | neigh->updated = jiffies; | 525 | neigh->updated = jiffies; |
| 526 | |||
| 527 | if (neigh) | ||
| 507 | write_unlock(&neigh->lock); | 528 | write_unlock(&neigh->lock); |
| 508 | } | ||
| 509 | 529 | ||
| 510 | target = (struct in6_addr *)&rt->rt6i_gateway; | 530 | if (work) { |
| 511 | addrconf_addr_solict_mult(target, &mcaddr); | 531 | INIT_WORK(&work->work, rt6_probe_deferred); |
| 512 | ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL); | 532 | work->target = rt->rt6i_gateway; |
| 533 | dev_hold(rt->dst.dev); | ||
| 534 | work->dev = rt->dst.dev; | ||
| 535 | schedule_work(&work->work); | ||
| 536 | } | ||
| 513 | } else { | 537 | } else { |
| 514 | out: | 538 | out: |
| 515 | write_unlock(&neigh->lock); | 539 | write_unlock(&neigh->lock); |
| @@ -851,7 +875,6 @@ static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort, | |||
| 851 | if (ort->rt6i_dst.plen != 128 && | 875 | if (ort->rt6i_dst.plen != 128 && |
| 852 | ipv6_addr_equal(&ort->rt6i_dst.addr, daddr)) | 876 | ipv6_addr_equal(&ort->rt6i_dst.addr, daddr)) |
| 853 | rt->rt6i_flags |= RTF_ANYCAST; | 877 | rt->rt6i_flags |= RTF_ANYCAST; |
| 854 | rt->rt6i_gateway = *daddr; | ||
| 855 | } | 878 | } |
| 856 | 879 | ||
| 857 | rt->rt6i_flags |= RTF_CACHE; | 880 | rt->rt6i_flags |= RTF_CACHE; |
| @@ -1338,6 +1361,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev, | |||
| 1338 | rt->dst.flags |= DST_HOST; | 1361 | rt->dst.flags |= DST_HOST; |
| 1339 | rt->dst.output = ip6_output; | 1362 | rt->dst.output = ip6_output; |
| 1340 | atomic_set(&rt->dst.__refcnt, 1); | 1363 | atomic_set(&rt->dst.__refcnt, 1); |
| 1364 | rt->rt6i_gateway = fl6->daddr; | ||
| 1341 | rt->rt6i_dst.addr = fl6->daddr; | 1365 | rt->rt6i_dst.addr = fl6->daddr; |
| 1342 | rt->rt6i_dst.plen = 128; | 1366 | rt->rt6i_dst.plen = 128; |
| 1343 | rt->rt6i_idev = idev; | 1367 | rt->rt6i_idev = idev; |
| @@ -1873,7 +1897,10 @@ static struct rt6_info *ip6_rt_copy(struct rt6_info *ort, | |||
| 1873 | in6_dev_hold(rt->rt6i_idev); | 1897 | in6_dev_hold(rt->rt6i_idev); |
| 1874 | rt->dst.lastuse = jiffies; | 1898 | rt->dst.lastuse = jiffies; |
| 1875 | 1899 | ||
| 1876 | rt->rt6i_gateway = ort->rt6i_gateway; | 1900 | if (ort->rt6i_flags & RTF_GATEWAY) |
| 1901 | rt->rt6i_gateway = ort->rt6i_gateway; | ||
| 1902 | else | ||
| 1903 | rt->rt6i_gateway = *dest; | ||
| 1877 | rt->rt6i_flags = ort->rt6i_flags; | 1904 | rt->rt6i_flags = ort->rt6i_flags; |
| 1878 | if ((ort->rt6i_flags & (RTF_DEFAULT | RTF_ADDRCONF)) == | 1905 | if ((ort->rt6i_flags & (RTF_DEFAULT | RTF_ADDRCONF)) == |
| 1879 | (RTF_DEFAULT | RTF_ADDRCONF)) | 1906 | (RTF_DEFAULT | RTF_ADDRCONF)) |
| @@ -2160,6 +2187,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, | |||
| 2160 | else | 2187 | else |
| 2161 | rt->rt6i_flags |= RTF_LOCAL; | 2188 | rt->rt6i_flags |= RTF_LOCAL; |
| 2162 | 2189 | ||
| 2190 | rt->rt6i_gateway = *addr; | ||
| 2163 | rt->rt6i_dst.addr = *addr; | 2191 | rt->rt6i_dst.addr = *addr; |
| 2164 | rt->rt6i_dst.plen = 128; | 2192 | rt->rt6i_dst.plen = 128; |
| 2165 | rt->rt6i_table = fib6_get_table(net, RT6_TABLE_LOCAL); | 2193 | rt->rt6i_table = fib6_get_table(net, RT6_TABLE_LOCAL); |
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 72b7eaaf3ca0..18786098fd41 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
| @@ -1225,9 +1225,6 @@ do_udp_sendmsg: | |||
| 1225 | if (tclass < 0) | 1225 | if (tclass < 0) |
| 1226 | tclass = np->tclass; | 1226 | tclass = np->tclass; |
| 1227 | 1227 | ||
| 1228 | if (dontfrag < 0) | ||
| 1229 | dontfrag = np->dontfrag; | ||
| 1230 | |||
| 1231 | if (msg->msg_flags&MSG_CONFIRM) | 1228 | if (msg->msg_flags&MSG_CONFIRM) |
| 1232 | goto do_confirm; | 1229 | goto do_confirm; |
| 1233 | back_from_confirm: | 1230 | back_from_confirm: |
| @@ -1246,6 +1243,8 @@ back_from_confirm: | |||
| 1246 | up->pending = AF_INET6; | 1243 | up->pending = AF_INET6; |
| 1247 | 1244 | ||
| 1248 | do_append_data: | 1245 | do_append_data: |
| 1246 | if (dontfrag < 0) | ||
| 1247 | dontfrag = np->dontfrag; | ||
| 1249 | up->len += ulen; | 1248 | up->len += ulen; |
| 1250 | getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag; | 1249 | getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag; |
| 1251 | err = ip6_append_data(sk, getfrag, msg->msg_iov, ulen, | 1250 | err = ip6_append_data(sk, getfrag, msg->msg_iov, ulen, |
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 23ed03d786c8..08ed2772b7aa 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
| @@ -138,6 +138,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse) | |||
| 138 | 138 | ||
| 139 | memset(fl6, 0, sizeof(struct flowi6)); | 139 | memset(fl6, 0, sizeof(struct flowi6)); |
| 140 | fl6->flowi6_mark = skb->mark; | 140 | fl6->flowi6_mark = skb->mark; |
| 141 | fl6->flowi6_oif = skb_dst(skb)->dev->ifindex; | ||
| 141 | 142 | ||
| 142 | fl6->daddr = reverse ? hdr->saddr : hdr->daddr; | 143 | fl6->daddr = reverse ? hdr->saddr : hdr->daddr; |
| 143 | fl6->saddr = reverse ? hdr->daddr : hdr->saddr; | 144 | fl6->saddr = reverse ? hdr->daddr : hdr->saddr; |
diff --git a/net/key/af_key.c b/net/key/af_key.c index 9d585370c5b4..911ef03bf8fb 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
| @@ -1098,7 +1098,8 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net, | |||
| 1098 | 1098 | ||
| 1099 | x->id.proto = proto; | 1099 | x->id.proto = proto; |
| 1100 | x->id.spi = sa->sadb_sa_spi; | 1100 | x->id.spi = sa->sadb_sa_spi; |
| 1101 | x->props.replay_window = sa->sadb_sa_replay; | 1101 | x->props.replay_window = min_t(unsigned int, sa->sadb_sa_replay, |
| 1102 | (sizeof(x->replay.bitmap) * 8)); | ||
| 1102 | if (sa->sadb_sa_flags & SADB_SAFLAGS_NOECN) | 1103 | if (sa->sadb_sa_flags & SADB_SAFLAGS_NOECN) |
| 1103 | x->props.flags |= XFRM_STATE_NOECN; | 1104 | x->props.flags |= XFRM_STATE_NOECN; |
| 1104 | if (sa->sadb_sa_flags & SADB_SAFLAGS_DECAP_DSCP) | 1105 | if (sa->sadb_sa_flags & SADB_SAFLAGS_DECAP_DSCP) |
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index feae495a0a30..b076e8309bc2 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c | |||
| @@ -115,6 +115,11 @@ struct l2tp_net { | |||
| 115 | static void l2tp_session_set_header_len(struct l2tp_session *session, int version); | 115 | static void l2tp_session_set_header_len(struct l2tp_session *session, int version); |
| 116 | static void l2tp_tunnel_free(struct l2tp_tunnel *tunnel); | 116 | static void l2tp_tunnel_free(struct l2tp_tunnel *tunnel); |
| 117 | 117 | ||
| 118 | static inline struct l2tp_tunnel *l2tp_tunnel(struct sock *sk) | ||
| 119 | { | ||
| 120 | return sk->sk_user_data; | ||
| 121 | } | ||
| 122 | |||
| 118 | static inline struct l2tp_net *l2tp_pernet(struct net *net) | 123 | static inline struct l2tp_net *l2tp_pernet(struct net *net) |
| 119 | { | 124 | { |
| 120 | BUG_ON(!net); | 125 | BUG_ON(!net); |
| @@ -504,7 +509,7 @@ static inline int l2tp_verify_udp_checksum(struct sock *sk, | |||
| 504 | return 0; | 509 | return 0; |
| 505 | 510 | ||
| 506 | #if IS_ENABLED(CONFIG_IPV6) | 511 | #if IS_ENABLED(CONFIG_IPV6) |
| 507 | if (sk->sk_family == PF_INET6) { | 512 | if (sk->sk_family == PF_INET6 && !l2tp_tunnel(sk)->v4mapped) { |
| 508 | if (!uh->check) { | 513 | if (!uh->check) { |
| 509 | LIMIT_NETDEBUG(KERN_INFO "L2TP: IPv6: checksum is 0\n"); | 514 | LIMIT_NETDEBUG(KERN_INFO "L2TP: IPv6: checksum is 0\n"); |
| 510 | return 1; | 515 | return 1; |
| @@ -1128,7 +1133,7 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb, | |||
| 1128 | /* Queue the packet to IP for output */ | 1133 | /* Queue the packet to IP for output */ |
| 1129 | skb->local_df = 1; | 1134 | skb->local_df = 1; |
| 1130 | #if IS_ENABLED(CONFIG_IPV6) | 1135 | #if IS_ENABLED(CONFIG_IPV6) |
| 1131 | if (skb->sk->sk_family == PF_INET6) | 1136 | if (skb->sk->sk_family == PF_INET6 && !tunnel->v4mapped) |
| 1132 | error = inet6_csk_xmit(skb, NULL); | 1137 | error = inet6_csk_xmit(skb, NULL); |
| 1133 | else | 1138 | else |
| 1134 | #endif | 1139 | #endif |
| @@ -1255,7 +1260,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len | |||
| 1255 | 1260 | ||
| 1256 | /* Calculate UDP checksum if configured to do so */ | 1261 | /* Calculate UDP checksum if configured to do so */ |
| 1257 | #if IS_ENABLED(CONFIG_IPV6) | 1262 | #if IS_ENABLED(CONFIG_IPV6) |
| 1258 | if (sk->sk_family == PF_INET6) | 1263 | if (sk->sk_family == PF_INET6 && !tunnel->v4mapped) |
| 1259 | l2tp_xmit_ipv6_csum(sk, skb, udp_len); | 1264 | l2tp_xmit_ipv6_csum(sk, skb, udp_len); |
| 1260 | else | 1265 | else |
| 1261 | #endif | 1266 | #endif |
| @@ -1304,10 +1309,9 @@ EXPORT_SYMBOL_GPL(l2tp_xmit_skb); | |||
| 1304 | */ | 1309 | */ |
| 1305 | static void l2tp_tunnel_destruct(struct sock *sk) | 1310 | static void l2tp_tunnel_destruct(struct sock *sk) |
| 1306 | { | 1311 | { |
| 1307 | struct l2tp_tunnel *tunnel; | 1312 | struct l2tp_tunnel *tunnel = l2tp_tunnel(sk); |
| 1308 | struct l2tp_net *pn; | 1313 | struct l2tp_net *pn; |
| 1309 | 1314 | ||
| 1310 | tunnel = sk->sk_user_data; | ||
| 1311 | if (tunnel == NULL) | 1315 | if (tunnel == NULL) |
| 1312 | goto end; | 1316 | goto end; |
| 1313 | 1317 | ||
| @@ -1675,7 +1679,7 @@ int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32 | |||
| 1675 | } | 1679 | } |
| 1676 | 1680 | ||
| 1677 | /* Check if this socket has already been prepped */ | 1681 | /* Check if this socket has already been prepped */ |
| 1678 | tunnel = (struct l2tp_tunnel *)sk->sk_user_data; | 1682 | tunnel = l2tp_tunnel(sk); |
| 1679 | if (tunnel != NULL) { | 1683 | if (tunnel != NULL) { |
| 1680 | /* This socket has already been prepped */ | 1684 | /* This socket has already been prepped */ |
| 1681 | err = -EBUSY; | 1685 | err = -EBUSY; |
| @@ -1704,6 +1708,24 @@ int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32 | |||
| 1704 | if (cfg != NULL) | 1708 | if (cfg != NULL) |
| 1705 | tunnel->debug = cfg->debug; | 1709 | tunnel->debug = cfg->debug; |
| 1706 | 1710 | ||
| 1711 | #if IS_ENABLED(CONFIG_IPV6) | ||
| 1712 | if (sk->sk_family == PF_INET6) { | ||
| 1713 | struct ipv6_pinfo *np = inet6_sk(sk); | ||
| 1714 | |||
| 1715 | if (ipv6_addr_v4mapped(&np->saddr) && | ||
| 1716 | ipv6_addr_v4mapped(&np->daddr)) { | ||
| 1717 | struct inet_sock *inet = inet_sk(sk); | ||
| 1718 | |||
| 1719 | tunnel->v4mapped = true; | ||
| 1720 | inet->inet_saddr = np->saddr.s6_addr32[3]; | ||
| 1721 | inet->inet_rcv_saddr = np->rcv_saddr.s6_addr32[3]; | ||
| 1722 | inet->inet_daddr = np->daddr.s6_addr32[3]; | ||
| 1723 | } else { | ||
| 1724 | tunnel->v4mapped = false; | ||
| 1725 | } | ||
| 1726 | } | ||
| 1727 | #endif | ||
| 1728 | |||
| 1707 | /* Mark socket as an encapsulation socket. See net/ipv4/udp.c */ | 1729 | /* Mark socket as an encapsulation socket. See net/ipv4/udp.c */ |
| 1708 | tunnel->encap = encap; | 1730 | tunnel->encap = encap; |
| 1709 | if (encap == L2TP_ENCAPTYPE_UDP) { | 1731 | if (encap == L2TP_ENCAPTYPE_UDP) { |
| @@ -1712,7 +1734,7 @@ int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32 | |||
| 1712 | udp_sk(sk)->encap_rcv = l2tp_udp_encap_recv; | 1734 | udp_sk(sk)->encap_rcv = l2tp_udp_encap_recv; |
| 1713 | udp_sk(sk)->encap_destroy = l2tp_udp_encap_destroy; | 1735 | udp_sk(sk)->encap_destroy = l2tp_udp_encap_destroy; |
| 1714 | #if IS_ENABLED(CONFIG_IPV6) | 1736 | #if IS_ENABLED(CONFIG_IPV6) |
| 1715 | if (sk->sk_family == PF_INET6) | 1737 | if (sk->sk_family == PF_INET6 && !tunnel->v4mapped) |
| 1716 | udpv6_encap_enable(); | 1738 | udpv6_encap_enable(); |
| 1717 | else | 1739 | else |
| 1718 | #endif | 1740 | #endif |
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h index 66a559b104b6..6f251cbc2ed7 100644 --- a/net/l2tp/l2tp_core.h +++ b/net/l2tp/l2tp_core.h | |||
| @@ -194,6 +194,9 @@ struct l2tp_tunnel { | |||
| 194 | struct sock *sock; /* Parent socket */ | 194 | struct sock *sock; /* Parent socket */ |
| 195 | int fd; /* Parent fd, if tunnel socket | 195 | int fd; /* Parent fd, if tunnel socket |
| 196 | * was created by userspace */ | 196 | * was created by userspace */ |
| 197 | #if IS_ENABLED(CONFIG_IPV6) | ||
| 198 | bool v4mapped; | ||
| 199 | #endif | ||
| 197 | 200 | ||
| 198 | struct work_struct del_work; | 201 | struct work_struct del_work; |
| 199 | 202 | ||
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 5ebee2ded9e9..8c46b271064a 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c | |||
| @@ -353,7 +353,9 @@ static int pppol2tp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msgh | |||
| 353 | goto error_put_sess_tun; | 353 | goto error_put_sess_tun; |
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | local_bh_disable(); | ||
| 356 | l2tp_xmit_skb(session, skb, session->hdr_len); | 357 | l2tp_xmit_skb(session, skb, session->hdr_len); |
| 358 | local_bh_enable(); | ||
| 357 | 359 | ||
| 358 | sock_put(ps->tunnel_sock); | 360 | sock_put(ps->tunnel_sock); |
| 359 | sock_put(sk); | 361 | sock_put(sk); |
| @@ -422,7 +424,9 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb) | |||
| 422 | skb->data[0] = ppph[0]; | 424 | skb->data[0] = ppph[0]; |
| 423 | skb->data[1] = ppph[1]; | 425 | skb->data[1] = ppph[1]; |
| 424 | 426 | ||
| 427 | local_bh_disable(); | ||
| 425 | l2tp_xmit_skb(session, skb, session->hdr_len); | 428 | l2tp_xmit_skb(session, skb, session->hdr_len); |
| 429 | local_bh_enable(); | ||
| 426 | 430 | ||
| 427 | sock_put(sk_tun); | 431 | sock_put(sk_tun); |
| 428 | sock_put(sk); | 432 | sock_put(sk); |
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 2e7855a1b10d..629dee7ec9bf 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
| @@ -3518,7 +3518,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, | |||
| 3518 | return -EINVAL; | 3518 | return -EINVAL; |
| 3519 | } | 3519 | } |
| 3520 | band = chanctx_conf->def.chan->band; | 3520 | band = chanctx_conf->def.chan->band; |
| 3521 | sta = sta_info_get(sdata, peer); | 3521 | sta = sta_info_get_bss(sdata, peer); |
| 3522 | if (sta) { | 3522 | if (sta) { |
| 3523 | qos = test_sta_flag(sta, WLAN_STA_WME); | 3523 | qos = test_sta_flag(sta, WLAN_STA_WME); |
| 3524 | } else { | 3524 | } else { |
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index b6186517ec56..611abfcfb5eb 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -893,6 +893,8 @@ struct tpt_led_trigger { | |||
| 893 | * that the scan completed. | 893 | * that the scan completed. |
| 894 | * @SCAN_ABORTED: Set for our scan work function when the driver reported | 894 | * @SCAN_ABORTED: Set for our scan work function when the driver reported |
| 895 | * a scan complete for an aborted scan. | 895 | * a scan complete for an aborted scan. |
| 896 | * @SCAN_HW_CANCELLED: Set for our scan work function when the scan is being | ||
| 897 | * cancelled. | ||
| 896 | */ | 898 | */ |
| 897 | enum { | 899 | enum { |
| 898 | SCAN_SW_SCANNING, | 900 | SCAN_SW_SCANNING, |
| @@ -900,6 +902,7 @@ enum { | |||
| 900 | SCAN_ONCHANNEL_SCANNING, | 902 | SCAN_ONCHANNEL_SCANNING, |
| 901 | SCAN_COMPLETED, | 903 | SCAN_COMPLETED, |
| 902 | SCAN_ABORTED, | 904 | SCAN_ABORTED, |
| 905 | SCAN_HW_CANCELLED, | ||
| 903 | }; | 906 | }; |
| 904 | 907 | ||
| 905 | /** | 908 | /** |
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index acd1f71adc03..0c2a29484c07 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c | |||
| @@ -394,6 +394,8 @@ void ieee80211_sw_roc_work(struct work_struct *work) | |||
| 394 | 394 | ||
| 395 | if (started) | 395 | if (started) |
| 396 | ieee80211_start_next_roc(local); | 396 | ieee80211_start_next_roc(local); |
| 397 | else if (list_empty(&local->roc_list)) | ||
| 398 | ieee80211_run_deferred_scan(local); | ||
| 397 | } | 399 | } |
| 398 | 400 | ||
| 399 | out_unlock: | 401 | out_unlock: |
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 54395d7583ba..674eac1f996c 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
| @@ -3056,6 +3056,9 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx, | |||
| 3056 | case NL80211_IFTYPE_ADHOC: | 3056 | case NL80211_IFTYPE_ADHOC: |
| 3057 | if (!bssid) | 3057 | if (!bssid) |
| 3058 | return 0; | 3058 | return 0; |
| 3059 | if (ether_addr_equal(sdata->vif.addr, hdr->addr2) || | ||
| 3060 | ether_addr_equal(sdata->u.ibss.bssid, hdr->addr2)) | ||
| 3061 | return 0; | ||
| 3059 | if (ieee80211_is_beacon(hdr->frame_control)) { | 3062 | if (ieee80211_is_beacon(hdr->frame_control)) { |
| 3060 | return 1; | 3063 | return 1; |
| 3061 | } else if (!ieee80211_bssid_match(bssid, sdata->u.ibss.bssid)) { | 3064 | } else if (!ieee80211_bssid_match(bssid, sdata->u.ibss.bssid)) { |
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 08afe74b98f4..d2d17a449224 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c | |||
| @@ -238,6 +238,9 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_local *local) | |||
| 238 | enum ieee80211_band band; | 238 | enum ieee80211_band band; |
| 239 | int i, ielen, n_chans; | 239 | int i, ielen, n_chans; |
| 240 | 240 | ||
| 241 | if (test_bit(SCAN_HW_CANCELLED, &local->scanning)) | ||
| 242 | return false; | ||
| 243 | |||
| 241 | do { | 244 | do { |
| 242 | if (local->hw_scan_band == IEEE80211_NUM_BANDS) | 245 | if (local->hw_scan_band == IEEE80211_NUM_BANDS) |
| 243 | return false; | 246 | return false; |
| @@ -940,7 +943,23 @@ void ieee80211_scan_cancel(struct ieee80211_local *local) | |||
| 940 | if (!local->scan_req) | 943 | if (!local->scan_req) |
| 941 | goto out; | 944 | goto out; |
| 942 | 945 | ||
| 946 | /* | ||
| 947 | * We have a scan running and the driver already reported completion, | ||
| 948 | * but the worker hasn't run yet or is stuck on the mutex - mark it as | ||
| 949 | * cancelled. | ||
| 950 | */ | ||
| 951 | if (test_bit(SCAN_HW_SCANNING, &local->scanning) && | ||
| 952 | test_bit(SCAN_COMPLETED, &local->scanning)) { | ||
| 953 | set_bit(SCAN_HW_CANCELLED, &local->scanning); | ||
| 954 | goto out; | ||
| 955 | } | ||
| 956 | |||
| 943 | if (test_bit(SCAN_HW_SCANNING, &local->scanning)) { | 957 | if (test_bit(SCAN_HW_SCANNING, &local->scanning)) { |
| 958 | /* | ||
| 959 | * Make sure that __ieee80211_scan_completed doesn't trigger a | ||
| 960 | * scan on another band. | ||
| 961 | */ | ||
| 962 | set_bit(SCAN_HW_CANCELLED, &local->scanning); | ||
| 944 | if (local->ops->cancel_hw_scan) | 963 | if (local->ops->cancel_hw_scan) |
| 945 | drv_cancel_hw_scan(local, | 964 | drv_cancel_hw_scan(local, |
| 946 | rcu_dereference_protected(local->scan_sdata, | 965 | rcu_dereference_protected(local->scan_sdata, |
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 368837fe3b80..78dc2e99027e 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c | |||
| @@ -180,6 +180,9 @@ static void ieee80211_frame_acked(struct sta_info *sta, struct sk_buff *skb) | |||
| 180 | struct ieee80211_local *local = sta->local; | 180 | struct ieee80211_local *local = sta->local; |
| 181 | struct ieee80211_sub_if_data *sdata = sta->sdata; | 181 | struct ieee80211_sub_if_data *sdata = sta->sdata; |
| 182 | 182 | ||
| 183 | if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) | ||
| 184 | sta->last_rx = jiffies; | ||
| 185 | |||
| 183 | if (ieee80211_is_data_qos(mgmt->frame_control)) { | 186 | if (ieee80211_is_data_qos(mgmt->frame_control)) { |
| 184 | struct ieee80211_hdr *hdr = (void *) skb->data; | 187 | struct ieee80211_hdr *hdr = (void *) skb->data; |
| 185 | u8 *qc = ieee80211_get_qos_ctl(hdr); | 188 | u8 *qc = ieee80211_get_qos_ctl(hdr); |
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 3456c0486b48..70b5a05c0a4e 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
| @@ -1120,7 +1120,8 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata, | |||
| 1120 | tx->sta = rcu_dereference(sdata->u.vlan.sta); | 1120 | tx->sta = rcu_dereference(sdata->u.vlan.sta); |
| 1121 | if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr) | 1121 | if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr) |
| 1122 | return TX_DROP; | 1122 | return TX_DROP; |
| 1123 | } else if (info->flags & IEEE80211_TX_CTL_INJECTED || | 1123 | } else if (info->flags & (IEEE80211_TX_CTL_INJECTED | |
| 1124 | IEEE80211_TX_INTFL_NL80211_FRAME_TX) || | ||
| 1124 | tx->sdata->control_port_protocol == tx->skb->protocol) { | 1125 | tx->sdata->control_port_protocol == tx->skb->protocol) { |
| 1125 | tx->sta = sta_info_get_bss(sdata, hdr->addr1); | 1126 | tx->sta = sta_info_get_bss(sdata, hdr->addr1); |
| 1126 | } | 1127 | } |
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index e1b34a18b243..69e4ef5348a0 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
| @@ -2103,7 +2103,7 @@ int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata, | |||
| 2103 | { | 2103 | { |
| 2104 | struct ieee80211_local *local = sdata->local; | 2104 | struct ieee80211_local *local = sdata->local; |
| 2105 | struct ieee80211_supported_band *sband; | 2105 | struct ieee80211_supported_band *sband; |
| 2106 | int rate, skip, shift; | 2106 | int rate, shift; |
| 2107 | u8 i, exrates, *pos; | 2107 | u8 i, exrates, *pos; |
| 2108 | u32 basic_rates = sdata->vif.bss_conf.basic_rates; | 2108 | u32 basic_rates = sdata->vif.bss_conf.basic_rates; |
| 2109 | u32 rate_flags; | 2109 | u32 rate_flags; |
| @@ -2131,14 +2131,11 @@ int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata, | |||
| 2131 | pos = skb_put(skb, exrates + 2); | 2131 | pos = skb_put(skb, exrates + 2); |
| 2132 | *pos++ = WLAN_EID_EXT_SUPP_RATES; | 2132 | *pos++ = WLAN_EID_EXT_SUPP_RATES; |
| 2133 | *pos++ = exrates; | 2133 | *pos++ = exrates; |
| 2134 | skip = 0; | ||
| 2135 | for (i = 8; i < sband->n_bitrates; i++) { | 2134 | for (i = 8; i < sband->n_bitrates; i++) { |
| 2136 | u8 basic = 0; | 2135 | u8 basic = 0; |
| 2137 | if ((rate_flags & sband->bitrates[i].flags) | 2136 | if ((rate_flags & sband->bitrates[i].flags) |
| 2138 | != rate_flags) | 2137 | != rate_flags) |
| 2139 | continue; | 2138 | continue; |
| 2140 | if (skip++ < 8) | ||
| 2141 | continue; | ||
| 2142 | if (need_basic && basic_rates & BIT(i)) | 2139 | if (need_basic && basic_rates & BIT(i)) |
| 2143 | basic = 0x80; | 2140 | basic = 0x80; |
| 2144 | rate = DIV_ROUND_UP(sband->bitrates[i].bitrate, | 2141 | rate = DIV_ROUND_UP(sband->bitrates[i].bitrate, |
| @@ -2241,6 +2238,10 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, | |||
| 2241 | } | 2238 | } |
| 2242 | 2239 | ||
| 2243 | rate = cfg80211_calculate_bitrate(&ri); | 2240 | rate = cfg80211_calculate_bitrate(&ri); |
| 2241 | if (WARN_ONCE(!rate, | ||
| 2242 | "Invalid bitrate: flags=0x%x, idx=%d, vht_nss=%d\n", | ||
| 2243 | status->flag, status->rate_idx, status->vht_nss)) | ||
| 2244 | return 0; | ||
| 2244 | 2245 | ||
| 2245 | /* rewind from end of MPDU */ | 2246 | /* rewind from end of MPDU */ |
| 2246 | if (status->flag & RX_FLAG_MACTIME_END) | 2247 | if (status->flag & RX_FLAG_MACTIME_END) |
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index bdebd03bc8cd..70866d192efc 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c | |||
| @@ -778,8 +778,8 @@ static int callforward_do_filter(const union nf_inet_addr *src, | |||
| 778 | flowi6_to_flowi(&fl1), false)) { | 778 | flowi6_to_flowi(&fl1), false)) { |
| 779 | if (!afinfo->route(&init_net, (struct dst_entry **)&rt2, | 779 | if (!afinfo->route(&init_net, (struct dst_entry **)&rt2, |
| 780 | flowi6_to_flowi(&fl2), false)) { | 780 | flowi6_to_flowi(&fl2), false)) { |
| 781 | if (!memcmp(&rt1->rt6i_gateway, &rt2->rt6i_gateway, | 781 | if (ipv6_addr_equal(rt6_nexthop(rt1), |
| 782 | sizeof(rt1->rt6i_gateway)) && | 782 | rt6_nexthop(rt2)) && |
| 783 | rt1->dst.dev == rt2->dst.dev) | 783 | rt1->dst.dev == rt2->dst.dev) |
| 784 | ret = 1; | 784 | ret = 1; |
| 785 | dst_release(&rt2->dst); | 785 | dst_release(&rt2->dst); |
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c index a2fef8b10b96..a9dfdda9ed1d 100644 --- a/net/sched/sch_fq.c +++ b/net/sched/sch_fq.c | |||
| @@ -472,20 +472,16 @@ begin: | |||
| 472 | if (f->credit > 0 || !q->rate_enable) | 472 | if (f->credit > 0 || !q->rate_enable) |
| 473 | goto out; | 473 | goto out; |
| 474 | 474 | ||
| 475 | if (skb->sk && skb->sk->sk_state != TCP_TIME_WAIT) { | 475 | rate = q->flow_max_rate; |
| 476 | rate = skb->sk->sk_pacing_rate ?: q->flow_default_rate; | 476 | if (skb->sk && skb->sk->sk_state != TCP_TIME_WAIT) |
| 477 | rate = min(skb->sk->sk_pacing_rate, rate); | ||
| 477 | 478 | ||
| 478 | rate = min(rate, q->flow_max_rate); | 479 | if (rate != ~0U) { |
| 479 | } else { | ||
| 480 | rate = q->flow_max_rate; | ||
| 481 | if (rate == ~0U) | ||
| 482 | goto out; | ||
| 483 | } | ||
| 484 | if (rate) { | ||
| 485 | u32 plen = max(qdisc_pkt_len(skb), q->quantum); | 480 | u32 plen = max(qdisc_pkt_len(skb), q->quantum); |
| 486 | u64 len = (u64)plen * NSEC_PER_SEC; | 481 | u64 len = (u64)plen * NSEC_PER_SEC; |
| 487 | 482 | ||
| 488 | do_div(len, rate); | 483 | if (likely(rate)) |
| 484 | do_div(len, rate); | ||
| 489 | /* Since socket rate can change later, | 485 | /* Since socket rate can change later, |
| 490 | * clamp the delay to 125 ms. | 486 | * clamp the delay to 125 ms. |
| 491 | * TODO: maybe segment the too big skb, as in commit | 487 | * TODO: maybe segment the too big skb, as in commit |
| @@ -656,7 +652,7 @@ static int fq_change(struct Qdisc *sch, struct nlattr *opt) | |||
| 656 | q->quantum = nla_get_u32(tb[TCA_FQ_QUANTUM]); | 652 | q->quantum = nla_get_u32(tb[TCA_FQ_QUANTUM]); |
| 657 | 653 | ||
| 658 | if (tb[TCA_FQ_INITIAL_QUANTUM]) | 654 | if (tb[TCA_FQ_INITIAL_QUANTUM]) |
| 659 | q->quantum = nla_get_u32(tb[TCA_FQ_INITIAL_QUANTUM]); | 655 | q->initial_quantum = nla_get_u32(tb[TCA_FQ_INITIAL_QUANTUM]); |
| 660 | 656 | ||
| 661 | if (tb[TCA_FQ_FLOW_DEFAULT_RATE]) | 657 | if (tb[TCA_FQ_FLOW_DEFAULT_RATE]) |
| 662 | q->flow_default_rate = nla_get_u32(tb[TCA_FQ_FLOW_DEFAULT_RATE]); | 658 | q->flow_default_rate = nla_get_u32(tb[TCA_FQ_FLOW_DEFAULT_RATE]); |
| @@ -735,12 +731,14 @@ static int fq_dump(struct Qdisc *sch, struct sk_buff *skb) | |||
| 735 | if (opts == NULL) | 731 | if (opts == NULL) |
| 736 | goto nla_put_failure; | 732 | goto nla_put_failure; |
| 737 | 733 | ||
| 734 | /* TCA_FQ_FLOW_DEFAULT_RATE is not used anymore, | ||
| 735 | * do not bother giving its value | ||
| 736 | */ | ||
| 738 | if (nla_put_u32(skb, TCA_FQ_PLIMIT, sch->limit) || | 737 | if (nla_put_u32(skb, TCA_FQ_PLIMIT, sch->limit) || |
| 739 | nla_put_u32(skb, TCA_FQ_FLOW_PLIMIT, q->flow_plimit) || | 738 | nla_put_u32(skb, TCA_FQ_FLOW_PLIMIT, q->flow_plimit) || |
| 740 | nla_put_u32(skb, TCA_FQ_QUANTUM, q->quantum) || | 739 | nla_put_u32(skb, TCA_FQ_QUANTUM, q->quantum) || |
| 741 | nla_put_u32(skb, TCA_FQ_INITIAL_QUANTUM, q->initial_quantum) || | 740 | nla_put_u32(skb, TCA_FQ_INITIAL_QUANTUM, q->initial_quantum) || |
| 742 | nla_put_u32(skb, TCA_FQ_RATE_ENABLE, q->rate_enable) || | 741 | nla_put_u32(skb, TCA_FQ_RATE_ENABLE, q->rate_enable) || |
| 743 | nla_put_u32(skb, TCA_FQ_FLOW_DEFAULT_RATE, q->flow_default_rate) || | ||
| 744 | nla_put_u32(skb, TCA_FQ_FLOW_MAX_RATE, q->flow_max_rate) || | 742 | nla_put_u32(skb, TCA_FQ_FLOW_MAX_RATE, q->flow_max_rate) || |
| 745 | nla_put_u32(skb, TCA_FQ_BUCKETS_LOG, q->fq_trees_log)) | 743 | nla_put_u32(skb, TCA_FQ_BUCKETS_LOG, q->fq_trees_log)) |
| 746 | goto nla_put_failure; | 744 | goto nla_put_failure; |
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index a6d788d45216..b87e83d07478 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c | |||
| @@ -358,6 +358,21 @@ static psched_time_t packet_len_2_sched_time(unsigned int len, struct netem_sche | |||
| 358 | return PSCHED_NS2TICKS(ticks); | 358 | return PSCHED_NS2TICKS(ticks); |
| 359 | } | 359 | } |
| 360 | 360 | ||
| 361 | static void tfifo_reset(struct Qdisc *sch) | ||
| 362 | { | ||
| 363 | struct netem_sched_data *q = qdisc_priv(sch); | ||
| 364 | struct rb_node *p; | ||
| 365 | |||
| 366 | while ((p = rb_first(&q->t_root))) { | ||
| 367 | struct sk_buff *skb = netem_rb_to_skb(p); | ||
| 368 | |||
| 369 | rb_erase(p, &q->t_root); | ||
| 370 | skb->next = NULL; | ||
| 371 | skb->prev = NULL; | ||
| 372 | kfree_skb(skb); | ||
| 373 | } | ||
| 374 | } | ||
| 375 | |||
| 361 | static void tfifo_enqueue(struct sk_buff *nskb, struct Qdisc *sch) | 376 | static void tfifo_enqueue(struct sk_buff *nskb, struct Qdisc *sch) |
| 362 | { | 377 | { |
| 363 | struct netem_sched_data *q = qdisc_priv(sch); | 378 | struct netem_sched_data *q = qdisc_priv(sch); |
| @@ -520,6 +535,7 @@ static unsigned int netem_drop(struct Qdisc *sch) | |||
| 520 | skb->next = NULL; | 535 | skb->next = NULL; |
| 521 | skb->prev = NULL; | 536 | skb->prev = NULL; |
| 522 | len = qdisc_pkt_len(skb); | 537 | len = qdisc_pkt_len(skb); |
| 538 | sch->qstats.backlog -= len; | ||
| 523 | kfree_skb(skb); | 539 | kfree_skb(skb); |
| 524 | } | 540 | } |
| 525 | } | 541 | } |
| @@ -609,6 +625,7 @@ static void netem_reset(struct Qdisc *sch) | |||
| 609 | struct netem_sched_data *q = qdisc_priv(sch); | 625 | struct netem_sched_data *q = qdisc_priv(sch); |
| 610 | 626 | ||
| 611 | qdisc_reset_queue(sch); | 627 | qdisc_reset_queue(sch); |
| 628 | tfifo_reset(sch); | ||
| 612 | if (q->qdisc) | 629 | if (q->qdisc) |
| 613 | qdisc_reset(q->qdisc); | 630 | qdisc_reset(q->qdisc); |
| 614 | qdisc_watchdog_cancel(&q->watchdog); | 631 | qdisc_watchdog_cancel(&q->watchdog); |
diff --git a/net/sctp/output.c b/net/sctp/output.c index 0ac3a65daccb..319137340d15 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c | |||
| @@ -536,7 +536,8 @@ int sctp_packet_transmit(struct sctp_packet *packet) | |||
| 536 | * by CRC32-C as described in <draft-ietf-tsvwg-sctpcsum-02.txt>. | 536 | * by CRC32-C as described in <draft-ietf-tsvwg-sctpcsum-02.txt>. |
| 537 | */ | 537 | */ |
| 538 | if (!sctp_checksum_disable) { | 538 | if (!sctp_checksum_disable) { |
| 539 | if (!(dst->dev->features & NETIF_F_SCTP_CSUM)) { | 539 | if (!(dst->dev->features & NETIF_F_SCTP_CSUM) || |
| 540 | (dst_xfrm(dst) != NULL) || packet->ipfragok) { | ||
| 540 | __u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len); | 541 | __u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len); |
| 541 | 542 | ||
| 542 | /* 3) Put the resultant value into the checksum field in the | 543 | /* 3) Put the resultant value into the checksum field in the |
diff --git a/net/socket.c b/net/socket.c index ebed4b68f768..c226aceee65b 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -1964,6 +1964,16 @@ struct used_address { | |||
| 1964 | unsigned int name_len; | 1964 | unsigned int name_len; |
| 1965 | }; | 1965 | }; |
| 1966 | 1966 | ||
| 1967 | static int copy_msghdr_from_user(struct msghdr *kmsg, | ||
| 1968 | struct msghdr __user *umsg) | ||
| 1969 | { | ||
| 1970 | if (copy_from_user(kmsg, umsg, sizeof(struct msghdr))) | ||
| 1971 | return -EFAULT; | ||
| 1972 | if (kmsg->msg_namelen > sizeof(struct sockaddr_storage)) | ||
| 1973 | return -EINVAL; | ||
| 1974 | return 0; | ||
| 1975 | } | ||
| 1976 | |||
| 1967 | static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg, | 1977 | static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg, |
| 1968 | struct msghdr *msg_sys, unsigned int flags, | 1978 | struct msghdr *msg_sys, unsigned int flags, |
| 1969 | struct used_address *used_address) | 1979 | struct used_address *used_address) |
| @@ -1982,8 +1992,11 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg, | |||
| 1982 | if (MSG_CMSG_COMPAT & flags) { | 1992 | if (MSG_CMSG_COMPAT & flags) { |
| 1983 | if (get_compat_msghdr(msg_sys, msg_compat)) | 1993 | if (get_compat_msghdr(msg_sys, msg_compat)) |
| 1984 | return -EFAULT; | 1994 | return -EFAULT; |
| 1985 | } else if (copy_from_user(msg_sys, msg, sizeof(struct msghdr))) | 1995 | } else { |
| 1986 | return -EFAULT; | 1996 | err = copy_msghdr_from_user(msg_sys, msg); |
| 1997 | if (err) | ||
| 1998 | return err; | ||
| 1999 | } | ||
| 1987 | 2000 | ||
| 1988 | if (msg_sys->msg_iovlen > UIO_FASTIOV) { | 2001 | if (msg_sys->msg_iovlen > UIO_FASTIOV) { |
| 1989 | err = -EMSGSIZE; | 2002 | err = -EMSGSIZE; |
| @@ -2191,8 +2204,11 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg, | |||
| 2191 | if (MSG_CMSG_COMPAT & flags) { | 2204 | if (MSG_CMSG_COMPAT & flags) { |
| 2192 | if (get_compat_msghdr(msg_sys, msg_compat)) | 2205 | if (get_compat_msghdr(msg_sys, msg_compat)) |
| 2193 | return -EFAULT; | 2206 | return -EFAULT; |
| 2194 | } else if (copy_from_user(msg_sys, msg, sizeof(struct msghdr))) | 2207 | } else { |
| 2195 | return -EFAULT; | 2208 | err = copy_msghdr_from_user(msg_sys, msg); |
| 2209 | if (err) | ||
| 2210 | return err; | ||
| 2211 | } | ||
| 2196 | 2212 | ||
| 2197 | if (msg_sys->msg_iovlen > UIO_FASTIOV) { | 2213 | if (msg_sys->msg_iovlen > UIO_FASTIOV) { |
| 2198 | err = -EMSGSIZE; | 2214 | err = -EMSGSIZE; |
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 86de99ad2976..c1f403bed683 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -1246,6 +1246,15 @@ static int unix_socketpair(struct socket *socka, struct socket *sockb) | |||
| 1246 | return 0; | 1246 | return 0; |
| 1247 | } | 1247 | } |
| 1248 | 1248 | ||
| 1249 | static void unix_sock_inherit_flags(const struct socket *old, | ||
| 1250 | struct socket *new) | ||
| 1251 | { | ||
| 1252 | if (test_bit(SOCK_PASSCRED, &old->flags)) | ||
| 1253 | set_bit(SOCK_PASSCRED, &new->flags); | ||
| 1254 | if (test_bit(SOCK_PASSSEC, &old->flags)) | ||
| 1255 | set_bit(SOCK_PASSSEC, &new->flags); | ||
| 1256 | } | ||
| 1257 | |||
| 1249 | static int unix_accept(struct socket *sock, struct socket *newsock, int flags) | 1258 | static int unix_accept(struct socket *sock, struct socket *newsock, int flags) |
| 1250 | { | 1259 | { |
| 1251 | struct sock *sk = sock->sk; | 1260 | struct sock *sk = sock->sk; |
| @@ -1280,6 +1289,7 @@ static int unix_accept(struct socket *sock, struct socket *newsock, int flags) | |||
| 1280 | /* attach accepted sock to socket */ | 1289 | /* attach accepted sock to socket */ |
| 1281 | unix_state_lock(tsk); | 1290 | unix_state_lock(tsk); |
| 1282 | newsock->state = SS_CONNECTED; | 1291 | newsock->state = SS_CONNECTED; |
| 1292 | unix_sock_inherit_flags(sock, newsock); | ||
| 1283 | sock_graft(tsk, newsock); | 1293 | sock_graft(tsk, newsock); |
| 1284 | unix_state_unlock(tsk); | 1294 | unix_state_unlock(tsk); |
| 1285 | return 0; | 1295 | return 0; |
diff --git a/net/unix/diag.c b/net/unix/diag.c index d591091603bf..86fa0f3b2caf 100644 --- a/net/unix/diag.c +++ b/net/unix/diag.c | |||
| @@ -124,6 +124,7 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r | |||
| 124 | rep->udiag_family = AF_UNIX; | 124 | rep->udiag_family = AF_UNIX; |
| 125 | rep->udiag_type = sk->sk_type; | 125 | rep->udiag_type = sk->sk_type; |
| 126 | rep->udiag_state = sk->sk_state; | 126 | rep->udiag_state = sk->sk_state; |
| 127 | rep->pad = 0; | ||
| 127 | rep->udiag_ino = sk_ino; | 128 | rep->udiag_ino = sk_ino; |
| 128 | sock_diag_save_cookie(sk, rep->udiag_cookie); | 129 | sock_diag_save_cookie(sk, rep->udiag_cookie); |
| 129 | 130 | ||
diff --git a/net/wireless/core.c b/net/wireless/core.c index 67153964aad2..aff959e5a1b3 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c | |||
| @@ -566,18 +566,13 @@ int wiphy_register(struct wiphy *wiphy) | |||
| 566 | /* check and set up bitrates */ | 566 | /* check and set up bitrates */ |
| 567 | ieee80211_set_bitrate_flags(wiphy); | 567 | ieee80211_set_bitrate_flags(wiphy); |
| 568 | 568 | ||
| 569 | 569 | rtnl_lock(); | |
| 570 | res = device_add(&rdev->wiphy.dev); | 570 | res = device_add(&rdev->wiphy.dev); |
| 571 | if (res) | ||
| 572 | return res; | ||
| 573 | |||
| 574 | res = rfkill_register(rdev->rfkill); | ||
| 575 | if (res) { | 571 | if (res) { |
| 576 | device_del(&rdev->wiphy.dev); | 572 | rtnl_unlock(); |
| 577 | return res; | 573 | return res; |
| 578 | } | 574 | } |
| 579 | 575 | ||
| 580 | rtnl_lock(); | ||
| 581 | /* set up regulatory info */ | 576 | /* set up regulatory info */ |
| 582 | wiphy_regulatory_register(wiphy); | 577 | wiphy_regulatory_register(wiphy); |
| 583 | 578 | ||
| @@ -606,6 +601,15 @@ int wiphy_register(struct wiphy *wiphy) | |||
| 606 | 601 | ||
| 607 | rdev->wiphy.registered = true; | 602 | rdev->wiphy.registered = true; |
| 608 | rtnl_unlock(); | 603 | rtnl_unlock(); |
| 604 | |||
| 605 | res = rfkill_register(rdev->rfkill); | ||
| 606 | if (res) { | ||
| 607 | rfkill_destroy(rdev->rfkill); | ||
| 608 | rdev->rfkill = NULL; | ||
| 609 | wiphy_unregister(&rdev->wiphy); | ||
| 610 | return res; | ||
| 611 | } | ||
| 612 | |||
| 609 | return 0; | 613 | return 0; |
| 610 | } | 614 | } |
| 611 | EXPORT_SYMBOL(wiphy_register); | 615 | EXPORT_SYMBOL(wiphy_register); |
| @@ -640,7 +644,8 @@ void wiphy_unregister(struct wiphy *wiphy) | |||
| 640 | rtnl_unlock(); | 644 | rtnl_unlock(); |
| 641 | __count == 0; })); | 645 | __count == 0; })); |
| 642 | 646 | ||
| 643 | rfkill_unregister(rdev->rfkill); | 647 | if (rdev->rfkill) |
| 648 | rfkill_unregister(rdev->rfkill); | ||
| 644 | 649 | ||
| 645 | rtnl_lock(); | 650 | rtnl_lock(); |
| 646 | rdev->wiphy.registered = false; | 651 | rdev->wiphy.registered = false; |
| @@ -953,8 +958,6 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, | |||
| 953 | case NETDEV_PRE_UP: | 958 | case NETDEV_PRE_UP: |
| 954 | if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype))) | 959 | if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype))) |
| 955 | return notifier_from_errno(-EOPNOTSUPP); | 960 | return notifier_from_errno(-EOPNOTSUPP); |
| 956 | if (rfkill_blocked(rdev->rfkill)) | ||
| 957 | return notifier_from_errno(-ERFKILL); | ||
| 958 | ret = cfg80211_can_add_interface(rdev, wdev->iftype); | 961 | ret = cfg80211_can_add_interface(rdev, wdev->iftype); |
| 959 | if (ret) | 962 | if (ret) |
| 960 | return notifier_from_errno(ret); | 963 | return notifier_from_errno(ret); |
diff --git a/net/wireless/core.h b/net/wireless/core.h index 9ad43c619c54..3159e9c284c5 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h | |||
| @@ -411,6 +411,9 @@ static inline int | |||
| 411 | cfg80211_can_add_interface(struct cfg80211_registered_device *rdev, | 411 | cfg80211_can_add_interface(struct cfg80211_registered_device *rdev, |
| 412 | enum nl80211_iftype iftype) | 412 | enum nl80211_iftype iftype) |
| 413 | { | 413 | { |
| 414 | if (rfkill_blocked(rdev->rfkill)) | ||
| 415 | return -ERFKILL; | ||
| 416 | |||
| 414 | return cfg80211_can_change_interface(rdev, NULL, iftype); | 417 | return cfg80211_can_change_interface(rdev, NULL, iftype); |
| 415 | } | 418 | } |
| 416 | 419 | ||
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index 39bff7d36768..403fe29c024d 100644 --- a/net/wireless/ibss.c +++ b/net/wireless/ibss.c | |||
| @@ -263,6 +263,8 @@ int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev, | |||
| 263 | if (chan->flags & IEEE80211_CHAN_DISABLED) | 263 | if (chan->flags & IEEE80211_CHAN_DISABLED) |
| 264 | continue; | 264 | continue; |
| 265 | wdev->wext.ibss.chandef.chan = chan; | 265 | wdev->wext.ibss.chandef.chan = chan; |
| 266 | wdev->wext.ibss.chandef.center_freq1 = | ||
| 267 | chan->center_freq; | ||
| 266 | break; | 268 | break; |
| 267 | } | 269 | } |
| 268 | 270 | ||
| @@ -347,6 +349,7 @@ int cfg80211_ibss_wext_siwfreq(struct net_device *dev, | |||
| 347 | if (chan) { | 349 | if (chan) { |
| 348 | wdev->wext.ibss.chandef.chan = chan; | 350 | wdev->wext.ibss.chandef.chan = chan; |
| 349 | wdev->wext.ibss.chandef.width = NL80211_CHAN_WIDTH_20_NOHT; | 351 | wdev->wext.ibss.chandef.width = NL80211_CHAN_WIDTH_20_NOHT; |
| 352 | wdev->wext.ibss.chandef.center_freq1 = freq; | ||
| 350 | wdev->wext.ibss.channel_fixed = true; | 353 | wdev->wext.ibss.channel_fixed = true; |
| 351 | } else { | 354 | } else { |
| 352 | /* cfg80211_ibss_wext_join will pick one if needed */ | 355 | /* cfg80211_ibss_wext_join will pick one if needed */ |
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index af8d84a4a5b2..626dc3b5fd8d 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
| @@ -2421,7 +2421,7 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info) | |||
| 2421 | change = true; | 2421 | change = true; |
| 2422 | } | 2422 | } |
| 2423 | 2423 | ||
| 2424 | if (flags && (*flags & NL80211_MNTR_FLAG_ACTIVE) && | 2424 | if (flags && (*flags & MONITOR_FLAG_ACTIVE) && |
| 2425 | !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR)) | 2425 | !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR)) |
| 2426 | return -EOPNOTSUPP; | 2426 | return -EOPNOTSUPP; |
| 2427 | 2427 | ||
| @@ -2483,7 +2483,7 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info) | |||
| 2483 | info->attrs[NL80211_ATTR_MNTR_FLAGS] : NULL, | 2483 | info->attrs[NL80211_ATTR_MNTR_FLAGS] : NULL, |
| 2484 | &flags); | 2484 | &flags); |
| 2485 | 2485 | ||
| 2486 | if (!err && (flags & NL80211_MNTR_FLAG_ACTIVE) && | 2486 | if (!err && (flags & MONITOR_FLAG_ACTIVE) && |
| 2487 | !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR)) | 2487 | !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR)) |
| 2488 | return -EOPNOTSUPP; | 2488 | return -EOPNOTSUPP; |
| 2489 | 2489 | ||
diff --git a/net/wireless/radiotap.c b/net/wireless/radiotap.c index 7d604c06c3dc..a271c27fac77 100644 --- a/net/wireless/radiotap.c +++ b/net/wireless/radiotap.c | |||
| @@ -97,6 +97,10 @@ int ieee80211_radiotap_iterator_init( | |||
| 97 | struct ieee80211_radiotap_header *radiotap_header, | 97 | struct ieee80211_radiotap_header *radiotap_header, |
| 98 | int max_length, const struct ieee80211_radiotap_vendor_namespaces *vns) | 98 | int max_length, const struct ieee80211_radiotap_vendor_namespaces *vns) |
| 99 | { | 99 | { |
| 100 | /* check the radiotap header can actually be present */ | ||
| 101 | if (max_length < sizeof(struct ieee80211_radiotap_header)) | ||
| 102 | return -EINVAL; | ||
| 103 | |||
| 100 | /* Linux only supports version 0 radiotap format */ | 104 | /* Linux only supports version 0 radiotap format */ |
| 101 | if (radiotap_header->it_version) | 105 | if (radiotap_header->it_version) |
| 102 | return -EINVAL; | 106 | return -EINVAL; |
| @@ -131,7 +135,8 @@ int ieee80211_radiotap_iterator_init( | |||
| 131 | */ | 135 | */ |
| 132 | 136 | ||
| 133 | if ((unsigned long)iterator->_arg - | 137 | if ((unsigned long)iterator->_arg - |
| 134 | (unsigned long)iterator->_rtheader > | 138 | (unsigned long)iterator->_rtheader + |
| 139 | sizeof(uint32_t) > | ||
| 135 | (unsigned long)iterator->_max_length) | 140 | (unsigned long)iterator->_max_length) |
| 136 | return -EINVAL; | 141 | return -EINVAL; |
| 137 | } | 142 | } |
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index ed38d5d81f9e..76e1873811d4 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
| @@ -334,7 +334,8 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) | |||
| 334 | 334 | ||
| 335 | atomic_inc(&policy->genid); | 335 | atomic_inc(&policy->genid); |
| 336 | 336 | ||
| 337 | del_timer(&policy->polq.hold_timer); | 337 | if (del_timer(&policy->polq.hold_timer)) |
| 338 | xfrm_pol_put(policy); | ||
| 338 | xfrm_queue_purge(&policy->polq.hold_queue); | 339 | xfrm_queue_purge(&policy->polq.hold_queue); |
| 339 | 340 | ||
| 340 | if (del_timer(&policy->timer)) | 341 | if (del_timer(&policy->timer)) |
| @@ -589,7 +590,8 @@ static void xfrm_policy_requeue(struct xfrm_policy *old, | |||
| 589 | 590 | ||
| 590 | spin_lock_bh(&pq->hold_queue.lock); | 591 | spin_lock_bh(&pq->hold_queue.lock); |
| 591 | skb_queue_splice_init(&pq->hold_queue, &list); | 592 | skb_queue_splice_init(&pq->hold_queue, &list); |
| 592 | del_timer(&pq->hold_timer); | 593 | if (del_timer(&pq->hold_timer)) |
| 594 | xfrm_pol_put(old); | ||
| 593 | spin_unlock_bh(&pq->hold_queue.lock); | 595 | spin_unlock_bh(&pq->hold_queue.lock); |
| 594 | 596 | ||
| 595 | if (skb_queue_empty(&list)) | 597 | if (skb_queue_empty(&list)) |
| @@ -600,7 +602,8 @@ static void xfrm_policy_requeue(struct xfrm_policy *old, | |||
| 600 | spin_lock_bh(&pq->hold_queue.lock); | 602 | spin_lock_bh(&pq->hold_queue.lock); |
| 601 | skb_queue_splice(&list, &pq->hold_queue); | 603 | skb_queue_splice(&list, &pq->hold_queue); |
| 602 | pq->timeout = XFRM_QUEUE_TMO_MIN; | 604 | pq->timeout = XFRM_QUEUE_TMO_MIN; |
| 603 | mod_timer(&pq->hold_timer, jiffies); | 605 | if (!mod_timer(&pq->hold_timer, jiffies)) |
| 606 | xfrm_pol_hold(new); | ||
| 604 | spin_unlock_bh(&pq->hold_queue.lock); | 607 | spin_unlock_bh(&pq->hold_queue.lock); |
| 605 | } | 608 | } |
| 606 | 609 | ||
| @@ -1769,6 +1772,10 @@ static void xfrm_policy_queue_process(unsigned long arg) | |||
| 1769 | 1772 | ||
| 1770 | spin_lock(&pq->hold_queue.lock); | 1773 | spin_lock(&pq->hold_queue.lock); |
| 1771 | skb = skb_peek(&pq->hold_queue); | 1774 | skb = skb_peek(&pq->hold_queue); |
| 1775 | if (!skb) { | ||
| 1776 | spin_unlock(&pq->hold_queue.lock); | ||
| 1777 | goto out; | ||
| 1778 | } | ||
| 1772 | dst = skb_dst(skb); | 1779 | dst = skb_dst(skb); |
| 1773 | sk = skb->sk; | 1780 | sk = skb->sk; |
| 1774 | xfrm_decode_session(skb, &fl, dst->ops->family); | 1781 | xfrm_decode_session(skb, &fl, dst->ops->family); |
| @@ -1787,8 +1794,9 @@ static void xfrm_policy_queue_process(unsigned long arg) | |||
| 1787 | goto purge_queue; | 1794 | goto purge_queue; |
| 1788 | 1795 | ||
| 1789 | pq->timeout = pq->timeout << 1; | 1796 | pq->timeout = pq->timeout << 1; |
| 1790 | mod_timer(&pq->hold_timer, jiffies + pq->timeout); | 1797 | if (!mod_timer(&pq->hold_timer, jiffies + pq->timeout)) |
| 1791 | return; | 1798 | xfrm_pol_hold(pol); |
| 1799 | goto out; | ||
| 1792 | } | 1800 | } |
| 1793 | 1801 | ||
| 1794 | dst_release(dst); | 1802 | dst_release(dst); |
| @@ -1819,11 +1827,14 @@ static void xfrm_policy_queue_process(unsigned long arg) | |||
| 1819 | err = dst_output(skb); | 1827 | err = dst_output(skb); |
| 1820 | } | 1828 | } |
| 1821 | 1829 | ||
| 1830 | out: | ||
| 1831 | xfrm_pol_put(pol); | ||
| 1822 | return; | 1832 | return; |
| 1823 | 1833 | ||
| 1824 | purge_queue: | 1834 | purge_queue: |
| 1825 | pq->timeout = 0; | 1835 | pq->timeout = 0; |
| 1826 | xfrm_queue_purge(&pq->hold_queue); | 1836 | xfrm_queue_purge(&pq->hold_queue); |
| 1837 | xfrm_pol_put(pol); | ||
| 1827 | } | 1838 | } |
| 1828 | 1839 | ||
| 1829 | static int xdst_queue_output(struct sk_buff *skb) | 1840 | static int xdst_queue_output(struct sk_buff *skb) |
| @@ -1831,7 +1842,8 @@ static int xdst_queue_output(struct sk_buff *skb) | |||
| 1831 | unsigned long sched_next; | 1842 | unsigned long sched_next; |
| 1832 | struct dst_entry *dst = skb_dst(skb); | 1843 | struct dst_entry *dst = skb_dst(skb); |
| 1833 | struct xfrm_dst *xdst = (struct xfrm_dst *) dst; | 1844 | struct xfrm_dst *xdst = (struct xfrm_dst *) dst; |
| 1834 | struct xfrm_policy_queue *pq = &xdst->pols[0]->polq; | 1845 | struct xfrm_policy *pol = xdst->pols[0]; |
| 1846 | struct xfrm_policy_queue *pq = &pol->polq; | ||
| 1835 | 1847 | ||
| 1836 | if (pq->hold_queue.qlen > XFRM_MAX_QUEUE_LEN) { | 1848 | if (pq->hold_queue.qlen > XFRM_MAX_QUEUE_LEN) { |
| 1837 | kfree_skb(skb); | 1849 | kfree_skb(skb); |
| @@ -1850,10 +1862,12 @@ static int xdst_queue_output(struct sk_buff *skb) | |||
| 1850 | if (del_timer(&pq->hold_timer)) { | 1862 | if (del_timer(&pq->hold_timer)) { |
| 1851 | if (time_before(pq->hold_timer.expires, sched_next)) | 1863 | if (time_before(pq->hold_timer.expires, sched_next)) |
| 1852 | sched_next = pq->hold_timer.expires; | 1864 | sched_next = pq->hold_timer.expires; |
| 1865 | xfrm_pol_put(pol); | ||
| 1853 | } | 1866 | } |
| 1854 | 1867 | ||
| 1855 | __skb_queue_tail(&pq->hold_queue, skb); | 1868 | __skb_queue_tail(&pq->hold_queue, skb); |
| 1856 | mod_timer(&pq->hold_timer, sched_next); | 1869 | if (!mod_timer(&pq->hold_timer, sched_next)) |
| 1870 | xfrm_pol_hold(pol); | ||
| 1857 | 1871 | ||
| 1858 | spin_unlock_bh(&pq->hold_queue.lock); | 1872 | spin_unlock_bh(&pq->hold_queue.lock); |
| 1859 | 1873 | ||
diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c index 8dafe6d3c6e4..dab57daae408 100644 --- a/net/xfrm/xfrm_replay.c +++ b/net/xfrm/xfrm_replay.c | |||
| @@ -61,9 +61,9 @@ static void xfrm_replay_notify(struct xfrm_state *x, int event) | |||
| 61 | 61 | ||
| 62 | switch (event) { | 62 | switch (event) { |
| 63 | case XFRM_REPLAY_UPDATE: | 63 | case XFRM_REPLAY_UPDATE: |
| 64 | if (x->replay_maxdiff && | 64 | if (!x->replay_maxdiff || |
| 65 | (x->replay.seq - x->preplay.seq < x->replay_maxdiff) && | 65 | ((x->replay.seq - x->preplay.seq < x->replay_maxdiff) && |
| 66 | (x->replay.oseq - x->preplay.oseq < x->replay_maxdiff)) { | 66 | (x->replay.oseq - x->preplay.oseq < x->replay_maxdiff))) { |
| 67 | if (x->xflags & XFRM_TIME_DEFER) | 67 | if (x->xflags & XFRM_TIME_DEFER) |
| 68 | event = XFRM_REPLAY_TIMEOUT; | 68 | event = XFRM_REPLAY_TIMEOUT; |
| 69 | else | 69 | else |
| @@ -129,8 +129,7 @@ static int xfrm_replay_check(struct xfrm_state *x, | |||
| 129 | return 0; | 129 | return 0; |
| 130 | 130 | ||
| 131 | diff = x->replay.seq - seq; | 131 | diff = x->replay.seq - seq; |
| 132 | if (diff >= min_t(unsigned int, x->props.replay_window, | 132 | if (diff >= x->props.replay_window) { |
| 133 | sizeof(x->replay.bitmap) * 8)) { | ||
| 134 | x->stats.replay_window++; | 133 | x->stats.replay_window++; |
| 135 | goto err; | 134 | goto err; |
| 136 | } | 135 | } |
| @@ -302,9 +301,10 @@ static void xfrm_replay_notify_bmp(struct xfrm_state *x, int event) | |||
| 302 | 301 | ||
| 303 | switch (event) { | 302 | switch (event) { |
| 304 | case XFRM_REPLAY_UPDATE: | 303 | case XFRM_REPLAY_UPDATE: |
| 305 | if (x->replay_maxdiff && | 304 | if (!x->replay_maxdiff || |
| 306 | (replay_esn->seq - preplay_esn->seq < x->replay_maxdiff) && | 305 | ((replay_esn->seq - preplay_esn->seq < x->replay_maxdiff) && |
| 307 | (replay_esn->oseq - preplay_esn->oseq < x->replay_maxdiff)) { | 306 | (replay_esn->oseq - preplay_esn->oseq |
| 307 | < x->replay_maxdiff))) { | ||
| 308 | if (x->xflags & XFRM_TIME_DEFER) | 308 | if (x->xflags & XFRM_TIME_DEFER) |
| 309 | event = XFRM_REPLAY_TIMEOUT; | 309 | event = XFRM_REPLAY_TIMEOUT; |
| 310 | else | 310 | else |
| @@ -353,28 +353,30 @@ static void xfrm_replay_notify_esn(struct xfrm_state *x, int event) | |||
| 353 | 353 | ||
| 354 | switch (event) { | 354 | switch (event) { |
| 355 | case XFRM_REPLAY_UPDATE: | 355 | case XFRM_REPLAY_UPDATE: |
| 356 | if (!x->replay_maxdiff) | 356 | if (x->replay_maxdiff) { |
| 357 | break; | 357 | if (replay_esn->seq_hi == preplay_esn->seq_hi) |
| 358 | 358 | seq_diff = replay_esn->seq - preplay_esn->seq; | |
| 359 | if (replay_esn->seq_hi == preplay_esn->seq_hi) | 359 | else |
| 360 | seq_diff = replay_esn->seq - preplay_esn->seq; | 360 | seq_diff = ~preplay_esn->seq + replay_esn->seq |
| 361 | else | 361 | + 1; |
| 362 | seq_diff = ~preplay_esn->seq + replay_esn->seq + 1; | ||
| 363 | |||
| 364 | if (replay_esn->oseq_hi == preplay_esn->oseq_hi) | ||
| 365 | oseq_diff = replay_esn->oseq - preplay_esn->oseq; | ||
| 366 | else | ||
| 367 | oseq_diff = ~preplay_esn->oseq + replay_esn->oseq + 1; | ||
| 368 | |||
| 369 | if (seq_diff < x->replay_maxdiff && | ||
| 370 | oseq_diff < x->replay_maxdiff) { | ||
| 371 | 362 | ||
| 372 | if (x->xflags & XFRM_TIME_DEFER) | 363 | if (replay_esn->oseq_hi == preplay_esn->oseq_hi) |
| 373 | event = XFRM_REPLAY_TIMEOUT; | 364 | oseq_diff = replay_esn->oseq |
| 365 | - preplay_esn->oseq; | ||
| 374 | else | 366 | else |
| 375 | return; | 367 | oseq_diff = ~preplay_esn->oseq |
| 368 | + replay_esn->oseq + 1; | ||
| 369 | |||
| 370 | if (seq_diff >= x->replay_maxdiff || | ||
| 371 | oseq_diff >= x->replay_maxdiff) | ||
| 372 | break; | ||
| 376 | } | 373 | } |
| 377 | 374 | ||
| 375 | if (x->xflags & XFRM_TIME_DEFER) | ||
| 376 | event = XFRM_REPLAY_TIMEOUT; | ||
| 377 | else | ||
| 378 | return; | ||
| 379 | |||
| 378 | break; | 380 | break; |
| 379 | 381 | ||
| 380 | case XFRM_REPLAY_TIMEOUT: | 382 | case XFRM_REPLAY_TIMEOUT: |
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 3f565e495ac6..f964d4c00ffb 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
| @@ -446,7 +446,8 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info * | |||
| 446 | memcpy(&x->sel, &p->sel, sizeof(x->sel)); | 446 | memcpy(&x->sel, &p->sel, sizeof(x->sel)); |
| 447 | memcpy(&x->lft, &p->lft, sizeof(x->lft)); | 447 | memcpy(&x->lft, &p->lft, sizeof(x->lft)); |
| 448 | x->props.mode = p->mode; | 448 | x->props.mode = p->mode; |
| 449 | x->props.replay_window = p->replay_window; | 449 | x->props.replay_window = min_t(unsigned int, p->replay_window, |
| 450 | sizeof(x->replay.bitmap) * 8); | ||
| 450 | x->props.reqid = p->reqid; | 451 | x->props.reqid = p->reqid; |
| 451 | x->props.family = p->family; | 452 | x->props.family = p->family; |
| 452 | memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr)); | 453 | memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr)); |
| @@ -1856,7 +1857,7 @@ static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
| 1856 | if (x->km.state != XFRM_STATE_VALID) | 1857 | if (x->km.state != XFRM_STATE_VALID) |
| 1857 | goto out; | 1858 | goto out; |
| 1858 | 1859 | ||
| 1859 | err = xfrm_replay_verify_len(x->replay_esn, rp); | 1860 | err = xfrm_replay_verify_len(x->replay_esn, re); |
| 1860 | if (err) | 1861 | if (err) |
| 1861 | goto out; | 1862 | goto out; |
| 1862 | 1863 | ||
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 95c2b2689a03..7db9954f1af2 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c | |||
| @@ -580,15 +580,13 @@ static struct aa_namespace *__next_namespace(struct aa_namespace *root, | |||
| 580 | 580 | ||
| 581 | /* check if the next ns is a sibling, parent, gp, .. */ | 581 | /* check if the next ns is a sibling, parent, gp, .. */ |
| 582 | parent = ns->parent; | 582 | parent = ns->parent; |
| 583 | while (parent) { | 583 | while (ns != root) { |
| 584 | mutex_unlock(&ns->lock); | 584 | mutex_unlock(&ns->lock); |
| 585 | next = list_entry_next(ns, base.list); | 585 | next = list_entry_next(ns, base.list); |
| 586 | if (!list_entry_is_head(next, &parent->sub_ns, base.list)) { | 586 | if (!list_entry_is_head(next, &parent->sub_ns, base.list)) { |
| 587 | mutex_lock(&next->lock); | 587 | mutex_lock(&next->lock); |
| 588 | return next; | 588 | return next; |
| 589 | } | 589 | } |
| 590 | if (parent == root) | ||
| 591 | return NULL; | ||
| 592 | ns = parent; | 590 | ns = parent; |
| 593 | parent = parent->parent; | 591 | parent = parent->parent; |
| 594 | } | 592 | } |
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c index 345bec07a27d..705c2879d3a9 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c | |||
| @@ -610,6 +610,7 @@ void aa_free_profile(struct aa_profile *profile) | |||
| 610 | aa_put_dfa(profile->policy.dfa); | 610 | aa_put_dfa(profile->policy.dfa); |
| 611 | aa_put_replacedby(profile->replacedby); | 611 | aa_put_replacedby(profile->replacedby); |
| 612 | 612 | ||
| 613 | kzfree(profile->hash); | ||
| 613 | kzfree(profile); | 614 | kzfree(profile); |
| 614 | } | 615 | } |
| 615 | 616 | ||
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index ac41e9cdc976..26ad4f0aade3 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c | |||
| @@ -3531,7 +3531,7 @@ static int create_capture_mixers(struct hda_codec *codec) | |||
| 3531 | if (!multi) | 3531 | if (!multi) |
| 3532 | err = create_single_cap_vol_ctl(codec, n, vol, sw, | 3532 | err = create_single_cap_vol_ctl(codec, n, vol, sw, |
| 3533 | inv_dmic); | 3533 | inv_dmic); |
| 3534 | else if (!multi_cap_vol) | 3534 | else if (!multi_cap_vol && !inv_dmic) |
| 3535 | err = create_bind_cap_vol_ctl(codec, n, vol, sw); | 3535 | err = create_bind_cap_vol_ctl(codec, n, vol, sw); |
| 3536 | else | 3536 | else |
| 3537 | err = create_multi_cap_vol_ctl(codec); | 3537 | err = create_multi_cap_vol_ctl(codec); |
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 7ea0245fc6bd..50173d412ac5 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c | |||
| @@ -937,6 +937,14 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, | |||
| 937 | } | 937 | } |
| 938 | 938 | ||
| 939 | /* | 939 | /* |
| 940 | * always configure channel mapping, it may have been changed by the | ||
| 941 | * user in the meantime | ||
| 942 | */ | ||
| 943 | hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca, | ||
| 944 | channels, per_pin->chmap, | ||
| 945 | per_pin->chmap_set); | ||
| 946 | |||
| 947 | /* | ||
| 940 | * sizeof(ai) is used instead of sizeof(*hdmi_ai) or | 948 | * sizeof(ai) is used instead of sizeof(*hdmi_ai) or |
| 941 | * sizeof(*dp_ai) to avoid partial match/update problems when | 949 | * sizeof(*dp_ai) to avoid partial match/update problems when |
| 942 | * the user switches between HDMI/DP monitors. | 950 | * the user switches between HDMI/DP monitors. |
| @@ -947,20 +955,10 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, | |||
| 947 | "pin=%d channels=%d\n", | 955 | "pin=%d channels=%d\n", |
| 948 | pin_nid, | 956 | pin_nid, |
| 949 | channels); | 957 | channels); |
| 950 | hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca, | ||
| 951 | channels, per_pin->chmap, | ||
| 952 | per_pin->chmap_set); | ||
| 953 | hdmi_stop_infoframe_trans(codec, pin_nid); | 958 | hdmi_stop_infoframe_trans(codec, pin_nid); |
| 954 | hdmi_fill_audio_infoframe(codec, pin_nid, | 959 | hdmi_fill_audio_infoframe(codec, pin_nid, |
| 955 | ai.bytes, sizeof(ai)); | 960 | ai.bytes, sizeof(ai)); |
| 956 | hdmi_start_infoframe_trans(codec, pin_nid); | 961 | hdmi_start_infoframe_trans(codec, pin_nid); |
| 957 | } else { | ||
| 958 | /* For non-pcm audio switch, setup new channel mapping | ||
| 959 | * accordingly */ | ||
| 960 | if (per_pin->non_pcm != non_pcm) | ||
| 961 | hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca, | ||
| 962 | channels, per_pin->chmap, | ||
| 963 | per_pin->chmap_set); | ||
| 964 | } | 962 | } |
| 965 | 963 | ||
| 966 | per_pin->non_pcm = non_pcm; | 964 | per_pin->non_pcm = non_pcm; |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 0e303b99a47c..bf313bea7085 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -2819,6 +2819,15 @@ static void alc269_fixup_hweq(struct hda_codec *codec, | |||
| 2819 | alc_write_coef_idx(codec, 0x1e, coef | 0x80); | 2819 | alc_write_coef_idx(codec, 0x1e, coef | 0x80); |
| 2820 | } | 2820 | } |
| 2821 | 2821 | ||
| 2822 | static void alc269_fixup_headset_mic(struct hda_codec *codec, | ||
| 2823 | const struct hda_fixup *fix, int action) | ||
| 2824 | { | ||
| 2825 | struct alc_spec *spec = codec->spec; | ||
| 2826 | |||
| 2827 | if (action == HDA_FIXUP_ACT_PRE_PROBE) | ||
| 2828 | spec->parse_flags |= HDA_PINCFG_HEADSET_MIC; | ||
| 2829 | } | ||
| 2830 | |||
| 2822 | static void alc271_fixup_dmic(struct hda_codec *codec, | 2831 | static void alc271_fixup_dmic(struct hda_codec *codec, |
| 2823 | const struct hda_fixup *fix, int action) | 2832 | const struct hda_fixup *fix, int action) |
| 2824 | { | 2833 | { |
| @@ -3496,6 +3505,15 @@ static void alc282_fixup_asus_tx300(struct hda_codec *codec, | |||
| 3496 | } | 3505 | } |
| 3497 | } | 3506 | } |
| 3498 | 3507 | ||
| 3508 | static void alc290_fixup_mono_speakers(struct hda_codec *codec, | ||
| 3509 | const struct hda_fixup *fix, int action) | ||
| 3510 | { | ||
| 3511 | if (action == HDA_FIXUP_ACT_PRE_PROBE) | ||
| 3512 | /* Remove DAC node 0x03, as it seems to be | ||
| 3513 | giving mono output */ | ||
| 3514 | snd_hda_override_wcaps(codec, 0x03, 0); | ||
| 3515 | } | ||
| 3516 | |||
| 3499 | enum { | 3517 | enum { |
| 3500 | ALC269_FIXUP_SONY_VAIO, | 3518 | ALC269_FIXUP_SONY_VAIO, |
| 3501 | ALC275_FIXUP_SONY_VAIO_GPIO2, | 3519 | ALC275_FIXUP_SONY_VAIO_GPIO2, |
| @@ -3507,6 +3525,7 @@ enum { | |||
| 3507 | ALC271_FIXUP_DMIC, | 3525 | ALC271_FIXUP_DMIC, |
| 3508 | ALC269_FIXUP_PCM_44K, | 3526 | ALC269_FIXUP_PCM_44K, |
| 3509 | ALC269_FIXUP_STEREO_DMIC, | 3527 | ALC269_FIXUP_STEREO_DMIC, |
| 3528 | ALC269_FIXUP_HEADSET_MIC, | ||
| 3510 | ALC269_FIXUP_QUANTA_MUTE, | 3529 | ALC269_FIXUP_QUANTA_MUTE, |
| 3511 | ALC269_FIXUP_LIFEBOOK, | 3530 | ALC269_FIXUP_LIFEBOOK, |
| 3512 | ALC269_FIXUP_AMIC, | 3531 | ALC269_FIXUP_AMIC, |
| @@ -3519,9 +3538,11 @@ enum { | |||
| 3519 | ALC269_FIXUP_HP_GPIO_LED, | 3538 | ALC269_FIXUP_HP_GPIO_LED, |
| 3520 | ALC269_FIXUP_INV_DMIC, | 3539 | ALC269_FIXUP_INV_DMIC, |
| 3521 | ALC269_FIXUP_LENOVO_DOCK, | 3540 | ALC269_FIXUP_LENOVO_DOCK, |
| 3541 | ALC286_FIXUP_SONY_MIC_NO_PRESENCE, | ||
| 3522 | ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT, | 3542 | ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT, |
| 3523 | ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, | 3543 | ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, |
| 3524 | ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, | 3544 | ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, |
| 3545 | ALC269_FIXUP_DELL3_MIC_NO_PRESENCE, | ||
| 3525 | ALC269_FIXUP_HEADSET_MODE, | 3546 | ALC269_FIXUP_HEADSET_MODE, |
| 3526 | ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, | 3547 | ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, |
| 3527 | ALC269_FIXUP_ASUS_X101_FUNC, | 3548 | ALC269_FIXUP_ASUS_X101_FUNC, |
| @@ -3535,6 +3556,7 @@ enum { | |||
| 3535 | ALC283_FIXUP_CHROME_BOOK, | 3556 | ALC283_FIXUP_CHROME_BOOK, |
| 3536 | ALC282_FIXUP_ASUS_TX300, | 3557 | ALC282_FIXUP_ASUS_TX300, |
| 3537 | ALC283_FIXUP_INT_MIC, | 3558 | ALC283_FIXUP_INT_MIC, |
| 3559 | ALC290_FIXUP_MONO_SPEAKERS, | ||
| 3538 | }; | 3560 | }; |
| 3539 | 3561 | ||
| 3540 | static const struct hda_fixup alc269_fixups[] = { | 3562 | static const struct hda_fixup alc269_fixups[] = { |
| @@ -3603,6 +3625,10 @@ static const struct hda_fixup alc269_fixups[] = { | |||
| 3603 | .type = HDA_FIXUP_FUNC, | 3625 | .type = HDA_FIXUP_FUNC, |
| 3604 | .v.func = alc269_fixup_stereo_dmic, | 3626 | .v.func = alc269_fixup_stereo_dmic, |
| 3605 | }, | 3627 | }, |
| 3628 | [ALC269_FIXUP_HEADSET_MIC] = { | ||
| 3629 | .type = HDA_FIXUP_FUNC, | ||
| 3630 | .v.func = alc269_fixup_headset_mic, | ||
| 3631 | }, | ||
| 3606 | [ALC269_FIXUP_QUANTA_MUTE] = { | 3632 | [ALC269_FIXUP_QUANTA_MUTE] = { |
| 3607 | .type = HDA_FIXUP_FUNC, | 3633 | .type = HDA_FIXUP_FUNC, |
| 3608 | .v.func = alc269_fixup_quanta_mute, | 3634 | .v.func = alc269_fixup_quanta_mute, |
| @@ -3712,6 +3738,15 @@ static const struct hda_fixup alc269_fixups[] = { | |||
| 3712 | .chained = true, | 3738 | .chained = true, |
| 3713 | .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC | 3739 | .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC |
| 3714 | }, | 3740 | }, |
| 3741 | [ALC269_FIXUP_DELL3_MIC_NO_PRESENCE] = { | ||
| 3742 | .type = HDA_FIXUP_PINS, | ||
| 3743 | .v.pins = (const struct hda_pintbl[]) { | ||
| 3744 | { 0x1a, 0x01a1913c }, /* use as headset mic, without its own jack detect */ | ||
| 3745 | { } | ||
| 3746 | }, | ||
| 3747 | .chained = true, | ||
| 3748 | .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC | ||
| 3749 | }, | ||
| 3715 | [ALC269_FIXUP_HEADSET_MODE] = { | 3750 | [ALC269_FIXUP_HEADSET_MODE] = { |
| 3716 | .type = HDA_FIXUP_FUNC, | 3751 | .type = HDA_FIXUP_FUNC, |
| 3717 | .v.func = alc_fixup_headset_mode, | 3752 | .v.func = alc_fixup_headset_mode, |
| @@ -3720,6 +3755,15 @@ static const struct hda_fixup alc269_fixups[] = { | |||
| 3720 | .type = HDA_FIXUP_FUNC, | 3755 | .type = HDA_FIXUP_FUNC, |
| 3721 | .v.func = alc_fixup_headset_mode_no_hp_mic, | 3756 | .v.func = alc_fixup_headset_mode_no_hp_mic, |
| 3722 | }, | 3757 | }, |
| 3758 | [ALC286_FIXUP_SONY_MIC_NO_PRESENCE] = { | ||
| 3759 | .type = HDA_FIXUP_PINS, | ||
| 3760 | .v.pins = (const struct hda_pintbl[]) { | ||
| 3761 | { 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */ | ||
| 3762 | { } | ||
| 3763 | }, | ||
| 3764 | .chained = true, | ||
| 3765 | .chain_id = ALC269_FIXUP_HEADSET_MIC | ||
| 3766 | }, | ||
| 3723 | [ALC269_FIXUP_ASUS_X101_FUNC] = { | 3767 | [ALC269_FIXUP_ASUS_X101_FUNC] = { |
| 3724 | .type = HDA_FIXUP_FUNC, | 3768 | .type = HDA_FIXUP_FUNC, |
| 3725 | .v.func = alc269_fixup_x101_headset_mic, | 3769 | .v.func = alc269_fixup_x101_headset_mic, |
| @@ -3804,6 +3848,12 @@ static const struct hda_fixup alc269_fixups[] = { | |||
| 3804 | .chained = true, | 3848 | .chained = true, |
| 3805 | .chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST | 3849 | .chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST |
| 3806 | }, | 3850 | }, |
| 3851 | [ALC290_FIXUP_MONO_SPEAKERS] = { | ||
| 3852 | .type = HDA_FIXUP_FUNC, | ||
| 3853 | .v.func = alc290_fixup_mono_speakers, | ||
| 3854 | .chained = true, | ||
| 3855 | .chain_id = ALC269_FIXUP_DELL3_MIC_NO_PRESENCE, | ||
| 3856 | }, | ||
| 3807 | }; | 3857 | }; |
| 3808 | 3858 | ||
| 3809 | static const struct snd_pci_quirk alc269_fixup_tbl[] = { | 3859 | static const struct snd_pci_quirk alc269_fixup_tbl[] = { |
| @@ -3845,6 +3895,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { | |||
| 3845 | SND_PCI_QUIRK(0x1028, 0x0608, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), | 3895 | SND_PCI_QUIRK(0x1028, 0x0608, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), |
| 3846 | SND_PCI_QUIRK(0x1028, 0x0609, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), | 3896 | SND_PCI_QUIRK(0x1028, 0x0609, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), |
| 3847 | SND_PCI_QUIRK(0x1028, 0x0613, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), | 3897 | SND_PCI_QUIRK(0x1028, 0x0613, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), |
| 3898 | SND_PCI_QUIRK(0x1028, 0x0616, "Dell Vostro 5470", ALC290_FIXUP_MONO_SPEAKERS), | ||
| 3848 | SND_PCI_QUIRK(0x1028, 0x15cc, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE), | 3899 | SND_PCI_QUIRK(0x1028, 0x15cc, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE), |
| 3849 | SND_PCI_QUIRK(0x1028, 0x15cd, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE), | 3900 | SND_PCI_QUIRK(0x1028, 0x15cd, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE), |
| 3850 | SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2), | 3901 | SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2), |
| @@ -3867,6 +3918,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { | |||
| 3867 | SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC), | 3918 | SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC), |
| 3868 | SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC), | 3919 | SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC), |
| 3869 | SND_PCI_QUIRK(0x1043, 0x8516, "ASUS X101CH", ALC269_FIXUP_ASUS_X101), | 3920 | SND_PCI_QUIRK(0x1043, 0x8516, "ASUS X101CH", ALC269_FIXUP_ASUS_X101), |
| 3921 | SND_PCI_QUIRK(0x104d, 0x90b6, "Sony VAIO Pro 13", ALC286_FIXUP_SONY_MIC_NO_PRESENCE), | ||
| 3870 | SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIXUP_SONY_VAIO_GPIO2), | 3922 | SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIXUP_SONY_VAIO_GPIO2), |
| 3871 | SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ), | 3923 | SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ), |
| 3872 | SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ), | 3924 | SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ), |
| @@ -3952,6 +4004,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { | |||
| 3952 | {.id = ALC269_FIXUP_STEREO_DMIC, .name = "alc269-dmic"}, | 4004 | {.id = ALC269_FIXUP_STEREO_DMIC, .name = "alc269-dmic"}, |
| 3953 | {.id = ALC271_FIXUP_DMIC, .name = "alc271-dmic"}, | 4005 | {.id = ALC271_FIXUP_DMIC, .name = "alc271-dmic"}, |
| 3954 | {.id = ALC269_FIXUP_INV_DMIC, .name = "inv-dmic"}, | 4006 | {.id = ALC269_FIXUP_INV_DMIC, .name = "inv-dmic"}, |
| 4007 | {.id = ALC269_FIXUP_HEADSET_MIC, .name = "headset-mic"}, | ||
| 3955 | {.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"}, | 4008 | {.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"}, |
| 3956 | {.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"}, | 4009 | {.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"}, |
| 3957 | {.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"}, | 4010 | {.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"}, |
| @@ -4569,6 +4622,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { | |||
| 4569 | SND_PCI_QUIRK(0x1028, 0x05d8, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), | 4622 | SND_PCI_QUIRK(0x1028, 0x05d8, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), |
| 4570 | SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), | 4623 | SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), |
| 4571 | SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800), | 4624 | SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800), |
| 4625 | SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_ASUS_MODE4), | ||
| 4572 | SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT), | 4626 | SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT), |
| 4573 | SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2), | 4627 | SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2), |
| 4574 | SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD), | 4628 | SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD), |
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 4f255dfee450..f59a321a6d6a 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c | |||
| @@ -4845,6 +4845,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne | |||
| 4845 | if ((err = hdsp_get_iobox_version(hdsp)) < 0) | 4845 | if ((err = hdsp_get_iobox_version(hdsp)) < 0) |
| 4846 | return err; | 4846 | return err; |
| 4847 | } | 4847 | } |
| 4848 | memset(&hdsp_version, 0, sizeof(hdsp_version)); | ||
| 4848 | hdsp_version.io_type = hdsp->io_type; | 4849 | hdsp_version.io_type = hdsp->io_type; |
| 4849 | hdsp_version.firmware_rev = hdsp->firmware_rev; | 4850 | hdsp_version.firmware_rev = hdsp->firmware_rev; |
| 4850 | if ((err = copy_to_user(argp, &hdsp_version, sizeof(hdsp_version)))) | 4851 | if ((err = copy_to_user(argp, &hdsp_version, sizeof(hdsp_version)))) |
diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c index 651ce0923675..c91eba504f92 100644 --- a/sound/soc/codecs/pcm1681.c +++ b/sound/soc/codecs/pcm1681.c | |||
| @@ -270,7 +270,7 @@ MODULE_DEVICE_TABLE(of, pcm1681_dt_ids); | |||
| 270 | static const struct regmap_config pcm1681_regmap = { | 270 | static const struct regmap_config pcm1681_regmap = { |
| 271 | .reg_bits = 8, | 271 | .reg_bits = 8, |
| 272 | .val_bits = 8, | 272 | .val_bits = 8, |
| 273 | .max_register = ARRAY_SIZE(pcm1681_reg_defaults) + 1, | 273 | .max_register = 0x13, |
| 274 | .reg_defaults = pcm1681_reg_defaults, | 274 | .reg_defaults = pcm1681_reg_defaults, |
| 275 | .num_reg_defaults = ARRAY_SIZE(pcm1681_reg_defaults), | 275 | .num_reg_defaults = ARRAY_SIZE(pcm1681_reg_defaults), |
| 276 | .writeable_reg = pcm1681_writeable_reg, | 276 | .writeable_reg = pcm1681_writeable_reg, |
diff --git a/sound/soc/codecs/pcm1792a.c b/sound/soc/codecs/pcm1792a.c index 2a8eccf64c76..7613181123fe 100644 --- a/sound/soc/codecs/pcm1792a.c +++ b/sound/soc/codecs/pcm1792a.c | |||
| @@ -188,7 +188,7 @@ MODULE_DEVICE_TABLE(of, pcm1792a_of_match); | |||
| 188 | static const struct regmap_config pcm1792a_regmap = { | 188 | static const struct regmap_config pcm1792a_regmap = { |
| 189 | .reg_bits = 8, | 189 | .reg_bits = 8, |
| 190 | .val_bits = 8, | 190 | .val_bits = 8, |
| 191 | .max_register = 24, | 191 | .max_register = 23, |
| 192 | .reg_defaults = pcm1792a_reg_defaults, | 192 | .reg_defaults = pcm1792a_reg_defaults, |
| 193 | .num_reg_defaults = ARRAY_SIZE(pcm1792a_reg_defaults), | 193 | .num_reg_defaults = ARRAY_SIZE(pcm1792a_reg_defaults), |
| 194 | .writeable_reg = pcm1792a_writeable_reg, | 194 | .writeable_reg = pcm1792a_writeable_reg, |
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 6e3f269243e0..64ad84d8a306 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c | |||
| @@ -674,6 +674,8 @@ static const struct snd_soc_dapm_route intercon[] = { | |||
| 674 | /* Left Input */ | 674 | /* Left Input */ |
| 675 | {"Left Line1L Mux", "single-ended", "LINE1L"}, | 675 | {"Left Line1L Mux", "single-ended", "LINE1L"}, |
| 676 | {"Left Line1L Mux", "differential", "LINE1L"}, | 676 | {"Left Line1L Mux", "differential", "LINE1L"}, |
| 677 | {"Left Line1R Mux", "single-ended", "LINE1R"}, | ||
| 678 | {"Left Line1R Mux", "differential", "LINE1R"}, | ||
| 677 | 679 | ||
| 678 | {"Left Line2L Mux", "single-ended", "LINE2L"}, | 680 | {"Left Line2L Mux", "single-ended", "LINE2L"}, |
| 679 | {"Left Line2L Mux", "differential", "LINE2L"}, | 681 | {"Left Line2L Mux", "differential", "LINE2L"}, |
| @@ -690,6 +692,8 @@ static const struct snd_soc_dapm_route intercon[] = { | |||
| 690 | /* Right Input */ | 692 | /* Right Input */ |
| 691 | {"Right Line1R Mux", "single-ended", "LINE1R"}, | 693 | {"Right Line1R Mux", "single-ended", "LINE1R"}, |
| 692 | {"Right Line1R Mux", "differential", "LINE1R"}, | 694 | {"Right Line1R Mux", "differential", "LINE1R"}, |
| 695 | {"Right Line1L Mux", "single-ended", "LINE1L"}, | ||
| 696 | {"Right Line1L Mux", "differential", "LINE1L"}, | ||
| 693 | 697 | ||
| 694 | {"Right Line2R Mux", "single-ended", "LINE2R"}, | 698 | {"Right Line2R Mux", "single-ended", "LINE2R"}, |
| 695 | {"Right Line2R Mux", "differential", "LINE2R"}, | 699 | {"Right Line2R Mux", "differential", "LINE2R"}, |
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index c6b743978d5e..6b81d0ce2c44 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c | |||
| @@ -936,7 +936,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) | |||
| 936 | ssi_private->ssi_phys = res.start; | 936 | ssi_private->ssi_phys = res.start; |
| 937 | 937 | ||
| 938 | ssi_private->irq = irq_of_parse_and_map(np, 0); | 938 | ssi_private->irq = irq_of_parse_and_map(np, 0); |
| 939 | if (ssi_private->irq == NO_IRQ) { | 939 | if (ssi_private->irq == 0) { |
| 940 | dev_err(&pdev->dev, "no irq for node %s\n", np->full_name); | 940 | dev_err(&pdev->dev, "no irq for node %s\n", np->full_name); |
| 941 | return -ENXIO; | 941 | return -ENXIO; |
| 942 | } | 942 | } |
diff --git a/sound/soc/fsl/imx-mc13783.c b/sound/soc/fsl/imx-mc13783.c index a3d60d4bea4c..a2fd7321b5a9 100644 --- a/sound/soc/fsl/imx-mc13783.c +++ b/sound/soc/fsl/imx-mc13783.c | |||
| @@ -112,7 +112,7 @@ static int imx_mc13783_probe(struct platform_device *pdev) | |||
| 112 | return ret; | 112 | return ret; |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | if (machine_is_mx31_3ds()) { | 115 | if (machine_is_mx31_3ds() || machine_is_mx31moboard()) { |
| 116 | imx_audmux_v2_configure_port(MX31_AUDMUX_PORT4_SSI_PINS_4, | 116 | imx_audmux_v2_configure_port(MX31_AUDMUX_PORT4_SSI_PINS_4, |
| 117 | IMX_AUDMUX_V2_PTCR_SYN, | 117 | IMX_AUDMUX_V2_PTCR_SYN, |
| 118 | IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT1_SSI0) | | 118 | IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT1_SSI0) | |
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index f58bcd85c07f..57d6941676ff 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c | |||
| @@ -600,19 +600,17 @@ static int imx_ssi_probe(struct platform_device *pdev) | |||
| 600 | ssi->fiq_params.dma_params_rx = &ssi->dma_params_rx; | 600 | ssi->fiq_params.dma_params_rx = &ssi->dma_params_rx; |
| 601 | ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx; | 601 | ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx; |
| 602 | 602 | ||
| 603 | ret = imx_pcm_fiq_init(pdev, &ssi->fiq_params); | 603 | ssi->fiq_init = imx_pcm_fiq_init(pdev, &ssi->fiq_params); |
| 604 | if (ret) | 604 | ssi->dma_init = imx_pcm_dma_init(pdev); |
| 605 | goto failed_pcm_fiq; | ||
| 606 | 605 | ||
| 607 | ret = imx_pcm_dma_init(pdev); | 606 | if (ssi->fiq_init && ssi->dma_init) { |
| 608 | if (ret) | 607 | ret = ssi->fiq_init; |
| 609 | goto failed_pcm_dma; | 608 | goto failed_pcm; |
| 609 | } | ||
| 610 | 610 | ||
| 611 | return 0; | 611 | return 0; |
| 612 | 612 | ||
| 613 | failed_pcm_dma: | 613 | failed_pcm: |
| 614 | imx_pcm_fiq_exit(pdev); | ||
| 615 | failed_pcm_fiq: | ||
| 616 | snd_soc_unregister_component(&pdev->dev); | 614 | snd_soc_unregister_component(&pdev->dev); |
| 617 | failed_register: | 615 | failed_register: |
| 618 | release_mem_region(res->start, resource_size(res)); | 616 | release_mem_region(res->start, resource_size(res)); |
| @@ -628,8 +626,11 @@ static int imx_ssi_remove(struct platform_device *pdev) | |||
| 628 | struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 626 | struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 629 | struct imx_ssi *ssi = platform_get_drvdata(pdev); | 627 | struct imx_ssi *ssi = platform_get_drvdata(pdev); |
| 630 | 628 | ||
| 631 | imx_pcm_dma_exit(pdev); | 629 | if (!ssi->dma_init) |
| 632 | imx_pcm_fiq_exit(pdev); | 630 | imx_pcm_dma_exit(pdev); |
| 631 | |||
| 632 | if (!ssi->fiq_init) | ||
| 633 | imx_pcm_fiq_exit(pdev); | ||
| 633 | 634 | ||
| 634 | snd_soc_unregister_component(&pdev->dev); | 635 | snd_soc_unregister_component(&pdev->dev); |
| 635 | 636 | ||
diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h index fb1616ba8c59..560c40fc9ebb 100644 --- a/sound/soc/fsl/imx-ssi.h +++ b/sound/soc/fsl/imx-ssi.h | |||
| @@ -211,6 +211,8 @@ struct imx_ssi { | |||
| 211 | struct imx_dma_data filter_data_rx; | 211 | struct imx_dma_data filter_data_rx; |
| 212 | struct imx_pcm_fiq_params fiq_params; | 212 | struct imx_pcm_fiq_params fiq_params; |
| 213 | 213 | ||
| 214 | int fiq_init; | ||
| 215 | int dma_init; | ||
| 214 | int enabled; | 216 | int enabled; |
| 215 | }; | 217 | }; |
| 216 | 218 | ||
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index daa78a0095fa..4a07f7179690 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config SND_OMAP_SOC | 1 | config SND_OMAP_SOC |
| 2 | tristate "SoC Audio for the Texas Instruments OMAP chips" | 2 | tristate "SoC Audio for the Texas Instruments OMAP chips" |
| 3 | depends on (ARCH_OMAP && DMA_OMAP) || (ARCH_ARM && COMPILE_TEST) | 3 | depends on (ARCH_OMAP && DMA_OMAP) || (ARM && COMPILE_TEST) |
| 4 | select SND_DMAENGINE_PCM | 4 | select SND_DMAENGINE_PCM |
| 5 | 5 | ||
| 6 | config SND_OMAP_SOC_DMIC | 6 | config SND_OMAP_SOC_DMIC |
| @@ -26,7 +26,7 @@ config SND_OMAP_SOC_N810 | |||
| 26 | 26 | ||
| 27 | config SND_OMAP_SOC_RX51 | 27 | config SND_OMAP_SOC_RX51 |
| 28 | tristate "SoC Audio support for Nokia RX-51" | 28 | tristate "SoC Audio support for Nokia RX-51" |
| 29 | depends on SND_OMAP_SOC && ARCH_ARM && (MACH_NOKIA_RX51 || COMPILE_TEST) | 29 | depends on SND_OMAP_SOC && ARM && (MACH_NOKIA_RX51 || COMPILE_TEST) |
| 30 | select SND_OMAP_SOC_MCBSP | 30 | select SND_OMAP_SOC_MCBSP |
| 31 | select SND_SOC_TLV320AIC3X | 31 | select SND_SOC_TLV320AIC3X |
| 32 | select SND_SOC_TPA6130A2 | 32 | select SND_SOC_TPA6130A2 |
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 9cc6986a8cfb..5dd87f4c919e 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h | |||
| @@ -220,8 +220,8 @@ int rsnd_gen_path_exit(struct rsnd_priv *priv, | |||
| 220 | void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, | 220 | void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, |
| 221 | struct rsnd_mod *mod, | 221 | struct rsnd_mod *mod, |
| 222 | enum rsnd_reg reg); | 222 | enum rsnd_reg reg); |
| 223 | #define rsnd_is_gen1(s) ((s)->info->flags & RSND_GEN1) | 223 | #define rsnd_is_gen1(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1) |
| 224 | #define rsnd_is_gen2(s) ((s)->info->flags & RSND_GEN2) | 224 | #define rsnd_is_gen2(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2) |
| 225 | 225 | ||
| 226 | /* | 226 | /* |
| 227 | * R-Car ADG | 227 | * R-Car ADG |
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c index d0323a693ba2..999550bbad40 100644 --- a/sound/usb/usx2y/us122l.c +++ b/sound/usb/usx2y/us122l.c | |||
| @@ -262,7 +262,9 @@ static int usb_stream_hwdep_mmap(struct snd_hwdep *hw, | |||
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | area->vm_ops = &usb_stream_hwdep_vm_ops; | 264 | area->vm_ops = &usb_stream_hwdep_vm_ops; |
| 265 | area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; | 265 | area->vm_flags |= VM_DONTDUMP; |
| 266 | if (!read) | ||
| 267 | area->vm_flags |= VM_DONTEXPAND; | ||
| 266 | area->vm_private_data = us122l; | 268 | area->vm_private_data = us122l; |
| 267 | atomic_inc(&us122l->mmap_count); | 269 | atomic_inc(&us122l->mmap_count); |
| 268 | out: | 270 | out: |
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index 63fb5219f0f8..6234a51625b1 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c | |||
| @@ -299,19 +299,6 @@ static void usX2Y_error_urb_status(struct usX2Ydev *usX2Y, | |||
| 299 | usX2Y_clients_stop(usX2Y); | 299 | usX2Y_clients_stop(usX2Y); |
| 300 | } | 300 | } |
| 301 | 301 | ||
| 302 | static void usX2Y_error_sequence(struct usX2Ydev *usX2Y, | ||
| 303 | struct snd_usX2Y_substream *subs, struct urb *urb) | ||
| 304 | { | ||
| 305 | snd_printk(KERN_ERR | ||
| 306 | "Sequence Error!(hcd_frame=%i ep=%i%s;wait=%i,frame=%i).\n" | ||
| 307 | "Most probably some urb of usb-frame %i is still missing.\n" | ||
| 308 | "Cause could be too long delays in usb-hcd interrupt handling.\n", | ||
| 309 | usb_get_current_frame_number(usX2Y->dev), | ||
| 310 | subs->endpoint, usb_pipein(urb->pipe) ? "in" : "out", | ||
| 311 | usX2Y->wait_iso_frame, urb->start_frame, usX2Y->wait_iso_frame); | ||
| 312 | usX2Y_clients_stop(usX2Y); | ||
| 313 | } | ||
| 314 | |||
| 315 | static void i_usX2Y_urb_complete(struct urb *urb) | 302 | static void i_usX2Y_urb_complete(struct urb *urb) |
| 316 | { | 303 | { |
| 317 | struct snd_usX2Y_substream *subs = urb->context; | 304 | struct snd_usX2Y_substream *subs = urb->context; |
| @@ -328,12 +315,9 @@ static void i_usX2Y_urb_complete(struct urb *urb) | |||
| 328 | usX2Y_error_urb_status(usX2Y, subs, urb); | 315 | usX2Y_error_urb_status(usX2Y, subs, urb); |
| 329 | return; | 316 | return; |
| 330 | } | 317 | } |
| 331 | if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF))) | 318 | |
| 332 | subs->completed_urb = urb; | 319 | subs->completed_urb = urb; |
| 333 | else { | 320 | |
| 334 | usX2Y_error_sequence(usX2Y, subs, urb); | ||
| 335 | return; | ||
| 336 | } | ||
| 337 | { | 321 | { |
| 338 | struct snd_usX2Y_substream *capsubs = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE], | 322 | struct snd_usX2Y_substream *capsubs = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE], |
| 339 | *playbacksubs = usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK]; | 323 | *playbacksubs = usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK]; |
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c index f2a1acdc4d83..814d0e887c62 100644 --- a/sound/usb/usx2y/usx2yhwdeppcm.c +++ b/sound/usb/usx2y/usx2yhwdeppcm.c | |||
| @@ -244,13 +244,8 @@ static void i_usX2Y_usbpcm_urb_complete(struct urb *urb) | |||
| 244 | usX2Y_error_urb_status(usX2Y, subs, urb); | 244 | usX2Y_error_urb_status(usX2Y, subs, urb); |
| 245 | return; | 245 | return; |
| 246 | } | 246 | } |
| 247 | if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF))) | ||
| 248 | subs->completed_urb = urb; | ||
| 249 | else { | ||
| 250 | usX2Y_error_sequence(usX2Y, subs, urb); | ||
| 251 | return; | ||
| 252 | } | ||
| 253 | 247 | ||
| 248 | subs->completed_urb = urb; | ||
| 254 | capsubs = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE]; | 249 | capsubs = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE]; |
| 255 | capsubs2 = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE + 2]; | 250 | capsubs2 = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE + 2]; |
| 256 | playbacksubs = usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK]; | 251 | playbacksubs = usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK]; |
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 3a0ff7fb71b6..64c043b7a438 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
| @@ -770,6 +770,7 @@ check: $(OUTPUT)common-cmds.h | |||
| 770 | install-bin: all | 770 | install-bin: all |
| 771 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' | 771 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' |
| 772 | $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)' | 772 | $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)' |
| 773 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' | ||
| 773 | $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' | 774 | $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' |
| 774 | ifndef NO_LIBPERL | 775 | ifndef NO_LIBPERL |
| 775 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace' | 776 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace' |
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index f686d5ff594e..5098f144b92d 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c | |||
| @@ -457,6 +457,7 @@ static int __run_perf_stat(int argc, const char **argv) | |||
| 457 | perror("failed to prepare workload"); | 457 | perror("failed to prepare workload"); |
| 458 | return -1; | 458 | return -1; |
| 459 | } | 459 | } |
| 460 | child_pid = evsel_list->workload.pid; | ||
| 460 | } | 461 | } |
| 461 | 462 | ||
| 462 | if (group) | 463 | if (group) |
diff --git a/tools/perf/config/feature-tests.mak b/tools/perf/config/feature-tests.mak index d5a8dd44945f..f79305739ecc 100644 --- a/tools/perf/config/feature-tests.mak +++ b/tools/perf/config/feature-tests.mak | |||
| @@ -219,7 +219,7 @@ define SOURCE_LIBAUDIT | |||
| 219 | 219 | ||
| 220 | int main(void) | 220 | int main(void) |
| 221 | { | 221 | { |
| 222 | printf(\"error message: %s\n\", audit_errno_to_name(0)); | 222 | printf(\"error message: %s\", audit_errno_to_name(0)); |
| 223 | return audit_open(); | 223 | return audit_open(); |
| 224 | } | 224 | } |
| 225 | endef | 225 | endef |
diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c index e23bde19d590..7defd77105d0 100644 --- a/tools/perf/util/dwarf-aux.c +++ b/tools/perf/util/dwarf-aux.c | |||
| @@ -426,7 +426,7 @@ static int __die_search_func_cb(Dwarf_Die *fn_die, void *data) | |||
| 426 | * @die_mem: a buffer for result DIE | 426 | * @die_mem: a buffer for result DIE |
| 427 | * | 427 | * |
| 428 | * Search a non-inlined function DIE which includes @addr. Stores the | 428 | * Search a non-inlined function DIE which includes @addr. Stores the |
| 429 | * DIE to @die_mem and returns it if found. Returns NULl if failed. | 429 | * DIE to @die_mem and returns it if found. Returns NULL if failed. |
| 430 | */ | 430 | */ |
| 431 | Dwarf_Die *die_find_realfunc(Dwarf_Die *cu_die, Dwarf_Addr addr, | 431 | Dwarf_Die *die_find_realfunc(Dwarf_Die *cu_die, Dwarf_Addr addr, |
| 432 | Dwarf_Die *die_mem) | 432 | Dwarf_Die *die_mem) |
| @@ -454,15 +454,32 @@ static int __die_find_inline_cb(Dwarf_Die *die_mem, void *data) | |||
| 454 | } | 454 | } |
| 455 | 455 | ||
| 456 | /** | 456 | /** |
| 457 | * die_find_top_inlinefunc - Search the top inlined function at given address | ||
| 458 | * @sp_die: a subprogram DIE which including @addr | ||
| 459 | * @addr: target address | ||
| 460 | * @die_mem: a buffer for result DIE | ||
| 461 | * | ||
| 462 | * Search an inlined function DIE which includes @addr. Stores the | ||
| 463 | * DIE to @die_mem and returns it if found. Returns NULL if failed. | ||
| 464 | * Even if several inlined functions are expanded recursively, this | ||
| 465 | * doesn't trace it down, and returns the topmost one. | ||
| 466 | */ | ||
| 467 | Dwarf_Die *die_find_top_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr, | ||
| 468 | Dwarf_Die *die_mem) | ||
| 469 | { | ||
| 470 | return die_find_child(sp_die, __die_find_inline_cb, &addr, die_mem); | ||
| 471 | } | ||
| 472 | |||
| 473 | /** | ||
| 457 | * die_find_inlinefunc - Search an inlined function at given address | 474 | * die_find_inlinefunc - Search an inlined function at given address |
| 458 | * @cu_die: a CU DIE which including @addr | 475 | * @sp_die: a subprogram DIE which including @addr |
| 459 | * @addr: target address | 476 | * @addr: target address |
| 460 | * @die_mem: a buffer for result DIE | 477 | * @die_mem: a buffer for result DIE |
| 461 | * | 478 | * |
| 462 | * Search an inlined function DIE which includes @addr. Stores the | 479 | * Search an inlined function DIE which includes @addr. Stores the |
| 463 | * DIE to @die_mem and returns it if found. Returns NULl if failed. | 480 | * DIE to @die_mem and returns it if found. Returns NULL if failed. |
| 464 | * If several inlined functions are expanded recursively, this trace | 481 | * If several inlined functions are expanded recursively, this trace |
| 465 | * it and returns deepest one. | 482 | * it down and returns deepest one. |
| 466 | */ | 483 | */ |
| 467 | Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr, | 484 | Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr, |
| 468 | Dwarf_Die *die_mem) | 485 | Dwarf_Die *die_mem) |
diff --git a/tools/perf/util/dwarf-aux.h b/tools/perf/util/dwarf-aux.h index 8658d41697d2..b4fe90c6cb2d 100644 --- a/tools/perf/util/dwarf-aux.h +++ b/tools/perf/util/dwarf-aux.h | |||
| @@ -79,7 +79,11 @@ extern Dwarf_Die *die_find_child(Dwarf_Die *rt_die, | |||
| 79 | extern Dwarf_Die *die_find_realfunc(Dwarf_Die *cu_die, Dwarf_Addr addr, | 79 | extern Dwarf_Die *die_find_realfunc(Dwarf_Die *cu_die, Dwarf_Addr addr, |
| 80 | Dwarf_Die *die_mem); | 80 | Dwarf_Die *die_mem); |
| 81 | 81 | ||
| 82 | /* Search an inlined function including given address */ | 82 | /* Search the top inlined function including given address */ |
| 83 | extern Dwarf_Die *die_find_top_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr, | ||
| 84 | Dwarf_Die *die_mem); | ||
| 85 | |||
| 86 | /* Search the deepest inlined function including given address */ | ||
| 83 | extern Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr, | 87 | extern Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr, |
| 84 | Dwarf_Die *die_mem); | 88 | Dwarf_Die *die_mem); |
| 85 | 89 | ||
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 9b393e7dca6f..63df031fc9c7 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c | |||
| @@ -187,7 +187,7 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool, | |||
| 187 | return -1; | 187 | return -1; |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | event->header.type = PERF_RECORD_MMAP2; | 190 | event->header.type = PERF_RECORD_MMAP; |
| 191 | /* | 191 | /* |
| 192 | * Just like the kernel, see __perf_event_mmap in kernel/perf_event.c | 192 | * Just like the kernel, see __perf_event_mmap in kernel/perf_event.c |
| 193 | */ | 193 | */ |
| @@ -198,7 +198,6 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool, | |||
| 198 | char prot[5]; | 198 | char prot[5]; |
| 199 | char execname[PATH_MAX]; | 199 | char execname[PATH_MAX]; |
| 200 | char anonstr[] = "//anon"; | 200 | char anonstr[] = "//anon"; |
| 201 | unsigned int ino; | ||
| 202 | size_t size; | 201 | size_t size; |
| 203 | ssize_t n; | 202 | ssize_t n; |
| 204 | 203 | ||
| @@ -209,13 +208,10 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool, | |||
| 209 | strcpy(execname, ""); | 208 | strcpy(execname, ""); |
| 210 | 209 | ||
| 211 | /* 00400000-0040c000 r-xp 00000000 fd:01 41038 /bin/cat */ | 210 | /* 00400000-0040c000 r-xp 00000000 fd:01 41038 /bin/cat */ |
| 212 | n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %s\n", | 211 | n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %*x:%*x %*u %s\n", |
| 213 | &event->mmap2.start, &event->mmap2.len, prot, | 212 | &event->mmap.start, &event->mmap.len, prot, |
| 214 | &event->mmap2.pgoff, &event->mmap2.maj, | 213 | &event->mmap.pgoff, |
| 215 | &event->mmap2.min, | 214 | execname); |
| 216 | &ino, execname); | ||
| 217 | |||
| 218 | event->mmap2.ino = (u64)ino; | ||
| 219 | 215 | ||
| 220 | if (n != 8) | 216 | if (n != 8) |
| 221 | continue; | 217 | continue; |
| @@ -227,15 +223,15 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool, | |||
| 227 | strcpy(execname, anonstr); | 223 | strcpy(execname, anonstr); |
| 228 | 224 | ||
| 229 | size = strlen(execname) + 1; | 225 | size = strlen(execname) + 1; |
| 230 | memcpy(event->mmap2.filename, execname, size); | 226 | memcpy(event->mmap.filename, execname, size); |
| 231 | size = PERF_ALIGN(size, sizeof(u64)); | 227 | size = PERF_ALIGN(size, sizeof(u64)); |
| 232 | event->mmap2.len -= event->mmap.start; | 228 | event->mmap.len -= event->mmap.start; |
| 233 | event->mmap2.header.size = (sizeof(event->mmap2) - | 229 | event->mmap.header.size = (sizeof(event->mmap) - |
| 234 | (sizeof(event->mmap2.filename) - size)); | 230 | (sizeof(event->mmap.filename) - size)); |
| 235 | memset(event->mmap2.filename + size, 0, machine->id_hdr_size); | 231 | memset(event->mmap.filename + size, 0, machine->id_hdr_size); |
| 236 | event->mmap2.header.size += machine->id_hdr_size; | 232 | event->mmap.header.size += machine->id_hdr_size; |
| 237 | event->mmap2.pid = tgid; | 233 | event->mmap.pid = tgid; |
| 238 | event->mmap2.tid = pid; | 234 | event->mmap.tid = pid; |
| 239 | 235 | ||
| 240 | if (process(tool, event, &synth_sample, machine) != 0) { | 236 | if (process(tool, event, &synth_sample, machine) != 0) { |
| 241 | rc = -1; | 237 | rc = -1; |
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 0ce9febf1ba0..9f1ef9bee2d0 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c | |||
| @@ -678,7 +678,6 @@ void perf_evsel__config(struct perf_evsel *evsel, | |||
| 678 | attr->sample_type |= PERF_SAMPLE_WEIGHT; | 678 | attr->sample_type |= PERF_SAMPLE_WEIGHT; |
| 679 | 679 | ||
| 680 | attr->mmap = track; | 680 | attr->mmap = track; |
| 681 | attr->mmap2 = track && !perf_missing_features.mmap2; | ||
| 682 | attr->comm = track; | 681 | attr->comm = track; |
| 683 | 682 | ||
| 684 | /* | 683 | /* |
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index ce69901176d8..c3e5a3b817ab 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c | |||
| @@ -2768,6 +2768,18 @@ int perf_session__read_header(struct perf_session *session) | |||
| 2768 | if (perf_file_header__read(&f_header, header, fd) < 0) | 2768 | if (perf_file_header__read(&f_header, header, fd) < 0) |
| 2769 | return -EINVAL; | 2769 | return -EINVAL; |
| 2770 | 2770 | ||
| 2771 | /* | ||
| 2772 | * Sanity check that perf.data was written cleanly; data size is | ||
| 2773 | * initialized to 0 and updated only if the on_exit function is run. | ||
| 2774 | * If data size is still 0 then the file contains only partial | ||
| 2775 | * information. Just warn user and process it as much as it can. | ||
| 2776 | */ | ||
| 2777 | if (f_header.data.size == 0) { | ||
| 2778 | pr_warning("WARNING: The %s file's data size field is 0 which is unexpected.\n" | ||
| 2779 | "Was the 'perf record' command properly terminated?\n", | ||
| 2780 | session->filename); | ||
| 2781 | } | ||
| 2782 | |||
| 2771 | nr_attrs = f_header.attrs.size / f_header.attr_size; | 2783 | nr_attrs = f_header.attrs.size / f_header.attr_size; |
| 2772 | lseek(fd, f_header.attrs.offset, SEEK_SET); | 2784 | lseek(fd, f_header.attrs.offset, SEEK_SET); |
| 2773 | 2785 | ||
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index 371476cb8ddc..f0692737ebf1 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c | |||
| @@ -1327,8 +1327,8 @@ int debuginfo__find_probe_point(struct debuginfo *self, unsigned long addr, | |||
| 1327 | struct perf_probe_point *ppt) | 1327 | struct perf_probe_point *ppt) |
| 1328 | { | 1328 | { |
| 1329 | Dwarf_Die cudie, spdie, indie; | 1329 | Dwarf_Die cudie, spdie, indie; |
| 1330 | Dwarf_Addr _addr, baseaddr; | 1330 | Dwarf_Addr _addr = 0, baseaddr = 0; |
| 1331 | const char *fname = NULL, *func = NULL, *tmp; | 1331 | const char *fname = NULL, *func = NULL, *basefunc = NULL, *tmp; |
| 1332 | int baseline = 0, lineno = 0, ret = 0; | 1332 | int baseline = 0, lineno = 0, ret = 0; |
| 1333 | 1333 | ||
| 1334 | /* Adjust address with bias */ | 1334 | /* Adjust address with bias */ |
| @@ -1349,27 +1349,36 @@ int debuginfo__find_probe_point(struct debuginfo *self, unsigned long addr, | |||
| 1349 | /* Find a corresponding function (name, baseline and baseaddr) */ | 1349 | /* Find a corresponding function (name, baseline and baseaddr) */ |
| 1350 | if (die_find_realfunc(&cudie, (Dwarf_Addr)addr, &spdie)) { | 1350 | if (die_find_realfunc(&cudie, (Dwarf_Addr)addr, &spdie)) { |
| 1351 | /* Get function entry information */ | 1351 | /* Get function entry information */ |
| 1352 | tmp = dwarf_diename(&spdie); | 1352 | func = basefunc = dwarf_diename(&spdie); |
| 1353 | if (!tmp || | 1353 | if (!func || |
| 1354 | dwarf_entrypc(&spdie, &baseaddr) != 0 || | 1354 | dwarf_entrypc(&spdie, &baseaddr) != 0 || |
| 1355 | dwarf_decl_line(&spdie, &baseline) != 0) | 1355 | dwarf_decl_line(&spdie, &baseline) != 0) { |
| 1356 | lineno = 0; | ||
| 1356 | goto post; | 1357 | goto post; |
| 1357 | func = tmp; | 1358 | } |
| 1358 | 1359 | ||
| 1359 | if (addr == (unsigned long)baseaddr) | 1360 | fname = dwarf_decl_file(&spdie); |
| 1361 | if (addr == (unsigned long)baseaddr) { | ||
| 1360 | /* Function entry - Relative line number is 0 */ | 1362 | /* Function entry - Relative line number is 0 */ |
| 1361 | lineno = baseline; | 1363 | lineno = baseline; |
| 1362 | else if (die_find_inlinefunc(&spdie, (Dwarf_Addr)addr, | 1364 | goto post; |
| 1363 | &indie)) { | 1365 | } |
| 1366 | |||
| 1367 | /* Track down the inline functions step by step */ | ||
| 1368 | while (die_find_top_inlinefunc(&spdie, (Dwarf_Addr)addr, | ||
| 1369 | &indie)) { | ||
| 1370 | /* There is an inline function */ | ||
| 1364 | if (dwarf_entrypc(&indie, &_addr) == 0 && | 1371 | if (dwarf_entrypc(&indie, &_addr) == 0 && |
| 1365 | _addr == addr) | 1372 | _addr == addr) { |
| 1366 | /* | 1373 | /* |
| 1367 | * addr is at an inline function entry. | 1374 | * addr is at an inline function entry. |
| 1368 | * In this case, lineno should be the call-site | 1375 | * In this case, lineno should be the call-site |
| 1369 | * line number. | 1376 | * line number. (overwrite lineinfo) |
| 1370 | */ | 1377 | */ |
| 1371 | lineno = die_get_call_lineno(&indie); | 1378 | lineno = die_get_call_lineno(&indie); |
| 1372 | else { | 1379 | fname = die_get_call_file(&indie); |
| 1380 | break; | ||
| 1381 | } else { | ||
| 1373 | /* | 1382 | /* |
| 1374 | * addr is in an inline function body. | 1383 | * addr is in an inline function body. |
| 1375 | * Since lineno points one of the lines | 1384 | * Since lineno points one of the lines |
| @@ -1377,19 +1386,27 @@ int debuginfo__find_probe_point(struct debuginfo *self, unsigned long addr, | |||
| 1377 | * be the entry line of the inline function. | 1386 | * be the entry line of the inline function. |
| 1378 | */ | 1387 | */ |
| 1379 | tmp = dwarf_diename(&indie); | 1388 | tmp = dwarf_diename(&indie); |
| 1380 | if (tmp && | 1389 | if (!tmp || |
| 1381 | dwarf_decl_line(&spdie, &baseline) == 0) | 1390 | dwarf_decl_line(&indie, &baseline) != 0) |
| 1382 | func = tmp; | 1391 | break; |
| 1392 | func = tmp; | ||
| 1393 | spdie = indie; | ||
| 1383 | } | 1394 | } |
| 1384 | } | 1395 | } |
| 1396 | /* Verify the lineno and baseline are in a same file */ | ||
| 1397 | tmp = dwarf_decl_file(&spdie); | ||
| 1398 | if (!tmp || strcmp(tmp, fname) != 0) | ||
| 1399 | lineno = 0; | ||
| 1385 | } | 1400 | } |
| 1386 | 1401 | ||
| 1387 | post: | 1402 | post: |
| 1388 | /* Make a relative line number or an offset */ | 1403 | /* Make a relative line number or an offset */ |
| 1389 | if (lineno) | 1404 | if (lineno) |
| 1390 | ppt->line = lineno - baseline; | 1405 | ppt->line = lineno - baseline; |
| 1391 | else if (func) | 1406 | else if (basefunc) { |
| 1392 | ppt->offset = addr - (unsigned long)baseaddr; | 1407 | ppt->offset = addr - (unsigned long)baseaddr; |
| 1408 | func = basefunc; | ||
| 1409 | } | ||
| 1393 | 1410 | ||
| 1394 | /* Duplicate strings */ | 1411 | /* Duplicate strings */ |
| 1395 | if (func) { | 1412 | if (func) { |
diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c index a85e4ae5f3ac..c0c9795c4f02 100644 --- a/tools/perf/util/scripting-engines/trace-event-perl.c +++ b/tools/perf/util/scripting-engines/trace-event-perl.c | |||
| @@ -282,7 +282,7 @@ static void perl_process_tracepoint(union perf_event *perf_event __maybe_unused, | |||
| 282 | 282 | ||
| 283 | event = find_cache_event(evsel); | 283 | event = find_cache_event(evsel); |
| 284 | if (!event) | 284 | if (!event) |
| 285 | die("ug! no event found for type %" PRIu64, evsel->attr.config); | 285 | die("ug! no event found for type %" PRIu64, (u64)evsel->attr.config); |
| 286 | 286 | ||
| 287 | pid = raw_field_value(event, "common_pid", data); | 287 | pid = raw_field_value(event, "common_pid", data); |
| 288 | 288 | ||
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 70ffa41518f3..568b750c01f6 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c | |||
| @@ -256,6 +256,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool) | |||
| 256 | tool->sample = process_event_sample_stub; | 256 | tool->sample = process_event_sample_stub; |
| 257 | if (tool->mmap == NULL) | 257 | if (tool->mmap == NULL) |
| 258 | tool->mmap = process_event_stub; | 258 | tool->mmap = process_event_stub; |
| 259 | if (tool->mmap2 == NULL) | ||
| 260 | tool->mmap2 = process_event_stub; | ||
| 259 | if (tool->comm == NULL) | 261 | if (tool->comm == NULL) |
| 260 | tool->comm = process_event_stub; | 262 | tool->comm = process_event_stub; |
| 261 | if (tool->fork == NULL) | 263 | if (tool->fork == NULL) |
| @@ -1310,7 +1312,7 @@ int __perf_session__process_events(struct perf_session *session, | |||
| 1310 | file_offset = page_offset; | 1312 | file_offset = page_offset; |
| 1311 | head = data_offset - page_offset; | 1313 | head = data_offset - page_offset; |
| 1312 | 1314 | ||
| 1313 | if (data_offset + data_size < file_size) | 1315 | if (data_size && (data_offset + data_size < file_size)) |
| 1314 | file_size = data_offset + data_size; | 1316 | file_size = data_offset + data_size; |
| 1315 | 1317 | ||
| 1316 | progress_next = file_size / 16; | 1318 | progress_next = file_size / 16; |
diff --git a/tools/testing/selftests/timers/posix_timers.c b/tools/testing/selftests/timers/posix_timers.c index 4fa655d68a81..41bd85559d4b 100644 --- a/tools/testing/selftests/timers/posix_timers.c +++ b/tools/testing/selftests/timers/posix_timers.c | |||
| @@ -151,7 +151,7 @@ static int check_timer_create(int which) | |||
| 151 | fflush(stdout); | 151 | fflush(stdout); |
| 152 | 152 | ||
| 153 | done = 0; | 153 | done = 0; |
| 154 | timer_create(which, NULL, &id); | 154 | err = timer_create(which, NULL, &id); |
| 155 | if (err < 0) { | 155 | if (err < 0) { |
| 156 | perror("Can't create timer\n"); | 156 | perror("Can't create timer\n"); |
| 157 | return -1; | 157 | return -1; |