| Message ID | 1439862430-14996-3-git-send-email-gwshan@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Aug 18, 2015 at 01:26:39PM +0100, Peter Maydell wrote: > On 18 August 2015 at 02:47, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: > > The header file was introduced by following Linux upstream commits: > > > > commit ed3e81f ("powerpc/eeh: Move PE state constants around") > > commit ec33d36 ("powerpc/eeh: Introduce eeh_pe_inject_err()") > > > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > > --- > > I didn't include all changes from scripts/update-linux-headers.sh > > as too many unrelated changes introduced by the script. > > Please just have a commit which does a "sync linux headers > from kernel version $WHATEVER". The whole point of the script > is to keep our headers completely synchronized with the kernel. > > (The only exception to this is RFC patchsets where the kernel > header changes haven't yet hit mainline.) Seconded. Please include the SHA ID of the upstream kernel you updated from in your commit message, too.
On Tue, Aug 18, 2015 at 03:53:25PM -0700, David Gibson wrote: >On Tue, Aug 18, 2015 at 01:26:39PM +0100, Peter Maydell wrote: >> On 18 August 2015 at 02:47, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: >> > The header file was introduced by following Linux upstream commits: >> > >> > commit ed3e81f ("powerpc/eeh: Move PE state constants around") >> > commit ec33d36 ("powerpc/eeh: Introduce eeh_pe_inject_err()") >> > >> > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >> > --- >> > I didn't include all changes from scripts/update-linux-headers.sh >> > as too many unrelated changes introduced by the script. >> >> Please just have a commit which does a "sync linux headers >> from kernel version $WHATEVER". The whole point of the script >> is to keep our headers completely synchronized with the kernel. >> >> (The only exception to this is RFC patchsets where the kernel >> header changes haven't yet hit mainline.) > >Seconded. Please include the SHA ID of the upstream kernel you >updated from in your commit message, too. > Ok. I'll do. Thanks! >-- >David Gibson | I'll have my music baroque, and my code >david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ > | _way_ _around_! >http://www.ozlabs.org/~dgibson
On 18 August 2015 at 23:53, David Gibson <david@gibson.dropbear.id.au> wrote: > On Tue, Aug 18, 2015 at 01:26:39PM +0100, Peter Maydell wrote: >> Please just have a commit which does a "sync linux headers >> from kernel version $WHATEVER". The whole point of the script >> is to keep our headers completely synchronized with the kernel. >> >> (The only exception to this is RFC patchsets where the kernel >> header changes haven't yet hit mainline.) > > Seconded. Please include the SHA ID of the upstream kernel you > updated from in your commit message, too. Maybe we should enhance the script to have an option for "and create the git commit with appropriate commit message after updating the headers" :-) -- PMM
On Wed, Aug 19, 2015 at 12:46:26AM +0100, Peter Maydell wrote: > On 18 August 2015 at 23:53, David Gibson <david@gibson.dropbear.id.au> wrote: > > On Tue, Aug 18, 2015 at 01:26:39PM +0100, Peter Maydell wrote: > >> Please just have a commit which does a "sync linux headers > >> from kernel version $WHATEVER". The whole point of the script > >> is to keep our headers completely synchronized with the kernel. > >> > >> (The only exception to this is RFC patchsets where the kernel > >> header changes haven't yet hit mainline.) > > > > Seconded. Please include the SHA ID of the upstream kernel you > > updated from in your commit message, too. > > Maybe we should enhance the script to have an option for > "and create the git commit with appropriate commit message > after updating the headers" :-) That would be nice.
diff --git a/linux-headers/asm-powerpc/eeh.h b/linux-headers/asm-powerpc/eeh.h new file mode 100644 index 0000000..291b7d1 --- /dev/null +++ b/linux-headers/asm-powerpc/eeh.h @@ -0,0 +1,56 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Copyright IBM Corp. 2015 + * + * Authors: Gavin Shan <gwshan@linux.vnet.ibm.com> + */ + +#ifndef _ASM_POWERPC_EEH_H +#define _ASM_POWERPC_EEH_H + +/* PE states */ +#define EEH_PE_STATE_NORMAL 0 /* Normal state */ +#define EEH_PE_STATE_RESET 1 /* PE reset asserted */ +#define EEH_PE_STATE_STOPPED_IO_DMA 2 /* Frozen PE */ +#define EEH_PE_STATE_STOPPED_DMA 4 /* Stopped DMA only */ +#define EEH_PE_STATE_UNAVAIL 5 /* Unavailable */ + +/* EEH error types and functions */ +#define EEH_ERR_TYPE_32 0 /* 32-bits error */ +#define EEH_ERR_TYPE_64 1 /* 64-bits error */ +#define EEH_ERR_FUNC_MIN 0 +#define EEH_ERR_FUNC_LD_MEM_ADDR 0 /* Memory load */ +#define EEH_ERR_FUNC_LD_MEM_DATA 1 +#define EEH_ERR_FUNC_LD_IO_ADDR 2 /* IO load */ +#define EEH_ERR_FUNC_LD_IO_DATA 3 +#define EEH_ERR_FUNC_LD_CFG_ADDR 4 /* Config load */ +#define EEH_ERR_FUNC_LD_CFG_DATA 5 +#define EEH_ERR_FUNC_ST_MEM_ADDR 6 /* Memory store */ +#define EEH_ERR_FUNC_ST_MEM_DATA 7 +#define EEH_ERR_FUNC_ST_IO_ADDR 8 /* IO store */ +#define EEH_ERR_FUNC_ST_IO_DATA 9 +#define EEH_ERR_FUNC_ST_CFG_ADDR 10 /* Config store */ +#define EEH_ERR_FUNC_ST_CFG_DATA 11 +#define EEH_ERR_FUNC_DMA_RD_ADDR 12 /* DMA read */ +#define EEH_ERR_FUNC_DMA_RD_DATA 13 +#define EEH_ERR_FUNC_DMA_RD_MASTER 14 +#define EEH_ERR_FUNC_DMA_RD_TARGET 15 +#define EEH_ERR_FUNC_DMA_WR_ADDR 16 /* DMA write */ +#define EEH_ERR_FUNC_DMA_WR_DATA 17 +#define EEH_ERR_FUNC_DMA_WR_MASTER 18 +#define EEH_ERR_FUNC_DMA_WR_TARGET 19 +#define EEH_ERR_FUNC_MAX 19 + +#endif /* _ASM_POWERPC_EEH_H */
The header file was introduced by following Linux upstream commits: commit ed3e81f ("powerpc/eeh: Move PE state constants around") commit ec33d36 ("powerpc/eeh: Introduce eeh_pe_inject_err()") Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- I didn't include all changes from scripts/update-linux-headers.sh as too many unrelated changes introduced by the script. --- linux-headers/asm-powerpc/eeh.h | 56 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 linux-headers/asm-powerpc/eeh.h