On Tue, Jun 20, 2017 at 01:44:25PM +0530, Anshuman Khandual wrote: > On 06/17/2017 09:22 AM, Ram Pai wrote: > > Replace the magic number used to check for DSI exception > > with a meaningful value. > > > > Signed-off-by: Ram Pai <linux...@us.ibm.com> > > --- > > arch/powerpc/include/asm/reg.h | 9 ++++++++- > > arch/powerpc/kernel/exceptions-64s.S | 2 +- > > 2 files changed, 9 insertions(+), 2 deletions(-) > > > > diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h > > index 7e50e47..2dcb8a1 100644 > > --- a/arch/powerpc/include/asm/reg.h > > +++ b/arch/powerpc/include/asm/reg.h > > @@ -272,16 +272,23 @@ > > #define SPRN_DAR 0x013 /* Data Address Register */ > > #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ > > #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ > > +#define DSISR_BIT32 0x80000000 /* not defined */ > > #define DSISR_NOHPTE 0x40000000 /* no translation found > > */ > > +#define DSISR_PAGEATTR_CONFLT 0x20000000 /* page attribute > > conflict */ > > +#define DSISR_BIT35 0x10000000 /* not defined */ > > #define DSISR_PROTFAULT 0x08000000 /* protection fault */ > > #define DSISR_BADACCESS 0x04000000 /* bad access to CI or G */ > > #define DSISR_ISSTORE 0x02000000 /* access was a store */ > > #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ > > -#define DSISR_NOSEGMENT 0x00200000 /* SLB miss */ > > #define DSISR_KEYFAULT 0x00200000 /* Key fault */ > > +#define DSISR_BIT43 0x00100000 /* not defined */ > > #define DSISR_UNSUPP_MMU 0x00080000 /* Unsupported MMU config */ > > #define DSISR_SET_RC 0x00040000 /* Failed setting of > > R/C bits */ > > #define DSISR_PGDIRFAULT 0x00020000 /* Fault on page directory > > */ > > +#define DSISR_PAGE_FAULT_MASK (DSISR_BIT32 | \ > > + DSISR_PAGEATTR_CONFLT | \ > > + DSISR_BADACCESS | \ > > + DSISR_BIT43) > > Sorry missed this one. Seems like there are couple of unnecessary > line additions in the subsequent patch which adds the new PKEY > reason code. > > -#define DSISR_PAGE_FAULT_MASK (DSISR_BIT32 | \ > - DSISR_PAGEATTR_CONFLT | \ > - DSISR_BADACCESS | \ > +#define DSISR_PAGE_FAULT_MASK (DSISR_BIT32 | \ > + DSISR_PAGEATTR_CONFLT | \ > + DSISR_BADACCESS | \ > + DSISR_KEYFAULT | \ > DSISR_BIT43)
i like to see them separately, one per line. But than you are right. that is not the convention in this file. So will change it accordingly. thanks, RP > > -- Ram Pai
