Further RiscPC updates
Russell King - ARM Linux admin
maintainercover Further RiscPC updates
Following on from the previous series, here are some further RiscPC updates:
MAINTAINERS | 2 +-
arch/arm/Kconfig | 1 +
arch/arm/lib/Makefile | 1 -
arch/arm/mach-rpc/Makefile | 3 +-
arch/arm/{lib/ecard.S => mach-rpc/ecard-loader.S} | 0
arch/arm/mach-rpc/ecard.c | 21 +++-
arch/arm/{lib => mach-rpc}/floppydma.S | 0
arch/arm/mach-rpc/include/mach/uncompress.h | 23 ++--
arch/arm/{lib => mach-rpc}/io-acorn.S | 0
arch/arm/mach-rpc/irq.c | 133 ++++++++--------------
10 files changed, 78 insertions(+), 106 deletions(-)
rename arch/arm/{lib/ecard.S => mach-rpc/ecard-loader.S} (100%)
rename arch/arm/{lib => mach-rpc}/floppydma.S (100%)
rename arch/arm/{lib => mach-rpc}/io-acorn.S (100%)Signature · 8 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/5 ARM: riscpc: add ecard quirk for Atomwide 3port serial card
Atomwide 3port serial cards seem to leave their interrupts active when exiting RISC OS, resulting in an interrupt storm during boot, and the expansion card interrupt being disabled. Avoid this by manually disabling the interrupt on each serial port via a custom quirk function.
--- arch/arm/mach-rpc/ecard.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
arch/arm/mach-rpc/ecard.c +19 -2
@@ -70,17 +70,21 @@ struct expcard_blacklist {unsigned short manufacturer;unsigned short product;const char *type; +void (*init)(ecard_t *ec); };static ecard_t *cards;static ecard_t *slot_to_expcard[MAX_ECARDS ];static unsigned int ectcr; +static void atomwide_3p_quirk (ecard_t *ec); +/* List of descriptions of cards which don't have an extended * identification, or chunk directories containing a description. */ static struct expcard_blacklist __initdata blacklist[] = { - {MANU_ACORN ,PROD_ACORN_ETHER1 ,"Acorn Ether1" } + {MANU_ACORN ,PROD_ACORN_ETHER1 ,"Acorn Ether1" }, + {MANU_ATOMWIDE ,PROD_ATOMWIDE_3PSERIAL ,NULL , atomwide_3p_quirk }, };asmlinkage extern int
@@ -871,6 +875,16 @@ void __iomem *ecardm_iomap(struct expansion_card *ec, unsigned int res, }EXPORT_SYMBOL (ecardm_iomap); +static void atomwide_3p_quirk (ecard_t *ec) +{ +void __iomem *addr =__ecard_address (ec,ECARD_IOC ,ECARD_SYNC ); +unsigned int i; + +/* Disable interrupts on each port */ +for (i =0x2000 ; i <=0x2800 ; i +=0x0400 ) +writeb (0 , addr + i +4 ); +} +/* * Probe for an expansion card. *
@@ -927,7 +941,10 @@ static int __init ecard_probe(int slot, unsigned irq, card_type_t type)for (i =0 ; i <ARRAY_SIZE (blacklist); i++)if (blacklist[i].manufacturer == ec->cid.manufacturer && blacklist[i].product == ec->cid.product) { - ec->card_desc = blacklist[i].type; +if (blacklist[i].type) + ec->card_desc = blacklist[i].type; +if (blacklist[i].init) + blacklist[i].init (ec);break ; }
Signature · 7 lines
2.7.4 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 2/5 ARM: riscpc: parse video information from tagged list
In reply to Russell King - ARM Linux adminCorrectly parse the video information from the tagged list, so that we end up with the right bytes-per-char values. When booting with a tagged list rather than a param block, this allows the decompressor to display its messages during boot on the screen.
(Boot loaders normally pass a param block on this platform, but the latest boot loader version recently released does not.)
--- arch/arm/mach-rpc/include/mach/uncompress.h | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)
arch/arm/mach-rpc/include/mach/uncompress.h +8 -15
@@ -118,29 +118,22 @@ static void arch_decomp_setup(void)struct tag *t = (struct tag *)params;unsigned int nr_pages =0 , page_size =PAGE_SIZE ; -if (t->hdr.tag ==ATAG_CORE ) - { -for (; t->hdr.size; t =tag_next (t)) - { -if (t->hdr.tag ==ATAG_VIDEOTEXT ) - { +if (t->hdr.tag ==ATAG_CORE ) { +for (; t->hdr.size; t =tag_next (t)) { +if (t->hdr.tag ==ATAG_VIDEOTEXT ) { video_num_rows = t->u.videotext.video_lines; video_num_cols = t->u.videotext.video_cols; - bytes_per_char_h = t->u.videotext.video_points; - bytes_per_char_v = t->u.videotext.video_points; video_x = t->u.videotext.x; video_y = t->u.videotext.y; - } - -if (t->hdr.tag ==ATAG_MEM ) - { + }else if (t->hdr.tag ==ATAG_VIDEOLFB ) { + bytes_per_char_h = t->u.videolfb.lfb_depth; + bytes_per_char_v =8 ; + }else if (t->hdr.tag ==ATAG_MEM ) { page_size =PAGE_SIZE ; nr_pages += (t->u.mem.size /PAGE_SIZE ); } } - } -else - { + }else { nr_pages = params->nr_pages; page_size = params->page_size; video_num_rows = params->video_num_rows;
Signature · 7 lines
2.7.4 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 3/5 ARM: riscpc: move RiscPC assembly files from arch/arm/lib to mach-rpc
In reply to Russell King - ARM Linux adminMove the assembly files for RiscPC from arch/arm/lib to mach-rpc so that we contain RiscPC bits in one subdirectory.
---
MAINTAINERS | 2 +-
arch/arm/lib/Makefile | 1 -
arch/arm/mach-rpc/Makefile | 3 ++-
arch/arm/{lib/ecard.S => mach-rpc/ecard-loader.S} | 0
arch/arm/{lib => mach-rpc}/floppydma.S | 0
arch/arm/{lib => mach-rpc}/io-acorn.S | 0
6 files changed, 3 insertions(+), 3 deletions(-)
rename arch/arm/{lib/ecard.S => mach-rpc/ecard-loader.S} (100%)
rename arch/arm/{lib => mach-rpc}/floppydma.S (100%)
rename arch/arm/{lib => mach-rpc}/io-acorn.S (100%)MAINTAINERS +1 -1
@@ -1183,7 +1183,7 @@ F: Documentation/gpu/afbc.rst ARM MFM AND FLOPPY DRIVERS M: Ian Molton <[email protected]> S: Maintained -F: arch/arm/lib/floppydma.S +F: arch/arm/mach-rpc/floppydma.S F: arch/arm/include/asm/floppy.h ARM PMU PROFILING AND DEBUGGING
arch/arm/lib/Makefile +0 -1
@@ -31,7 +31,6 @@ else endif ifeq ($(CONFIG_ARCH_RPC),y) - lib-y += ecard.o io-acorn.o floppydma.o AFLAGS_delay-loop.o += -march=armv4 endif
arch/arm/mach-rpc/Makefile +2 -1
@@ -4,4 +4,5 @@ # Object file lists. -obj-y := dma.o ecard.o fiq.o irq.o riscpc.o time.o +obj-y :=dma.o ecard.o ecard-loader.o fiq.o floppydma.o io-acorn.o irq.o \ + riscpc.o time.o
arch/arm/mach-rpc/ecard-loader.S renamed from arch/arm/lib/ecard.S +0 -0
arch/arm/mach-rpc/floppydma.S renamed from arch/arm/lib/floppydma.S +0 -0
arch/arm/mach-rpc/io-acorn.S renamed from arch/arm/lib/io-acorn.S +0 -0
Signature · 7 lines
2.7.4 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 4/5 ARM: riscpc: reduce IRQ handling code
In reply to Russell King - ARM Linux adminReduce the amount of IRQ handling code that RiscPC requires; there's no need for this duplication if we place the virtual iomem base address for each bank directly in the irq_data structure. Provide helpers to get the base address, and setup the base address and register mask.
--- arch/arm/mach-rpc/irq.c | 133 +++++++++++++++++------------------------------- 1 file changed, 47 insertions(+), 86 deletions(-)
arch/arm/mach-rpc/irq.c +47 -86
@@ -8,110 +8,64 @@#include <asm/irq.h> #include <asm/fiq.h> -static void iomd_ack_irq_a (struct irq_data *d) -{ -unsigned int val, mask; - - mask =1 << d->irq; - val =iomd_readb (IOMD_IRQMASKA ); -iomd_writeb (val & ~mask,IOMD_IRQMASKA ); -iomd_writeb (mask,IOMD_IRQCLRA ); -} - -static void iomd_mask_irq_a (struct irq_data *d) -{ -unsigned int val, mask; +// These are offsets from the stat register for each IRQ bank +#define STAT 0x00 +#define REQ 0x04 +#define CLR 0x04 +#define MASK 0x08 - mask =1 << d->irq; - val =iomd_readb (IOMD_IRQMASKA ); -iomd_writeb (val & ~mask,IOMD_IRQMASKA ); -} - -static void iomd_unmask_irq_a (struct irq_data *d) +static void __iomem *iomd_get_base (struct irq_data *d) { -unsigned int val, mask; +void *cd =irq_data_get_irq_chip_data (d); - mask =1 << d->irq; - val =iomd_readb (IOMD_IRQMASKA ); -iomd_writeb (val | mask,IOMD_IRQMASKA ); +return (void __iomem *)(unsigned long )cd; } -static struct irq_chip iomd_a_chip = { - .irq_ack = iomd_ack_irq_a, - .irq_mask = iomd_mask_irq_a, - .irq_unmask = iomd_unmask_irq_a, -}; - -static void iomd_mask_irq_b (struct irq_data *d) +static void iomd_set_base_mask (unsigned int irq,void __iomem *base,u32 mask) { -unsigned int val, mask; +struct irq_data *d =irq_get_irq_data (irq); - mask =1 << (d->irq &7 ); - val =iomd_readb (IOMD_IRQMASKB ); -iomd_writeb (val & ~mask,IOMD_IRQMASKB ); + d->mask = mask; +irq_set_chip_data (irq, (void *)(unsigned long )base); } -static void iomd_unmask_irq_b (struct irq_data *d) +static void iomd_irq_mask_ack (struct irq_data *d) { -unsigned int val, mask; +void __iomem *base =iomd_get_base (d); +unsigned int val, mask = d->mask; - mask =1 << (d->irq &7 ); - val =iomd_readb (IOMD_IRQMASKB ); -iomd_writeb (val | mask,IOMD_IRQMASKB ); + val =readb (base +MASK ); +writeb (val & ~mask, base +MASK ); +writeb (mask, base +CLR ); } -static struct irq_chip iomd_b_chip = { - .irq_ack = iomd_mask_irq_b, - .irq_mask = iomd_mask_irq_b, - .irq_unmask = iomd_unmask_irq_b, -}; - -static void iomd_mask_irq_dma (struct irq_data *d) +static void iomd_irq_mask (struct irq_data *d) { -unsigned int val, mask; +void __iomem *base =iomd_get_base (d); +unsigned int val, mask = d->mask; - mask =1 << (d->irq &7 ); - val =iomd_readb (IOMD_DMAMASK ); -iomd_writeb (val & ~mask,IOMD_DMAMASK ); + val =readb (base +MASK ); +writeb (val & ~mask, base +MASK ); } -static void iomd_unmask_irq_dma (struct irq_data *d) +static void iomd_irq_unmask (struct irq_data *d) { -unsigned int val, mask; +void __iomem *base =iomd_get_base (d); +unsigned int val, mask = d->mask; - mask =1 << (d->irq &7 ); - val =iomd_readb (IOMD_DMAMASK ); -iomd_writeb (val | mask,IOMD_DMAMASK ); + val =readb (base +MASK ); +writeb (val | mask, base +MASK ); } -static struct irq_chip iomd_dma_chip = { - .irq_ack = iomd_mask_irq_dma, - .irq_mask = iomd_mask_irq_dma, - .irq_unmask = iomd_unmask_irq_dma, +static struct irq_chip iomd_chip_clr = { + .irq_mask_ack = iomd_irq_mask_ack, + .irq_mask = iomd_irq_mask, + .irq_unmask = iomd_irq_unmask, }; -static void iomd_mask_irq_fiq (struct irq_data *d) -{ -unsigned int val, mask; - - mask =1 << (d->irq &7 ); - val =iomd_readb (IOMD_FIQMASK ); -iomd_writeb (val & ~mask,IOMD_FIQMASK ); -} - -static void iomd_unmask_irq_fiq (struct irq_data *d) -{ -unsigned int val, mask; - - mask =1 << (d->irq &7 ); - val =iomd_readb (IOMD_FIQMASK ); -iomd_writeb (val | mask,IOMD_FIQMASK ); -} - -static struct irq_chip iomd_fiq_chip = { - .irq_ack = iomd_mask_irq_fiq, - .irq_mask = iomd_mask_irq_fiq, - .irq_unmask = iomd_unmask_irq_fiq, +static struct irq_chip iomd_chip_noclr = { + .irq_mask = iomd_irq_mask, + .irq_unmask = iomd_irq_unmask, };extern unsigned char rpc_default_fiq_start, rpc_default_fiq_end;
@@ -141,30 +95,37 @@ void __init rpc_init_irq(void)switch (irq) { case 0 ... 7: -irq_set_chip_and_handler (irq, &iomd_a_chip, +irq_set_chip_and_handler (irq, &iomd_chip_clr, handle_level_irq);irq_modify_status (irq, clr, set); +iomd_set_base_mask (irq,IOMD_BASE +IOMD_IRQSTATA , +BIT (irq));break ; case 8 ... 15: -irq_set_chip_and_handler (irq, &iomd_b_chip, +irq_set_chip_and_handler (irq, &iomd_chip_noclr, handle_level_irq);irq_modify_status (irq, clr, set); +iomd_set_base_mask (irq,IOMD_BASE +IOMD_IRQSTATB , +BIT (irq -8 ));break ; case 16 ... 21: -irq_set_chip_and_handler (irq, &iomd_dma_chip, +irq_set_chip_and_handler (irq, &iomd_chip_noclr, handle_level_irq);irq_modify_status (irq, clr, set); +iomd_set_base_mask (irq,IOMD_BASE +IOMD_DMASTAT , +BIT (irq -16 ));break ; case 64 ... 71: -irq_set_chip (irq, &iomd_fiq_chip); +irq_set_chip (irq, &iomd_chip_noclr);irq_modify_status (irq, clr, set); +iomd_set_base_mask (irq,IOMD_BASE +IOMD_FIQSTAT , +BIT (irq -64 ));break ; } }init_FIQ (FIQ_START ); } -
Signature · 7 lines
2.7.4 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 5/5 ARM: riscpc: enable chained scatterlist support
In reply to Russell King - ARM Linux adminThere's no reason why we can't enable chained scatterlist for RiscPC, we already support chained scatterlists in the IOMD DMA support code.
--- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/Kconfig +1 -0
@@ -528,6 +528,7 @@ config ARCH_RPC select ARCH_ACORN select ARCH_MAY_HAVE_PC_FDC select ARCH_SPARSEMEM_ENABLE + select ARM_HAS_SG_CHAIN select CPU_SA110 select FIQ select HAVE_IDE
Signature · 7 lines
2.7.4 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel