mirror of
https://github.com/torvalds/linux.git
synced 2025-04-12 06:49:52 +00:00
parisc architecture updates for kernel v6.15-rc1:
Drop parisc specific memcpy_fromio() function, clean up coding style and fix compile warnings. -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQS86RI+GtKfB8BJu973ErUQojoPXwUCZ+faNwAKCRD3ErUQojoP Xz7SAP91dhQNm/VEpRjODSu43CbQlsiCohCGfZRRRBaPaxIoIAEA5KUk9goheBMt jL6kgYf8Lcxon83yBNd37bgvZssg/wc= =NUvi -----END PGP SIGNATURE----- Merge tag 'parisc-for-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux Pull parisc updates from Helge Deller: - drop parisc specific memcpy_fromio() function - clean up coding style and fix compile warnings * tag 'parisc-for-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: led: Use scnprintf() to avoid string truncation warning Input: gscps2 - Describe missing function parameters parisc: perf: use named initializers for struct miscdevice parisc: PDT: Fix missing prototype warning parisc: Remove memcpy_fromio parisc: Fix formatting errors in io.c
This commit is contained in:
Linus Torvalds
commit
883ab4e47c
@ -135,9 +135,6 @@ static inline void gsc_writeq(unsigned long long val, unsigned long addr)
|
||||
|
||||
#define pci_iounmap pci_iounmap
|
||||
|
||||
void memcpy_fromio(void *dst, const volatile void __iomem *src, int count);
|
||||
#define memcpy_fromio memcpy_fromio
|
||||
|
||||
/* Port-space IO */
|
||||
|
||||
#define inb_p inb
|
||||
|
||||
@ -43,7 +43,6 @@ EXPORT_SYMBOL($global$);
|
||||
#endif
|
||||
|
||||
#include <asm/io.h>
|
||||
EXPORT_SYMBOL(memcpy_fromio);
|
||||
|
||||
extern void $$divI(void);
|
||||
extern void $$divU(void);
|
||||
|
||||
@ -63,6 +63,7 @@ static unsigned long pdt_entry[MAX_PDT_ENTRIES] __page_aligned_bss;
|
||||
#define PDT_ADDR_PERM_ERR (pdt_type != PDT_PDC ? 2UL : 0UL)
|
||||
#define PDT_ADDR_SINGLE_ERR 1UL
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
/* report PDT entries via /proc/meminfo */
|
||||
void arch_report_meminfo(struct seq_file *m)
|
||||
{
|
||||
@ -74,6 +75,7 @@ void arch_report_meminfo(struct seq_file *m)
|
||||
seq_printf(m, "PDT_cur_entries: %7lu\n",
|
||||
pdt_status.pdt_entries);
|
||||
}
|
||||
#endif
|
||||
|
||||
static int get_info_pat_new(void)
|
||||
{
|
||||
|
||||
@ -475,9 +475,9 @@ static const struct file_operations perf_fops = {
|
||||
};
|
||||
|
||||
static struct miscdevice perf_dev = {
|
||||
MISC_DYNAMIC_MINOR,
|
||||
PA_PERF_DEV,
|
||||
&perf_fops
|
||||
.minor = MISC_DYNAMIC_MINOR,
|
||||
.name = PA_PERF_DEV,
|
||||
.fops = &perf_fops,
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
@ -12,67 +12,6 @@
|
||||
#include <linux/module.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
/*
|
||||
** Copies a block of memory from a device in an efficient manner.
|
||||
** Assumes the device can cope with 32-bit transfers. If it can't,
|
||||
** don't use this function.
|
||||
**
|
||||
** CR16 counts on C3000 reading 256 bytes from Symbios 896 RAM:
|
||||
** 27341/64 = 427 cyc per int
|
||||
** 61311/128 = 478 cyc per short
|
||||
** 122637/256 = 479 cyc per byte
|
||||
** Ergo bus latencies dominant (not transfer size).
|
||||
** Minimize total number of transfers at cost of CPU cycles.
|
||||
** TODO: only look at src alignment and adjust the stores to dest.
|
||||
*/
|
||||
void memcpy_fromio(void *dst, const volatile void __iomem *src, int count)
|
||||
{
|
||||
/* first compare alignment of src/dst */
|
||||
if ( (((unsigned long)dst ^ (unsigned long)src) & 1) || (count < 2) )
|
||||
goto bytecopy;
|
||||
|
||||
if ( (((unsigned long)dst ^ (unsigned long)src) & 2) || (count < 4) )
|
||||
goto shortcopy;
|
||||
|
||||
/* Then check for misaligned start address */
|
||||
if ((unsigned long)src & 1) {
|
||||
*(u8 *)dst = readb(src);
|
||||
src++;
|
||||
dst++;
|
||||
count--;
|
||||
if (count < 2) goto bytecopy;
|
||||
}
|
||||
|
||||
if ((unsigned long)src & 2) {
|
||||
*(u16 *)dst = __raw_readw(src);
|
||||
src += 2;
|
||||
dst += 2;
|
||||
count -= 2;
|
||||
}
|
||||
|
||||
while (count > 3) {
|
||||
*(u32 *)dst = __raw_readl(src);
|
||||
dst += 4;
|
||||
src += 4;
|
||||
count -= 4;
|
||||
}
|
||||
|
||||
shortcopy:
|
||||
while (count > 1) {
|
||||
*(u16 *)dst = __raw_readw(src);
|
||||
src += 2;
|
||||
dst += 2;
|
||||
count -= 2;
|
||||
}
|
||||
|
||||
bytecopy:
|
||||
while (count--) {
|
||||
*(char *)dst = readb(src);
|
||||
src++;
|
||||
dst++;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Read COUNT 8-bit bytes from port PORT into memory starting at
|
||||
* SRC.
|
||||
@ -123,15 +62,15 @@ void insw (unsigned long port, void *dst, unsigned long count)
|
||||
unsigned char *p;
|
||||
|
||||
p = (unsigned char *)dst;
|
||||
|
||||
|
||||
if (!count)
|
||||
return;
|
||||
|
||||
|
||||
switch (((unsigned long)p) & 0x3)
|
||||
{
|
||||
case 0x00: /* Buffer 32-bit aligned */
|
||||
while (count>=2) {
|
||||
|
||||
|
||||
count -= 2;
|
||||
l = cpu_to_le16(inw(port)) << 16;
|
||||
l |= cpu_to_le16(inw(port));
|
||||
@ -142,13 +81,13 @@ void insw (unsigned long port, void *dst, unsigned long count)
|
||||
*(unsigned short *)p = cpu_to_le16(inw(port));
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case 0x02: /* Buffer 16-bit aligned */
|
||||
*(unsigned short *)p = cpu_to_le16(inw(port));
|
||||
p += 2;
|
||||
count--;
|
||||
while (count>=2) {
|
||||
|
||||
|
||||
count -= 2;
|
||||
l = cpu_to_le16(inw(port)) << 16;
|
||||
l |= cpu_to_le16(inw(port));
|
||||
@ -159,13 +98,13 @@ void insw (unsigned long port, void *dst, unsigned long count)
|
||||
*(unsigned short *)p = cpu_to_le16(inw(port));
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case 0x01: /* Buffer 8-bit aligned */
|
||||
case 0x03:
|
||||
/* I don't bother with 32bit transfers
|
||||
* in this case, 16bit will have to do -- DE */
|
||||
--count;
|
||||
|
||||
|
||||
l = cpu_to_le16(inw(port));
|
||||
*p = l >> 8;
|
||||
p++;
|
||||
@ -195,10 +134,10 @@ void insl (unsigned long port, void *dst, unsigned long count)
|
||||
unsigned char *p;
|
||||
|
||||
p = (unsigned char *)dst;
|
||||
|
||||
|
||||
if (!count)
|
||||
return;
|
||||
|
||||
|
||||
switch (((unsigned long) dst) & 0x3)
|
||||
{
|
||||
case 0x00: /* Buffer 32-bit aligned */
|
||||
@ -208,14 +147,14 @@ void insl (unsigned long port, void *dst, unsigned long count)
|
||||
p += 4;
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case 0x02: /* Buffer 16-bit aligned */
|
||||
--count;
|
||||
|
||||
|
||||
l = cpu_to_le32(inl(port));
|
||||
*(unsigned short *)p = l >> 16;
|
||||
p += 2;
|
||||
|
||||
|
||||
while (count--)
|
||||
{
|
||||
l2 = cpu_to_le32(inl(port));
|
||||
@ -227,7 +166,7 @@ void insl (unsigned long port, void *dst, unsigned long count)
|
||||
break;
|
||||
case 0x01: /* Buffer 8-bit aligned */
|
||||
--count;
|
||||
|
||||
|
||||
l = cpu_to_le32(inl(port));
|
||||
*(unsigned char *)p = l >> 24;
|
||||
p++;
|
||||
@ -244,7 +183,7 @@ void insl (unsigned long port, void *dst, unsigned long count)
|
||||
break;
|
||||
case 0x03: /* Buffer 8-bit aligned */
|
||||
--count;
|
||||
|
||||
|
||||
l = cpu_to_le32(inl(port));
|
||||
*p = l >> 24;
|
||||
p++;
|
||||
@ -293,10 +232,10 @@ void outsw (unsigned long port, const void *src, unsigned long count)
|
||||
const unsigned char *p;
|
||||
|
||||
p = (const unsigned char *)src;
|
||||
|
||||
|
||||
if (!count)
|
||||
return;
|
||||
|
||||
|
||||
switch (((unsigned long)p) & 0x3)
|
||||
{
|
||||
case 0x00: /* Buffer 32-bit aligned */
|
||||
@ -311,13 +250,13 @@ void outsw (unsigned long port, const void *src, unsigned long count)
|
||||
outw(le16_to_cpu(*(unsigned short*)p), port);
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case 0x02: /* Buffer 16-bit aligned */
|
||||
|
||||
|
||||
outw(le16_to_cpu(*(unsigned short*)p), port);
|
||||
p += 2;
|
||||
count--;
|
||||
|
||||
|
||||
while (count>=2) {
|
||||
count -= 2;
|
||||
l = *(unsigned int *)p;
|
||||
@ -329,11 +268,11 @@ void outsw (unsigned long port, const void *src, unsigned long count)
|
||||
outw(le16_to_cpu(*(unsigned short *)p), port);
|
||||
}
|
||||
break;
|
||||
|
||||
case 0x01: /* Buffer 8-bit aligned */
|
||||
|
||||
case 0x01: /* Buffer 8-bit aligned */
|
||||
/* I don't bother with 32bit transfers
|
||||
* in this case, 16bit will have to do -- DE */
|
||||
|
||||
|
||||
l = *p << 8;
|
||||
p++;
|
||||
count--;
|
||||
@ -348,7 +287,7 @@ void outsw (unsigned long port, const void *src, unsigned long count)
|
||||
l2 = *(unsigned char *)p;
|
||||
outw (le16_to_cpu(l | l2>>8), port);
|
||||
break;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -365,10 +304,10 @@ void outsl (unsigned long port, const void *src, unsigned long count)
|
||||
const unsigned char *p;
|
||||
|
||||
p = (const unsigned char *)src;
|
||||
|
||||
|
||||
if (!count)
|
||||
return;
|
||||
|
||||
|
||||
switch (((unsigned long)p) & 0x3)
|
||||
{
|
||||
case 0x00: /* Buffer 32-bit aligned */
|
||||
@ -378,13 +317,13 @@ void outsl (unsigned long port, const void *src, unsigned long count)
|
||||
p += 4;
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case 0x02: /* Buffer 16-bit aligned */
|
||||
--count;
|
||||
|
||||
|
||||
l = *(unsigned short *)p;
|
||||
p += 2;
|
||||
|
||||
|
||||
while (count--)
|
||||
{
|
||||
l2 = *(unsigned int *)p;
|
||||
@ -415,7 +354,7 @@ void outsl (unsigned long port, const void *src, unsigned long count)
|
||||
break;
|
||||
case 0x03: /* Buffer 8-bit aligned */
|
||||
--count;
|
||||
|
||||
|
||||
l = *p << 24;
|
||||
p++;
|
||||
|
||||
|
||||
@ -251,6 +251,8 @@ static bool gscps2_report_data(struct gscps2port *ps2port)
|
||||
|
||||
/**
|
||||
* gscps2_interrupt() - Interruption service routine
|
||||
* @irq: interrupt number which triggered (unused)
|
||||
* @dev: device pointer (unused)
|
||||
*
|
||||
* This function reads received PS/2 bytes and processes them on
|
||||
* all interfaces.
|
||||
@ -329,6 +331,8 @@ static void gscps2_close(struct serio *port)
|
||||
|
||||
/**
|
||||
* gscps2_probe() - Probes PS2 devices
|
||||
* @dev: pointer to parisc_device struct which will be probed
|
||||
*
|
||||
* @return: success/error report
|
||||
*/
|
||||
|
||||
@ -420,6 +424,8 @@ fail_nomem:
|
||||
|
||||
/**
|
||||
* gscps2_remove() - Removes PS2 devices
|
||||
* @dev: pointer to parisc_device which shall be removed
|
||||
*
|
||||
* @return: success/error report
|
||||
*/
|
||||
|
||||
|
||||
@ -39,7 +39,6 @@ static unsigned char led_type; /* bitmask of LED_HAS_XXX */
|
||||
static unsigned char lastleds; /* LED state from most recent update */
|
||||
static unsigned char lcd_new_text;
|
||||
static unsigned char lcd_text[20];
|
||||
static unsigned char lcd_text_default[20];
|
||||
static unsigned char lcd_no_led_support; /* KittyHawk doesn't support LED on its LCD */
|
||||
|
||||
struct lcd_block {
|
||||
@ -456,9 +455,8 @@ static int __init early_led_init(void)
|
||||
struct pdc_chassis_info chassis_info;
|
||||
int ret;
|
||||
|
||||
snprintf(lcd_text_default, sizeof(lcd_text_default),
|
||||
scnprintf(lcd_text, sizeof(lcd_text),
|
||||
"Linux %s", init_utsname()->release);
|
||||
strcpy(lcd_text, lcd_text_default);
|
||||
lcd_new_text = 1;
|
||||
|
||||
/* Work around the buggy PDC of KittyHawk-machines */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user