History

Merge tag 'char-misc-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes from Greg KH: "Here are some small char and misc driver fixes for 4.13-rc2. All fix reported problems with 4.13-rc1 or older kernels (like the binder fixes). Full details in the shortlog. All have been in linux-next with no reported issues" * tag 'char-misc-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: w1: omap-hdq: fix error return code in omap_hdq_probe() regmap: regmap-w1: Fix build troubles w1: Fix slave count on 1-Wire bus (resend) mux: mux-core: unregister mux_class in mux_exit() mux: remove the Kconfig question for the subsystem nvmem: rockchip-efuse: amend compatible rk322x-efuse to rk3228-efuse drivers/fsi: fix fsi_slave_mode prototype fsi: core: register with postcore_initcall thunderbolt: Correct access permissions for active NVM contents vmbus: re-enable channel tasklet spmi: pmic-arb: Always allocate ppid_to_apid table MAINTAINERS: Add entry for SPMI subsystem spmi: Include OF based modalias in device uevent binder: Use wake up hint for synchronous transactions. binder: use group leader instead of open thread Revert "android: binder: Sanity check at binder ioctl"

Linus Torvalds committed 9 years ago

Commit dedaff22 parents 55fd939 c89876d13 files · +55 −44Browse files

Unified · Split

13 files
  1. Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt +1 −1
  2. MAINTAINERS +9 −0
  3. drivers/android/binder.c +8 −9
  4. drivers/fsi/fsi-core.c +3 −4
  5. drivers/hv/channel.c +2 −0
  6. drivers/mux/Kconfig +5 −14
  7. drivers/mux/mux-core.c +1 −1
  8. drivers/nvmem/rockchip-efuse.c +1 −1
  9. drivers/spmi/spmi-pmic-arb.c +7 −10
  10. drivers/spmi/spmi.c +12 −0
  11. drivers/thunderbolt/switch.c +2 −1
  12. drivers/w1/masters/omap_hdq.c +2 −1
  13. drivers/w1/w1.c +2 −2
Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt+1−1
@@ -4,7 +4,7 @@ Required properties: · 3 unmodified lines
44 - compatible: Should be one of the following.
55 - "rockchip,rk3066a-efuse" - for RK3066a SoCs.
66 - "rockchip,rk3188-efuse" - for RK3188 SoCs.
7− - "rockchip,rk322x-efuse" - for RK322x SoCs.
7+ - "rockchip,rk3228-efuse" - for RK3228 SoCs.
88 - "rockchip,rk3288-efuse" - for RK3288 SoCs.
99 - "rockchip,rk3399-efuse" - for RK3399 SoCs.
1010 - reg: Should contain the registers location and exact eFuse size
MAINTAINERS+9−0
@@ -12356,6 +12356,15 @@ S: Supported · 12355 unmodified lines
1235612356 F: Documentation/networking/spider_net.txt
1235712357 F: drivers/net/ethernet/toshiba/spider_net*
1235812358
12359+SPMI SUBSYSTEM
12360+R: Stephen Boyd <sboyd@codeaurora.org>
12361+L: linux-arm-msm@vger.kernel.org
12362+F: Documentation/devicetree/bindings/spmi/
12363+F: drivers/spmi/
12364+F: include/dt-bindings/spmi/spmi.h
12365+F: include/linux/spmi.h
12366+F: include/trace/events/spmi.h
12367+
1235912368 SPU FILE SYSTEM
1236012369 M: Jeremy Kerr <jk@ozlabs.org>
1236112370 L: linuxppc-dev@lists.ozlabs.org
drivers/android/binder.c+8−9
@@ -2200,8 +2200,12 @@ static void binder_transaction(struct binder_proc *proc, · 2199 unmodified lines
22002200 list_add_tail(&t->work.entry, target_list);
22012201 tcomplete->type = BINDER_WORK_TRANSACTION_COMPLETE;
22022202 list_add_tail(&tcomplete->entry, &thread->todo);
2203− if (target_wait)
2204− wake_up_interruptible(target_wait);
2203+ if (target_wait) {
2204+ if (reply || !(t->flags & TF_ONE_WAY))
2205+ wake_up_interruptible_sync(target_wait);
2206+ else
2207+ wake_up_interruptible(target_wait);
2208+ }
22052209 return;
22062210
22072211 err_translate_failed:
@@ -3247,10 +3251,6 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) · 1039 unmodified lines
32473251 /*pr_info("binder_ioctl: %d:%d %x %lx\n",
32483252 proc->pid, current->pid, cmd, arg);*/
32493253
3250− if (unlikely(current->mm != proc->vma_vm_mm)) {
3251− pr_err("current mm mismatch proc mm\n");
3252− return -EINVAL;
3253− }
32543254 trace_binder_ioctl(cmd, arg);
32553255
32563256 ret = wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);
@@ -3464,9 +3464,8 @@ static int binder_open(struct inode *nodp, struct file *filp) · 207 unmodified lines
34643464 proc = kzalloc(sizeof(*proc), GFP_KERNEL);
34653465 if (proc == NULL)
34663466 return -ENOMEM;
3467− get_task_struct(current);
3468− proc->tsk = current;
3469− proc->vma_vm_mm = current->mm;
3467+ get_task_struct(current->group_leader);
3468+ proc->tsk = current->group_leader;
34703469 INIT_LIST_HEAD(&proc->todo);
34713470 init_waitqueue_head(&proc->wait);
34723471 proc->default_priority = task_nice(current);
drivers/fsi/fsi-core.c+3−4
@@ -532,7 +532,7 @@ static inline uint32_t fsi_smode_sid(int x) · 531 unmodified lines
532532 return (x & FSI_SMODE_SID_MASK) << FSI_SMODE_SID_SHIFT;
533533 }
534534
535−static const uint32_t fsi_slave_smode(int id)
535+static uint32_t fsi_slave_smode(int id)
536536 {
537537 return FSI_SMODE_WSC | FSI_SMODE_ECRC
538538 | fsi_smode_sid(id)
@@ -883,17 +883,16 @@ struct bus_type fsi_bus_type = { · 344 unmodified lines
883883 };
884884 EXPORT_SYMBOL_GPL(fsi_bus_type);
885885
886−static int fsi_init(void)
886+static int __init fsi_init(void)
887887 {
888888 return bus_register(&fsi_bus_type);
889889 }
890+postcore_initcall(fsi_init);
890891
891892 static void fsi_exit(void)
892893 {
893894 bus_unregister(&fsi_bus_type);
894895 }
895−
896−module_init(fsi_init);
897896 module_exit(fsi_exit);
898897 module_param(discard_errors, int, 0664);
899898 MODULE_LICENSE("GPL");
drivers/hv/channel.c+2−0
@@ -606,6 +606,8 @@ static int vmbus_close_internal(struct vmbus_channel *channel) · 605 unmodified lines
606606 get_order(channel->ringbuffer_pagecount * PAGE_SIZE));
607607
608608 out:
609+ /* re-enable tasklet for use on re-open */
610+ tasklet_enable(&channel->callback_event);
609611 return ret;
610612 }
611613
drivers/mux/Kconfig+5−14
@@ -2,20 +2,11 @@ · 1 unmodified line
22 # Multiplexer devices
33 #
44
5−menuconfig MULTIPLEXER
6− tristate "Multiplexer subsystem"
7− help
8− Multiplexer controller subsystem. Multiplexers are used in a
9− variety of settings, and this subsystem abstracts their use
10− so that the rest of the kernel sees a common interface. When
11− multiple parallel multiplexers are controlled by one single
12− multiplexer controller, this subsystem also coordinates the
13− multiplexer accesses.
14−
15− To compile the subsystem as a module, choose M here: the module will
16− be called mux-core.
5+config MULTIPLEXER
6+ tristate
177
18−if MULTIPLEXER
8+menu "Multiplexer drivers"
9+ depends on MULTIPLEXER
1910
2011 config MUX_ADG792A
2112 tristate "Analog Devices ADG792A/ADG792G Multiplexers"
@@ -56,4 +47,4 @@ config MUX_MMIO · 34 unmodified lines
5647 To compile the driver as a module, choose M here: the module will
5748 be called mux-mmio.
5849
59−endif
50+endmenu
drivers/mux/mux-core.c+1−1
@@ -46,7 +46,7 @@ static int __init mux_init(void) · 45 unmodified lines
4646
4747 static void __exit mux_exit(void)
4848 {
49− class_register(&mux_class);
49+ class_unregister(&mux_class);
5050 ida_destroy(&mux_ida);
5151 }
5252
drivers/nvmem/rockchip-efuse.c+1−1
@@ -170,7 +170,7 @@ static const struct of_device_id rockchip_efuse_match[] = { · 169 unmodified lines
170170 .data = (void *)&rockchip_rk3288_efuse_read,
171171 },
172172 {
173− .compatible = "rockchip,rk322x-efuse",
173+ .compatible = "rockchip,rk3228-efuse",
174174 .data = (void *)&rockchip_rk3288_efuse_read,
175175 },
176176 {
drivers/spmi/spmi-pmic-arb.c+7−10
@@ -134,7 +134,6 @@ struct apid_data { · 133 unmodified lines
134134 * @spmic: SPMI controller object
135135 * @ver_ops: version dependent operations.
136136 * @ppid_to_apid in-memory copy of PPID -> channel (APID) mapping table.
137− * v2 only.
138137 */
139138 struct spmi_pmic_arb {
140139 void __iomem *rd_base;
@@ -1016,6 +1015,13 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) · 875 unmodified lines
10161015 goto err_put_ctrl;
10171016 }
10181017
1018+ pa->ppid_to_apid = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PPID,
1019+ sizeof(*pa->ppid_to_apid), GFP_KERNEL);
1020+ if (!pa->ppid_to_apid) {
1021+ err = -ENOMEM;
1022+ goto err_put_ctrl;
1023+ }
1024+
10191025 hw_ver = readl_relaxed(core + PMIC_ARB_VERSION);
10201026
10211027 if (hw_ver < PMIC_ARB_VERSION_V2_MIN) {
@@ -1048,15 +1054,6 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) · 26 unmodified lines
10481054 err = PTR_ERR(pa->wr_base);
10491055 goto err_put_ctrl;
10501056 }
1051−
1052− pa->ppid_to_apid = devm_kcalloc(&ctrl->dev,
1053− PMIC_ARB_MAX_PPID,
1054− sizeof(*pa->ppid_to_apid),
1055− GFP_KERNEL);
1056− if (!pa->ppid_to_apid) {
1057− err = -ENOMEM;
1058− goto err_put_ctrl;
1059− }
10601057 }
10611058
10621059 dev_info(&ctrl->dev, "PMIC arbiter version %s (0x%x)\n",
drivers/spmi/spmi.c+12−0
@@ -365,11 +365,23 @@ static int spmi_drv_remove(struct device *dev) · 364 unmodified lines
365365 return 0;
366366 }
367367
368+static int spmi_drv_uevent(struct device *dev, struct kobj_uevent_env *env)
369+{
370+ int ret;
371+
372+ ret = of_device_uevent_modalias(dev, env);
373+ if (ret != -ENODEV)
374+ return ret;
375+
376+ return 0;
377+}
378+
368379 static struct bus_type spmi_bus_type = {
369380 .name = "spmi",
370381 .match = spmi_device_match,
371382 .probe = spmi_drv_probe,
372383 .remove = spmi_drv_remove,
384+ .uevent = spmi_drv_uevent,
373385 };
374386
375387 /**
drivers/thunderbolt/switch.c+2−1
@@ -281,9 +281,11 @@ static struct nvmem_device *register_nvmem(struct tb_switch *sw, int id, · 280 unmodified lines
281281 if (active) {
282282 config.name = "nvm_active";
283283 config.reg_read = tb_switch_nvm_read;
284+ config.read_only = true;
284285 } else {
285286 config.name = "nvm_non_active";
286287 config.reg_write = tb_switch_nvm_write;
288+ config.root_only = true;
287289 }
288290
289291 config.id = id;
@@ -292,7 +294,6 @@ static struct nvmem_device *register_nvmem(struct tb_switch *sw, int id, · 2 unmodified lines
292294 config.size = size;
293295 config.dev = &sw->dev;
294296 config.owner = THIS_MODULE;
295− config.root_only = true;
296297 config.priv = sw;
297298
298299 return nvmem_register(&config);
drivers/w1/masters/omap_hdq.c+2−1
@@ -704,7 +704,8 @@ static int omap_hdq_probe(struct platform_device *pdev) · 703 unmodified lines
704704
705705 irq = platform_get_irq(pdev, 0);
706706 if (irq < 0) {
707− ret = -ENXIO;
707+ dev_dbg(&pdev->dev, "Failed to get IRQ: %d\n", irq);
708+ ret = irq;
708709 goto err_irq;
709710 }
710711
drivers/w1/w1.c+2−2
@@ -728,6 +728,7 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn) · 727 unmodified lines
728728 memcpy(&sl->reg_num, rn, sizeof(sl->reg_num));
729729 atomic_set(&sl->refcnt, 1);
730730 atomic_inc(&sl->master->refcnt);
731+ dev->slave_count++;
731732
732733 /* slave modules need to be loaded in a context with unlocked mutex */
733734 mutex_unlock(&dev->mutex);
@@ -747,11 +748,11 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn) · 13 unmodified lines
747748
748749 sl->family = f;
749750
750−
751751 err = __w1_attach_slave_device(sl);
752752 if (err < 0) {
753753 dev_err(&dev->dev, "%s: Attaching %s failed.\n", __func__,
754754 sl->name);
755+ dev->slave_count--;
755756 w1_family_put(sl->family);
756757 atomic_dec(&sl->master->refcnt);
757758 kfree(sl);
@@ -759,7 +760,6 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn) · 1 unmodified line
759760 }
760761
761762 sl->ttl = dev->slave_ttl;
762− dev->slave_count++;
763763
764764 memcpy(msg.id.id, rn, sizeof(msg.id));
765765 msg.type = W1_SLAVE_ADD;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t