Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror: CRIS: Cleanup linker script using new linker script macros. ARRAY_SIZE changes CRIS: convert to asm-generic/hardirq.h CRISv10: Don't autonegotiate if autonegotiation is off CRIS: fix defconfig build failure CRIS: add pgprot_noncached
This commit is contained in:
commit
5f8fe4270e
|
@ -28,7 +28,6 @@
|
|||
|
||||
extern void update_xtime_from_cmos(void);
|
||||
extern int set_rtc_mmss(unsigned long nowtime);
|
||||
extern int setup_irq(int, struct irqaction *);
|
||||
extern int have_rtc;
|
||||
|
||||
unsigned long get_ns_in_jiffie(void)
|
||||
|
|
|
@ -52,8 +52,6 @@ static struct mm_struct* flush_mm;
|
|||
static struct vm_area_struct* flush_vma;
|
||||
static unsigned long flush_addr;
|
||||
|
||||
extern int setup_irq(int, struct irqaction *);
|
||||
|
||||
/* Mode registers */
|
||||
static unsigned long irq_regs[NR_CPUS] = {
|
||||
regi_irq,
|
||||
|
|
|
@ -46,7 +46,6 @@ unsigned long timer_regs[NR_CPUS] =
|
|||
|
||||
extern void update_xtime_from_cmos(void);
|
||||
extern int set_rtc_mmss(unsigned long nowtime);
|
||||
extern int setup_irq(int, struct irqaction *);
|
||||
extern int have_rtc;
|
||||
|
||||
#ifdef CONFIG_CPU_FREQ
|
||||
|
|
|
@ -36,7 +36,7 @@ struct crisv32_ioport crisv32_ioports[] = {
|
|||
},
|
||||
};
|
||||
|
||||
#define NBR_OF_PORTS sizeof(crisv32_ioports)/sizeof(struct crisv32_ioport)
|
||||
#define NBR_OF_PORTS ARRAY_SIZE(crisv32_ioports)
|
||||
|
||||
struct crisv32_iopin crisv32_led_net0_green;
|
||||
struct crisv32_iopin crisv32_led_net0_red;
|
||||
|
|
|
@ -52,7 +52,7 @@ struct crisv32_ioport crisv32_ioports[] = {
|
|||
}
|
||||
};
|
||||
|
||||
#define NBR_OF_PORTS sizeof(crisv32_ioports)/sizeof(struct crisv32_ioport)
|
||||
#define NBR_OF_PORTS ARRAY_SIZE(crisv32_ioports)
|
||||
|
||||
struct crisv32_iopin crisv32_led_net0_green;
|
||||
struct crisv32_iopin crisv32_led_net0_red;
|
||||
|
|
|
@ -33,10 +33,10 @@ typedef struct
|
|||
|
||||
/* CRIS PTE bits (see R_TLB_LO in the register description)
|
||||
*
|
||||
* Bit: 31-13 12-------4 3 2 1 0
|
||||
* ________________________________________________
|
||||
* | pfn | reserved | global | valid | kernel | we |
|
||||
* |_____|__________|________|_______|________|_____|
|
||||
* Bit: 31 30-13 12-------4 3 2 1 0
|
||||
* _______________________________________________________
|
||||
* | cache |pfn | reserved | global | valid | kernel | we |
|
||||
* |_______|____|__________|________|_______|________|_____|
|
||||
*
|
||||
* (pfn = physical frame number)
|
||||
*/
|
||||
|
@ -53,6 +53,7 @@ typedef struct
|
|||
#define _PAGE_VALID (1<<2) /* page is valid */
|
||||
#define _PAGE_SILENT_READ (1<<2) /* synonym */
|
||||
#define _PAGE_GLOBAL (1<<3) /* global page - context is ignored */
|
||||
#define _PAGE_NO_CACHE (1<<31) /* part of the uncached memory map */
|
||||
|
||||
/* Bits the HW doesn't care about but the kernel uses them in SW */
|
||||
|
||||
|
|
|
@ -28,10 +28,10 @@ typedef struct
|
|||
/*
|
||||
* CRISv32 PTE bits:
|
||||
*
|
||||
* Bit: 31-13 12-5 4 3 2 1 0
|
||||
* +-----+------+--------+-------+--------+-------+---------+
|
||||
* | pfn | zero | global | valid | kernel | write | execute |
|
||||
* +-----+------+--------+-------+--------+-------+---------+
|
||||
* Bit: 31 30-13 12-5 4 3 2 1 0
|
||||
* +-------+-----+------+--------+-------+--------+-------+---------+
|
||||
* | cache | pfn | zero | global | valid | kernel | write | execute |
|
||||
* +-------+-----+------+--------+-------+--------+-------+---------+
|
||||
*/
|
||||
|
||||
/*
|
||||
|
@ -45,6 +45,8 @@ typedef struct
|
|||
#define _PAGE_VALID (1 << 3) /* Page is valid. */
|
||||
#define _PAGE_SILENT_READ (1 << 3) /* Same as above. */
|
||||
#define _PAGE_GLOBAL (1 << 4) /* Global page. */
|
||||
#define _PAGE_NO_CACHE (1 << 31) /* part of the uncached memory map */
|
||||
|
||||
|
||||
/*
|
||||
* The hardware doesn't care about these bits, but the kernel uses them in
|
||||
|
|
|
@ -2,16 +2,6 @@
|
|||
#define __ASM_HARDIRQ_H
|
||||
|
||||
#include <asm/irq.h>
|
||||
#include <linux/threads.h>
|
||||
#include <linux/cache.h>
|
||||
|
||||
typedef struct {
|
||||
unsigned int __softirq_pending;
|
||||
} ____cacheline_aligned irq_cpustat_t;
|
||||
|
||||
#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
|
||||
|
||||
void ack_bad_irq(unsigned int irq);
|
||||
|
||||
#define HARDIRQ_BITS 8
|
||||
|
||||
|
@ -24,4 +14,6 @@ void ack_bad_irq(unsigned int irq);
|
|||
# error HARDIRQ_BITS is too low!
|
||||
#endif
|
||||
|
||||
#include <asm-generic/hardirq.h>
|
||||
|
||||
#endif /* __ASM_HARDIRQ_H */
|
||||
|
|
|
@ -197,6 +197,8 @@ static inline pte_t __mk_pte(void * page, pgprot_t pgprot)
|
|||
static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
|
||||
{ pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; }
|
||||
|
||||
#define pgprot_noncached(prot) __pgprot((pgprot_val(prot) | _PAGE_NO_CACHE))
|
||||
|
||||
|
||||
/* pte_val refers to a page in the 0x4xxxxxxx physical DRAM interval
|
||||
* __pte_page(pte_val) refers to the "virtual" DRAM interval
|
||||
|
|
|
@ -38,11 +38,6 @@
|
|||
|
||||
#include <asm/io.h>
|
||||
|
||||
void ack_bad_irq(unsigned int irq)
|
||||
{
|
||||
printk("unexpected IRQ trap at vector %02x\n", irq);
|
||||
}
|
||||
|
||||
int show_interrupts(struct seq_file *p, void *v)
|
||||
{
|
||||
int i = *(loff_t *) v, j;
|
||||
|
|
|
@ -51,10 +51,7 @@ SECTIONS
|
|||
_etext = . ; /* End of text section. */
|
||||
__etext = .;
|
||||
|
||||
. = ALIGN(4); /* Exception table. */
|
||||
__start___ex_table = .;
|
||||
__ex_table : { *(__ex_table) }
|
||||
__stop___ex_table = .;
|
||||
EXCEPTION_TABLE(4)
|
||||
|
||||
RODATA
|
||||
|
||||
|
@ -67,36 +64,24 @@ SECTIONS
|
|||
__edata = . ; /* End of data section. */
|
||||
_edata = . ;
|
||||
|
||||
. = ALIGN(PAGE_SIZE); /* init_task and stack, must be aligned. */
|
||||
.data.init_task : { *(.data.init_task) }
|
||||
INIT_TASK_DATA_SECTION(PAGE_SIZE)
|
||||
|
||||
. = ALIGN(PAGE_SIZE); /* Init code and data. */
|
||||
__init_begin = .;
|
||||
.init.text : {
|
||||
_sinittext = .;
|
||||
INIT_TEXT
|
||||
_einittext = .;
|
||||
}
|
||||
INIT_TEXT_SECTION(PAGE_SIZE)
|
||||
.init.data : { INIT_DATA }
|
||||
. = ALIGN(16);
|
||||
__setup_start = .;
|
||||
.init.setup : { *(.init.setup) }
|
||||
__setup_end = .;
|
||||
.init.setup : { INIT_SETUP(16) }
|
||||
#ifdef CONFIG_ETRAX_ARCH_V32
|
||||
__start___param = .;
|
||||
__param : { *(__param) }
|
||||
__stop___param = .;
|
||||
#endif
|
||||
.initcall.init : {
|
||||
__initcall_start = .;
|
||||
INITCALLS
|
||||
__initcall_end = .;
|
||||
INIT_CALLS
|
||||
}
|
||||
|
||||
.con_initcall.init : {
|
||||
__con_initcall_start = .;
|
||||
*(.con_initcall.init)
|
||||
__con_initcall_end = .;
|
||||
CON_INITCALL
|
||||
}
|
||||
SECURITY_INIT
|
||||
|
||||
|
@ -114,9 +99,7 @@ SECTIONS
|
|||
PERCPU(PAGE_SIZE)
|
||||
|
||||
.init.ramfs : {
|
||||
__initramfs_start = .;
|
||||
*(.init.ramfs)
|
||||
__initramfs_end = .;
|
||||
INIT_RAM_FS
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -130,11 +113,7 @@ SECTIONS
|
|||
__init_end = .;
|
||||
|
||||
__data_end = . ; /* Move to _edata ? */
|
||||
__bss_start = .; /* BSS. */
|
||||
.bss : {
|
||||
*(COMMON)
|
||||
*(.bss)
|
||||
}
|
||||
BSS_SECTION(0, 0, 0)
|
||||
|
||||
. = ALIGN (0x20);
|
||||
_end = .;
|
||||
|
|
|
@ -768,10 +768,24 @@ e100_negotiate(struct net_device* dev)
|
|||
|
||||
e100_set_mdio_reg(dev, np->mii_if.phy_id, MII_ADVERTISE, data);
|
||||
|
||||
/* Renegotiate with link partner */
|
||||
data = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_BMCR);
|
||||
if (autoneg_normal) {
|
||||
data = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_BMCR);
|
||||
data |= BMCR_ANENABLE | BMCR_ANRESTART;
|
||||
/* Renegotiate with link partner */
|
||||
data |= BMCR_ANENABLE | BMCR_ANRESTART;
|
||||
} else {
|
||||
/* Don't negotiate speed or duplex */
|
||||
data &= ~(BMCR_ANENABLE | BMCR_ANRESTART);
|
||||
|
||||
/* Set speed and duplex static */
|
||||
if (current_speed_selection == 10)
|
||||
data &= ~BMCR_SPEED100;
|
||||
else
|
||||
data |= BMCR_SPEED100;
|
||||
|
||||
if (current_duplex != full)
|
||||
data &= ~BMCR_FULLDPLX;
|
||||
else
|
||||
data |= BMCR_FULLDPLX;
|
||||
}
|
||||
e100_set_mdio_reg(dev, np->mii_if.phy_id, MII_BMCR, data);
|
||||
}
|
||||
|
|
|
@ -18,6 +18,7 @@ static char *serial_version = "$Revision: 1.25 $";
|
|||
#include <linux/tty.h>
|
||||
#include <linux/tty_flip.h>
|
||||
#include <linux/major.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/fcntl.h>
|
||||
#include <linux/mm.h>
|
||||
|
|
Loading…
Reference in New Issue