Commit 21ddff5c authored by David S. Miller's avatar David S. Miller

Merge branch 'net-ipa-small-improvements'

Alex Elder says:

====================
net: ipa: small improvements

This series contains two patches that improve the error output
that's reported when an error occurs while changing the state of a
GSI channel or event ring.  The first ensures all such error
conditions report an error, and the second simplifies the messages a
little and ensures they are all consistent.

A third (independent) patch gets rid of an unused symbol in the
microcontroller code.

Version 2 fixes two alignment problems pointed out by checkpatch.pl,
as requested by Jakub Kicinski.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6f6746d7 722208ea
This diff is collapsed.
...@@ -35,12 +35,6 @@ ...@@ -35,12 +35,6 @@
*/ */
/* Supports hardware interface version 0x2000 */ /* Supports hardware interface version 0x2000 */
/* Offset relative to the base of the IPA shared address space of the
* shared region used for communication with the microcontroller. The
* region is 128 bytes in size, but only the first 40 bytes are used.
*/
#define IPA_MEM_UC_OFFSET 0x0000
/* Delay to allow a the microcontroller to save state when crashing */ /* Delay to allow a the microcontroller to save state when crashing */
#define IPA_SEND_DELAY 100 /* microseconds */ #define IPA_SEND_DELAY 100 /* microseconds */
...@@ -60,6 +54,10 @@ ...@@ -60,6 +54,10 @@
* @hw_state: state of hardware (including error type information) * @hw_state: state of hardware (including error type information)
* @warning_counter: counter of non-fatal hardware errors * @warning_counter: counter of non-fatal hardware errors
* @interface_version: hardware-reported interface version * @interface_version: hardware-reported interface version
*
* A shared memory area at the base of IPA resident memory is used for
* communication with the microcontroller. The region is 128 bytes in
* size, but only the first 40 bytes (structured this way) are used.
*/ */
struct ipa_uc_mem_area { struct ipa_uc_mem_area {
u8 command; /* enum ipa_uc_command */ u8 command; /* enum ipa_uc_command */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment