From ac2ccc0bdf7778780313b919ae6ff261f067b7a8 Mon Sep 17 00:00:00 2001 From: jmcmullan Date: Tue, 10 Dec 2013 04:04:04 +0000 Subject: [PATCH] ahci.device: Some debugging cleanups Signed-off-by: Jason S. McMullan git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@48559 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- rom/devs/ahci/ahci_aros.h | 7 +++++++ rom/devs/ahci/ahci_aros_bus.c | 10 +++++----- rom/devs/ahci/ahci_init.c | 2 -- rom/devs/ahci/ahci_io.c | 6 +++--- rom/devs/ahci/ahci_scsi.c | 1 + rom/devs/ahci/mmakefile.src | 4 ++++ rom/devs/ahci/timer.c | 1 - 7 files changed, 20 insertions(+), 11 deletions(-) diff --git a/rom/devs/ahci/ahci_aros.h b/rom/devs/ahci/ahci_aros.h index c253a7d34b..23990d8ab5 100644 --- a/rom/devs/ahci/ahci_aros.h +++ b/rom/devs/ahci/ahci_aros.h @@ -18,6 +18,13 @@ #include +#undef D2 +#if DEBUG > 1 +#define D2(x) x +#else +#define D2(x) +#endif + #include #include diff --git a/rom/devs/ahci/ahci_aros_bus.c b/rom/devs/ahci/ahci_aros_bus.c index a8978a2340..ec4cbff1a9 100644 --- a/rom/devs/ahci/ahci_aros_bus.c +++ b/rom/devs/ahci/ahci_aros_bus.c @@ -33,7 +33,7 @@ int bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, bus_size_t bo { bus_dma_tag_t tag; - D(bug("%s: Allocating tag, %d objects of size %d, aligned by %d\n", __func__, nsegments, maxsegsz, alignment)); + D2(bug("%s: Allocating tag, %d objects of size %d, aligned by %d\n", __func__, nsegments, maxsegsz, alignment)); if (nsegments > BUS_DMA_MAX_SEGMENTS) { D(bug("%s: Too many segments, max is %d\n", __func__, BUS_DMA_MAX_SEGMENTS)); @@ -53,7 +53,7 @@ int bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, bus_size_t bo TAILQ_INIT(&tag->dt_slabs); - D(bug("%s: %p: Tag created\n", __func__, tag)); + D2(bug("%s: %p: Tag created\n", __func__, tag)); (*dmat) = tag; return 0; @@ -94,7 +94,7 @@ static struct bus_dma_tag_slab *bus_dmamem_alloc_slab(bus_dma_tag_t tag) } slab->sl_segment = (APTR)(((IPTR)slab->sl_memory + boundary - 4) & ~(boundary-1)); - D(bug("%s: %p: Memory %p, %dx%d segments at %p\n", __func__, tag, slab->sl_memory, tag->dt_nsegments, tag->dt_maxsegsz, slab->sl_segment)); + D2(bug("%s: %p: Memory %p, %dx%d segments at %p\n", __func__, tag, slab->sl_memory, tag->dt_nsegments, tag->dt_maxsegsz, slab->sl_segment)); slab->sl_segfree = tag->dt_nsegments; @@ -122,7 +122,7 @@ int bus_dmamem_alloc(bus_dma_tag_t tag, void **vaddr, unsigned flags, bus_dmamap } } - D(bug("%s: %p: Slab %p 0x%08llx\n", __func__, tag, slab, slab->sl_segmap)); + D2(bug("%s: %p: Slab %p 0x%08llx\n", __func__, tag, slab, slab->sl_segmap)); for (i = 0; i < tag->dt_nsegments; i++ ) { if ((slab->sl_segmap & (1 << i)) == 0) { slab->sl_segmap |= (1 << i); @@ -135,7 +135,7 @@ int bus_dmamem_alloc(bus_dma_tag_t tag, void **vaddr, unsigned flags, bus_dmamap if (flags & MEMF_CLEAR) memset(addr, 0, tag->dt_segsize); - D(bug("%s: %p: Allocated slot %d, %p: size %d\n", __func__, tag, i, addr, tag->dt_maxsegsz)); + D2(bug("%s: %p: Allocated slot %d, %p: size %d\n", __func__, tag, i, addr, tag->dt_maxsegsz)); if (vaddr) *vaddr = addr; diff --git a/rom/devs/ahci/ahci_init.c b/rom/devs/ahci/ahci_init.c index 74f3430697..cb5b1aee13 100644 --- a/rom/devs/ahci/ahci_init.c +++ b/rom/devs/ahci/ahci_init.c @@ -9,8 +9,6 @@ /* Maintainer: Jason S. McMullan */ -#define DEBUG 0 - #include #include #include diff --git a/rom/devs/ahci/ahci_io.c b/rom/devs/ahci/ahci_io.c index af984b7714..6341eaed9c 100644 --- a/rom/devs/ahci/ahci_io.c +++ b/rom/devs/ahci/ahci_io.c @@ -9,8 +9,6 @@ /* Maintainer: Jason S. McMullan */ -#define DEBUG 0 - #include #include #include @@ -84,6 +82,7 @@ static BOOL ahci_sector_rw(struct IORequest *io, UQUAD off64, BOOL is_write) return TRUE; } if ((len & bmask) || len == 0) { + D(bug("[AHCI%02ld] IO %p Fault, io_Flags = %d, io_Command = %d, IOERR_BADLENGTH (len=0x%x, bmask=0x%x)\n", unit->sim_Unit, io, io->io_Flags, io->io_Command, len, bmask)); io->io_Error = IOERR_BADLENGTH; return TRUE; } @@ -342,6 +341,7 @@ bad_cmd: done = TRUE; break; bad_length: + D(bug("[AHCI%02ld] IO %p Fault, io_Flags = %d, io_Command = %d, IOERR_BADLENGTH (len = %d)\n", unit->sim_Unit, io, io->io_Flags, io->io_Command, len)); io->io_Error = IOERR_BADLENGTH; done = TRUE; break; @@ -365,7 +365,7 @@ bad_address: ReplyMsg(&io->io_Message); if (done) - D(bug("[AHCI%02ld] IO %p Quick, io_Flags = %d, io_Error = %d\n", unit->sim_Unit, io, io->io_Flags, io->io_Error)); + D(bug("[AHCI%02ld] IO %p Quick, io_Flags = %d, io_Comand = %d, io_Error = %d\n", unit->sim_Unit, io, io->io_Flags, io->io_Command, io->io_Error)); AROS_LIBFUNC_EXIT } diff --git a/rom/devs/ahci/ahci_scsi.c b/rom/devs/ahci/ahci_scsi.c index 968571a67f..7380475d0d 100644 --- a/rom/devs/ahci/ahci_scsi.c +++ b/rom/devs/ahci/ahci_scsi.c @@ -252,6 +252,7 @@ static void ahci_io_complete(struct ata_xfer *xa) ASSERT(!(io->io_Flags & IOF_QUICK)); D(bug("[AHCI%02ld] IO %p Final, io_Flags = %d, io_Error = %d\n", unit->sim_Unit, io, io->io_Flags, io->io_Error)); + ReplyMsg(&io->io_Message); } diff --git a/rom/devs/ahci/mmakefile.src b/rom/devs/ahci/mmakefile.src index 42999c5d62..3e4b270fd6 100644 --- a/rom/devs/ahci/mmakefile.src +++ b/rom/devs/ahci/mmakefile.src @@ -18,6 +18,10 @@ FILES = ahci_init \ USER_CFLAGS += -D__BSD_VISIBLE # Enable coalescing #USER_CFLAGS += -DAHCI_COALESCE +# Enable ACHI debugging +#USER_CFLAGS += -DAHCI_DEBUG +# Enable AROS debugging +#USER_CFLAGS += -DDEBUG=1 %build_module mmake=kernel-ahci \ modname=ahci modtype=device \ diff --git a/rom/devs/ahci/timer.c b/rom/devs/ahci/timer.c index 7989690b83..74494af107 100644 --- a/rom/devs/ahci/timer.c +++ b/rom/devs/ahci/timer.c @@ -13,7 +13,6 @@ * 2005-03-05 T. Wiszkowski created file; initial benchmarked nanowait and timer-based micro/sec wait */ -#define DEBUG 0 #include #include #include -- 2.11.4.GIT