You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits) [POWERPC] Add memchr() to the bootwrapper [POWERPC] Implement logging of unhandled signals [POWERPC] Add legacy serial support for OPB with flattened device tree [POWERPC] Use 1TB segments [POWERPC] XilinxFB: Allow fixed framebuffer base address [POWERPC] XilinxFB: Add support for custom screen resolution [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci [POWERPC] 4xx: Kilauea defconfig file [POWERPC] 4xx: Kilauea DTS [POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x [POWERPC] 4xx: Add AMCC 405EX support to cputable.c [POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable [POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers [POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig [POWERPC] 85xx: Killed <asm/mpc85xx.h> [POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS [POWERPC] 85xx: Convert mpc8560ads to the new CPM binding. [POWERPC] mpc8272ads: Remove muram from the CPM reg property. [POWERPC] Make clockevents work on PPC601 processors ... Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.
This commit is contained in:
Linus Torvalds
@@ -19,16 +19,41 @@
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/miscdevice.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/hdpu_features.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <linux/hdpu_features.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#define SKY_CPUSTATE_VERSION "1.1"
|
||||
|
||||
static int hdpu_cpustate_probe(struct platform_device *pdev);
|
||||
static int hdpu_cpustate_remove(struct platform_device *pdev);
|
||||
|
||||
struct cpustate_t cpustate;
|
||||
static unsigned char cpustate_get_state(void);
|
||||
static int cpustate_proc_open(struct inode *inode, struct file *file);
|
||||
static int cpustate_proc_read(struct seq_file *seq, void *offset);
|
||||
|
||||
static struct cpustate_t cpustate;
|
||||
|
||||
static const struct file_operations proc_cpustate = {
|
||||
.open = cpustate_proc_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static int cpustate_proc_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return single_open(file, cpustate_proc_read, NULL);
|
||||
}
|
||||
|
||||
static int cpustate_proc_read(struct seq_file *seq, void *offset)
|
||||
{
|
||||
seq_printf(seq, "CPU State: %04x\n", cpustate_get_state());
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cpustate_get_ref(int excl)
|
||||
{
|
||||
@@ -66,13 +91,13 @@ static int cpustate_free_ref(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
unsigned char cpustate_get_state(void)
|
||||
static unsigned char cpustate_get_state(void)
|
||||
{
|
||||
|
||||
return cpustate.cached_val;
|
||||
}
|
||||
|
||||
void cpustate_set_state(unsigned char new_state)
|
||||
static void cpustate_set_state(unsigned char new_state)
|
||||
{
|
||||
unsigned int state = (new_state << 21);
|
||||
|
||||
@@ -134,29 +159,6 @@ static int cpustate_release(struct inode *inode, struct file *file)
|
||||
return cpustate_free_ref();
|
||||
}
|
||||
|
||||
/*
|
||||
* Info exported via "/proc/sky_cpustate".
|
||||
*/
|
||||
static int cpustate_read_proc(char *page, char **start, off_t off,
|
||||
int count, int *eof, void *data)
|
||||
{
|
||||
char *p = page;
|
||||
int len = 0;
|
||||
|
||||
p += sprintf(p, "CPU State: %04x\n", cpustate_get_state());
|
||||
len = p - page;
|
||||
|
||||
if (len <= off + count)
|
||||
*eof = 1;
|
||||
*start = page + off;
|
||||
len -= off;
|
||||
if (len > count)
|
||||
len = count;
|
||||
if (len < 0)
|
||||
len = 0;
|
||||
return len;
|
||||
}
|
||||
|
||||
static struct platform_driver hdpu_cpustate_driver = {
|
||||
.probe = hdpu_cpustate_probe,
|
||||
.remove = hdpu_cpustate_remove,
|
||||
@@ -169,22 +171,18 @@ static struct platform_driver hdpu_cpustate_driver = {
|
||||
* The various file operations we support.
|
||||
*/
|
||||
static const struct file_operations cpustate_fops = {
|
||||
owner:THIS_MODULE,
|
||||
open:cpustate_open,
|
||||
release:cpustate_release,
|
||||
read:cpustate_read,
|
||||
write:cpustate_write,
|
||||
fasync:NULL,
|
||||
poll:NULL,
|
||||
ioctl:NULL,
|
||||
llseek:no_llseek,
|
||||
|
||||
.owner = THIS_MODULE,
|
||||
.open = cpustate_open,
|
||||
.release = cpustate_release,
|
||||
.read = cpustate_read,
|
||||
.write = cpustate_write,
|
||||
.llseek = no_llseek,
|
||||
};
|
||||
|
||||
static struct miscdevice cpustate_dev = {
|
||||
MISC_DYNAMIC_MINOR,
|
||||
"sky_cpustate",
|
||||
&cpustate_fops
|
||||
.minor = MISC_DYNAMIC_MINOR,
|
||||
.name = "sky_cpustate",
|
||||
.fops = &cpustate_fops,
|
||||
};
|
||||
|
||||
static int hdpu_cpustate_probe(struct platform_device *pdev)
|
||||
@@ -194,23 +192,31 @@ static int hdpu_cpustate_probe(struct platform_device *pdev)
|
||||
int ret;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!res) {
|
||||
printk(KERN_ERR "sky_cpustate: "
|
||||
"Invalid memory resource.\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
cpustate.set_addr = (unsigned long *)res->start;
|
||||
cpustate.clr_addr = (unsigned long *)res->end - 1;
|
||||
|
||||
ret = misc_register(&cpustate_dev);
|
||||
if (ret) {
|
||||
printk(KERN_WARNING "sky_cpustate: Unable to register misc "
|
||||
"device.\n");
|
||||
printk(KERN_WARNING "sky_cpustate: "
|
||||
"Unable to register misc device.\n");
|
||||
cpustate.set_addr = NULL;
|
||||
cpustate.clr_addr = NULL;
|
||||
return ret;
|
||||
}
|
||||
|
||||
proc_de = create_proc_read_entry("sky_cpustate", 0, 0,
|
||||
cpustate_read_proc, NULL);
|
||||
if (proc_de == NULL)
|
||||
printk(KERN_WARNING "sky_cpustate: Unable to create proc "
|
||||
"dir entry\n");
|
||||
proc_de = create_proc_entry("sky_cpustate", 0666, &proc_root);
|
||||
if (!proc_de) {
|
||||
printk(KERN_WARNING "sky_cpustate: "
|
||||
"Unable to create proc entry\n");
|
||||
} else {
|
||||
proc_de->proc_fops = &proc_cpustate;
|
||||
proc_de->owner = THIS_MODULE;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "Sky CPU State Driver v" SKY_CPUSTATE_VERSION "\n");
|
||||
return 0;
|
||||
@@ -218,21 +224,18 @@ static int hdpu_cpustate_probe(struct platform_device *pdev)
|
||||
|
||||
static int hdpu_cpustate_remove(struct platform_device *pdev)
|
||||
{
|
||||
|
||||
cpustate.set_addr = NULL;
|
||||
cpustate.clr_addr = NULL;
|
||||
|
||||
remove_proc_entry("sky_cpustate", NULL);
|
||||
misc_deregister(&cpustate_dev);
|
||||
return 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __init cpustate_init(void)
|
||||
{
|
||||
int rc;
|
||||
rc = platform_driver_register(&hdpu_cpustate_driver);
|
||||
return rc;
|
||||
return platform_driver_register(&hdpu_cpustate_driver);
|
||||
}
|
||||
|
||||
static void __exit cpustate_exit(void)
|
||||
|
||||
@@ -18,17 +18,38 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/hdpu_features.h>
|
||||
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
static int hdpu_nexus_probe(struct platform_device *pdev);
|
||||
static int hdpu_nexus_remove(struct platform_device *pdev);
|
||||
static int hdpu_slot_id_open(struct inode *inode, struct file *file);
|
||||
static int hdpu_slot_id_read(struct seq_file *seq, void *offset);
|
||||
static int hdpu_chassis_id_open(struct inode *inode, struct file *file);
|
||||
static int hdpu_chassis_id_read(struct seq_file *seq, void *offset);
|
||||
|
||||
static struct proc_dir_entry *hdpu_slot_id;
|
||||
static struct proc_dir_entry *hdpu_chassis_id;
|
||||
static int slot_id = -1;
|
||||
static int chassis_id = -1;
|
||||
|
||||
static const struct file_operations proc_slot_id = {
|
||||
.open = hdpu_slot_id_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static const struct file_operations proc_chassis_id = {
|
||||
.open = hdpu_chassis_id_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static struct platform_driver hdpu_nexus_driver = {
|
||||
.probe = hdpu_nexus_probe,
|
||||
.remove = hdpu_nexus_remove,
|
||||
@@ -37,43 +58,67 @@ static struct platform_driver hdpu_nexus_driver = {
|
||||
},
|
||||
};
|
||||
|
||||
int hdpu_slot_id_read(char *buffer, char **buffer_location, off_t offset,
|
||||
int buffer_length, int *zero, void *ptr)
|
||||
static int hdpu_slot_id_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
|
||||
if (offset > 0)
|
||||
return 0;
|
||||
return sprintf(buffer, "%d\n", slot_id);
|
||||
return single_open(file, hdpu_slot_id_read, NULL);
|
||||
}
|
||||
|
||||
int hdpu_chassis_id_read(char *buffer, char **buffer_location, off_t offset,
|
||||
int buffer_length, int *zero, void *ptr)
|
||||
static int hdpu_slot_id_read(struct seq_file *seq, void *offset)
|
||||
{
|
||||
seq_printf(seq, "%d\n", slot_id);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (offset > 0)
|
||||
return 0;
|
||||
return sprintf(buffer, "%d\n", chassis_id);
|
||||
static int hdpu_chassis_id_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return single_open(file, hdpu_chassis_id_read, NULL);
|
||||
}
|
||||
|
||||
static int hdpu_chassis_id_read(struct seq_file *seq, void *offset)
|
||||
{
|
||||
seq_printf(seq, "%d\n", chassis_id);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int hdpu_nexus_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct resource *res;
|
||||
int *nexus_id_addr;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
int *nexus_id_addr;
|
||||
nexus_id_addr =
|
||||
ioremap(res->start, (unsigned long)(res->end - res->start));
|
||||
if (!res) {
|
||||
printk(KERN_ERR "sky_nexus: "
|
||||
"Invalid memory resource.\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
nexus_id_addr = ioremap(res->start,
|
||||
(unsigned long)(res->end - res->start));
|
||||
if (nexus_id_addr) {
|
||||
slot_id = (*nexus_id_addr >> 8) & 0x1f;
|
||||
chassis_id = *nexus_id_addr & 0xff;
|
||||
iounmap(nexus_id_addr);
|
||||
} else
|
||||
printk("Could not map slot id\n");
|
||||
} else {
|
||||
printk(KERN_ERR "sky_nexus: Could not map slot id\n");
|
||||
}
|
||||
|
||||
hdpu_slot_id = create_proc_entry("sky_slot_id", 0666, &proc_root);
|
||||
hdpu_slot_id->read_proc = hdpu_slot_id_read;
|
||||
if (!hdpu_slot_id) {
|
||||
printk(KERN_WARNING "sky_nexus: "
|
||||
"Unable to create proc dir entry: sky_slot_id\n");
|
||||
} else {
|
||||
hdpu_slot_id->proc_fops = &proc_slot_id;
|
||||
hdpu_slot_id->owner = THIS_MODULE;
|
||||
}
|
||||
|
||||
hdpu_chassis_id = create_proc_entry("sky_chassis_id", 0666, &proc_root);
|
||||
hdpu_chassis_id->read_proc = hdpu_chassis_id_read;
|
||||
if (!hdpu_chassis_id) {
|
||||
printk(KERN_WARNING "sky_nexus: "
|
||||
"Unable to create proc dir entry: sky_chassis_id\n");
|
||||
} else {
|
||||
hdpu_chassis_id->proc_fops = &proc_chassis_id;
|
||||
hdpu_chassis_id->owner = THIS_MODULE;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -81,18 +126,19 @@ static int hdpu_nexus_remove(struct platform_device *pdev)
|
||||
{
|
||||
slot_id = -1;
|
||||
chassis_id = -1;
|
||||
|
||||
remove_proc_entry("sky_slot_id", &proc_root);
|
||||
remove_proc_entry("sky_chassis_id", &proc_root);
|
||||
|
||||
hdpu_slot_id = 0;
|
||||
hdpu_chassis_id = 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __init nexus_init(void)
|
||||
{
|
||||
int rc;
|
||||
rc = platform_driver_register(&hdpu_nexus_driver);
|
||||
return rc;
|
||||
return platform_driver_register(&hdpu_nexus_driver);
|
||||
}
|
||||
|
||||
static void __exit nexus_exit(void)
|
||||
|
||||
Reference in New Issue
Block a user