Commit 03e61914 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68k-for-v4.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

 - Enable mac_scsi PDMA on PowerBook 500

 - Generic dma_noncoherent_ops conversion

 - Time handling improvements

 - I/O accessor improvements

 - Conversion to MEMBLOCK and NO_BOOTMEM, to bring m68k in line with
   other mainstream architectures

 - Miscellaneous fixes and cleanups

 - Defconfig updates

* tag 'm68k-for-v4.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/defconfig: Update defconfigs for v4.18-rc6
  m68k: switch to MEMBLOCK + NO_BOOTMEM
  m68k/page_no.h: force __va argument to be unsigned long
  m68k/bitops: convert __ffs to match generic declaration
  m68k/io: Switch mmu variant to <asm-generic/io.h>
  m68k/io: Move mem*io define guards to <asm/kmap.h>
  Input: hilkbd - Add casts to HP9000/300 I/O accessors
  net: mac8390: Use standard memcpy_{from,to}io()
  m68k/io: Add missing ioremap define guards, fix typo
  m68k: Remove unused set_clock_mmss() helpers
  m68k: mac: Use time64_t in RTC handling
  m68k: Use generic dma_noncoherent_ops
  nubus: Set default dma mask for nubus_board devices
  m68k/mac: Enable PDMA for PowerBook 500 series
parents 94710cac 71a89668

arch/m68k/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
config M68K

	bool

	default y

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA

	select ARCH_MIGHT_HAVE_PC_PARPORT if ISA

	select ARCH_NO_COHERENT_DMA_MMAP if !MMU

	select HAVE_IDE
@@ -24,6 +25,10 @@ config M68K 
	select MODULES_USE_ELF_RELA

	select OLD_SIGSUSPEND3

	select OLD_SIGACTION

	select DMA_NONCOHERENT_OPS if HAS_DMA

	select HAVE_MEMBLOCK

	select ARCH_DISCARD_MEMBLOCK

	select NO_BOOTMEM



config CPU_BIG_ENDIAN

	def_bool y

arch/m68k/apollo/config.c

+0 −8
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ extern void dn_sched_init(irq_handler_t handler); 
extern void dn_init_IRQ(void);

extern u32 dn_gettimeoffset(void);

extern int dn_dummy_hwclk(int, struct rtc_time *);

extern int dn_dummy_set_clock_mmss(unsigned long);

extern void dn_dummy_reset(void);

#ifdef CONFIG_HEARTBEAT

static void dn_heartbeat(int on);
@@ -156,7 +155,6 @@ void __init config_apollo(void) 
	arch_gettimeoffset   = dn_gettimeoffset;

	mach_max_dma_address = 0xffffffff;

	mach_hwclk           = dn_dummy_hwclk; /* */

	mach_set_clock_mmss  = dn_dummy_set_clock_mmss; /* */

	mach_reset	     = dn_dummy_reset;  /* */

#ifdef CONFIG_HEARTBEAT

	mach_heartbeat = dn_heartbeat;
@@ -240,12 +238,6 @@ int dn_dummy_hwclk(int op, struct rtc_time *t) { 


}



int dn_dummy_set_clock_mmss(unsigned long nowtime)

{

	pr_info("set_clock_mmss\n");

	return 0;

}



void dn_dummy_reset(void) {



  dn_serial_print("The end !\n");

arch/m68k/atari/config.c

+0 −5
Original line number Diff line number Diff line
@@ -81,9 +81,6 @@ extern void atari_sched_init(irq_handler_t); 
extern u32 atari_gettimeoffset(void);

extern int atari_mste_hwclk (int, struct rtc_time *);

extern int atari_tt_hwclk (int, struct rtc_time *);

extern int atari_mste_set_clock_mmss (unsigned long);

extern int atari_tt_set_clock_mmss (unsigned long);





/* ++roman: This is a more elaborate test for an SCC chip, since the plain

 * Medusa board generates DTACK at the SCC's standard addresses, but a SCC
@@ -362,13 +359,11 @@ void __init config_atari(void) 
		ATARIHW_SET(TT_CLK);

		pr_cont(" TT_CLK");

		mach_hwclk = atari_tt_hwclk;

		mach_set_clock_mmss = atari_tt_set_clock_mmss;

	}

	if (hwreg_present(&mste_rtc.sec_ones)) {

		ATARIHW_SET(MSTE_CLK);

		pr_cont(" MSTE_CLK");

		mach_hwclk = atari_mste_hwclk;

		mach_set_clock_mmss = atari_mste_set_clock_mmss;

	}

	if (!MACH_IS_MEDUSA && hwreg_present(&dma_wd.fdc_speed) &&

	    hwreg_write(&dma_wd.fdc_speed, 0)) {

arch/m68k/atari/time.c

+0 −63
Original line number Diff line number Diff line
@@ -285,69 +285,6 @@ int atari_tt_hwclk( int op, struct rtc_time *t ) 
    return( 0 );

}





int atari_mste_set_clock_mmss (unsigned long nowtime)

{

    short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;

    struct MSTE_RTC val;

    unsigned char rtc_minutes;



    mste_read(&val);

    rtc_minutes= val.min_ones + val.min_tens * 10;

    if ((rtc_minutes < real_minutes

         ? real_minutes - rtc_minutes

         : rtc_minutes - real_minutes) < 30)

    {

        val.sec_ones = real_seconds % 10;

        val.sec_tens = real_seconds / 10;

        val.min_ones = real_minutes % 10;

        val.min_tens = real_minutes / 10;

        mste_write(&val);

    }

    else

        return -1;

    return 0;

}



int atari_tt_set_clock_mmss (unsigned long nowtime)

{

    int retval = 0;

    short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;

    unsigned char save_control, save_freq_select, rtc_minutes;



    save_control = RTC_READ (RTC_CONTROL); /* tell the clock it's being set */

    RTC_WRITE (RTC_CONTROL, save_control | RTC_SET);



    save_freq_select = RTC_READ (RTC_FREQ_SELECT); /* stop and reset prescaler */

    RTC_WRITE (RTC_FREQ_SELECT, save_freq_select | RTC_DIV_RESET2);



    rtc_minutes = RTC_READ (RTC_MINUTES);

    if (!(save_control & RTC_DM_BINARY))

	rtc_minutes = bcd2bin(rtc_minutes);



    /* Since we're only adjusting minutes and seconds, don't interfere

       with hour overflow.  This avoids messing with unknown time zones

       but requires your RTC not to be off by more than 30 minutes.  */

    if ((rtc_minutes < real_minutes

         ? real_minutes - rtc_minutes

         : rtc_minutes - real_minutes) < 30)

        {

            if (!(save_control & RTC_DM_BINARY))

                {

		    real_seconds = bin2bcd(real_seconds);

		    real_minutes = bin2bcd(real_minutes);

                }

            RTC_WRITE (RTC_SECONDS, real_seconds);

            RTC_WRITE (RTC_MINUTES, real_minutes);

        }

    else

        retval = -1;



    RTC_WRITE (RTC_FREQ_SELECT, save_freq_select);

    RTC_WRITE (RTC_CONTROL, save_control);

    return retval;

}



/*

 * Local variables:

 *  c-indent-level: 4

arch/m68k/bvme6000/config.c

+0 −45
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ static void bvme6000_get_model(char *model); 
extern void bvme6000_sched_init(irq_handler_t handler);

extern u32 bvme6000_gettimeoffset(void);

extern int bvme6000_hwclk (int, struct rtc_time *);

extern int bvme6000_set_clock_mmss (unsigned long);

extern void bvme6000_reset (void);

void bvme6000_set_vectors (void);
@@ -113,7 +112,6 @@ void __init config_bvme6000(void) 
    mach_init_IRQ        = bvme6000_init_IRQ;

    arch_gettimeoffset   = bvme6000_gettimeoffset;

    mach_hwclk           = bvme6000_hwclk;

    mach_set_clock_mmss	 = bvme6000_set_clock_mmss;

    mach_reset		 = bvme6000_reset;

    mach_get_model       = bvme6000_get_model;
@@ -305,46 +303,3 @@ int bvme6000_hwclk(int op, struct rtc_time *t) 


	return 0;

}
 


/*

 * Set the minutes and seconds from seconds value 'nowtime'.  Fail if

 * clock is out by > 30 minutes.  Logic lifted from atari code.

 * Algorithm is to wait for the 10ms register to change, and then to

 * wait a short while, and then set it.

 */



int bvme6000_set_clock_mmss (unsigned long nowtime)

{

	int retval = 0;

	short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;

	unsigned char rtc_minutes, rtc_tenms;

	volatile RtcPtr_t rtc = (RtcPtr_t)BVME_RTC_BASE;

	unsigned char msr = rtc->msr & 0xc0;

	unsigned long flags;

	volatile int i;



	rtc->msr = 0;		/* Ensure clock accessible */

	rtc_minutes = bcd2bin (rtc->bcd_min);



	if ((rtc_minutes < real_minutes

		? real_minutes - rtc_minutes

			: rtc_minutes - real_minutes) < 30)

	{

		local_irq_save(flags);

		rtc_tenms = rtc->bcd_tenms;

		while (rtc_tenms == rtc->bcd_tenms)

			;

		for (i = 0; i < 1000; i++)

			;

		rtc->bcd_min = bin2bcd(real_minutes);

		rtc->bcd_sec = bin2bcd(real_seconds);

		local_irq_restore(flags);

	}

	else

		retval = -1;



	rtc->msr = msr;



	return retval;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE