Sun Mar 8 10:28:17 2020 UTC ()

Pull up following revision(s) (requested by is in ticket #760):

	sys/arch/amiga/dev/gayle_pcmcia.c: revision 1.32
	sys/arch/amigappc/include/bus_defs.h: revision 1.8

The Gayle interface uses swapped (little-endian) word accesses, so we
need to use the amiga_bus_stride_1swap methods for the word accesses.

Analyzed and submitted via port-amiga@ by Martin �berg.

Tested on formerly working hardware
- by Jukka Andberg	with Dlink DE-660+		(ne)
- by Frank Wille	with D-Link DFE-670TXD		(ne)

Tested on formerly not working hardware:
- by Martin		with 3Com 3c589 Etherling III	(ep)
- by Martin and Frank	with CompactFlash cards		(wdc)

 -

gayle wants stride_1swap now, so declare the rest of the bus methods since
we already define them anyway.


(martin)

diff -r1.31 -r1.31.22.1 src/sys/arch/amiga/dev/gayle_pcmcia.c
diff -r1.6 -r1.6.34.1 src/sys/arch/amigappc/include/bus_defs.h

--- src/sys/arch/amiga/dev/gayle_pcmcia.c 2015/02/08 09:55:25	1.31
+++ src/sys/arch/amiga/dev/gayle_pcmcia.c 2020/03/08 10:28:16	1.31.22.1

 @@ -1,19 +1,19 @@
-/*	$NetBSD: gayle_pcmcia.c,v 1.31 2015/02/08 09:55:25 jandberg Exp $ */
+/*	$NetBSD: gayle_pcmcia.c,v 1.31.22.1 2020/03/08 10:28:16 martin Exp $ */
 /* public domain */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.31 2015/02/08 09:55:25 jandberg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.31.22.1 2020/03/08 10:28:16 martin Exp $");
 /* PCMCIA front-end driver for A1200's and A600's. */
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/systm.h>
 #include <uvm/uvm.h>
 #include <dev/pcmcia/pcmciareg.h>
 #include <dev/pcmcia/pcmciavar.h>
 @@ -121,27 +121,27 @@ pccard_attach(device_t parent, device_t
 , UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (pcmcia_base == 0) {
 		printf("attach failed (no virtual memory)\n");
 		return;
+	}
 	for (i = GAYLE_PCMCIA_START; i < GAYLE_PCMCIA_END; i += PAGE_SIZE)
 		pmap_enter(vm_map_pmap(kernel_map),
 		    i - GAYLE_PCMCIA_START + pcmcia_base, i,
 		    VM_PROT_READ | VM_PROT_WRITE, true);
 	pmap_update(vm_map_pmap(kernel_map));
 	/* override the one-byte access methods for I/O space */
-	pcmio_bs_methods = amiga_bus_stride_1;
+	pcmio_bs_methods = amiga_bus_stride_1swap;
 	pcmio_bs_methods.bsr1 = pcmio_bsr1;
 	pcmio_bs_methods.bsw1 = pcmio_bsw1;
 	pcmio_bs_methods.bsrm1 = pcmio_bsrm1;
 	pcmio_bs_methods.bswm1 = pcmio_bswm1;
 	pcmio_bs_methods.bsrr1 = pcmio_bsrr1;
 	pcmio_bs_methods.bswr1 = pcmio_bswr1;
 	pcmio_bs_methods.bssr1 = pcmio_bssr1;
 	pcmio_bs_methods.bscr1 = pcmio_bscr1;
 	reset_card_reg = (u_int8_t *) pcmcia_base +
 	    (GAYLE_PCMCIA_RESET - GAYLE_PCMCIA_START);
 	sc->io_space.base = (bus_addr_t) pcmcia_base +

--- src/sys/arch/amigappc/include/bus_defs.h 2014/01/22 00:24:53	1.6
+++ src/sys/arch/amigappc/include/bus_defs.h 2020/03/08 10:28:16	1.6.34.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_defs.h,v 1.6 2014/01/22 00:24:53 christos Exp $	*/
+/*	$NetBSD: bus_defs.h,v 1.6.34.1 2020/03/08 10:28:16 martin Exp $	*/
 /*
  * Copyright (c) 1996 Leo Weppelman.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -161,20 +161,23 @@ struct amiga_bus_space_methods {
 	bswm(*bswrs4, uint32_t);
 	bssr(*bssr4, uint32_t);
 	bscr(*bscr4, uint32_t);
 };
 #define BUS_SPACE_BARRIER_READ  0x01            /* force read barrier */
 #define BUS_SPACE_BARRIER_WRITE 0x02            /* force write barrier */
 #define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
 #define __BUS_SPACE_HAS_STREAM_METHODS
 extern const struct amiga_bus_space_methods amiga_bus_stride_1;
 extern const struct amiga_bus_space_methods amiga_bus_stride_1swap;
 extern const struct amiga_bus_space_methods amiga_bus_stride_1swap_abs;
 extern const struct amiga_bus_space_methods amiga_bus_stride_2;
 extern const struct amiga_bus_space_methods amiga_bus_stride_4;
 extern const struct amiga_bus_space_methods amiga_bus_stride_4swap;
 extern const struct amiga_bus_space_methods amiga_bus_stride_16;
 extern const struct amiga_bus_space_methods amiga_bus_stride_0x1000;
 extern const struct amiga_bus_space_methods amiga_bus_stride_0x4000;
 #endif /* _AMIGAPPC_BUS_DEFS_H_ */