Changes in 4.9.337 mm/khugepaged: fix GUP-fast interaction by sending IPI mm/khugepaged: invoke MMU notifiers in shmem/file collapse paths block: unhash blkdev part inode when the part is deleted ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() can: sja1000: fix size of OCR_MODE_MASK define ASoC: ops: Correct bounds check for second channel on SX controls udf: Discard preallocation before extending file with a hole udf: Drop unused arguments of udf_delete_aext() udf: Fix preallocation discarding at indirect extent boundary udf: Do not bother looking for prealloc extents if i_lenExtents matches i_size udf: Fix extending file within last block usb: gadget: uvc: Prevent buffer overflow in setup handler USB: serial: cp210x: add Kamstrup RF sniffer PIDs Bluetooth: L2CAP: Fix u8 overflow net: loopback: use NET_NAME_PREDICTABLE for name_assign_type drivers: soc: ti: knav_qmss_queue: Mark knav_acc_firmwares as static arm: dts: spear600: Fix clcd interrupt soc: ti: smartreflex: Fix PM disable depth imbalance in omap_sr_probe ARM: dts: dove: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-370: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-xp: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-375: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-38x: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-39x: Fix assigned-addresses for every PCIe Root Port ARM: mmp: fix timer_read delay pstore: Avoid kcore oops by vmap()ing with VM_IOREMAP cpuidle: dt: Return the correct numbers of parsed idle states alpha: fix syscall entry in !AUDUT_SYSCALL case PM: hibernate: Fix mistake in kerneldoc comment fs: don't audit the capability check in simple_xattr_list() perf: Fix possible memleak in pmu_dev_alloc() timerqueue: Use rb_entry_safe() in timerqueue_getnext() ocfs2: fix memory leak in ocfs2_stack_glue_init() MIPS: vpe-mt: fix possible memory leak while module exiting MIPS: vpe-cmp: fix possible memory leak while module exiting PNP: fix name memory leak in pnp_alloc_dev() irqchip: gic-pm: Use pm_runtime_resume_and_get() in gic_probe() libfs: add DEFINE_SIMPLE_ATTRIBUTE_SIGNED for signed value lib/notifier-error-inject: fix error when writing -errno to debugfs file rapidio: fix possible name leaks when rio_add_device() fails rapidio: rio: fix possible name leak in rio_register_mport() ACPICA: Fix use-after-free in acpi_ut_copy_ipackage_to_ipackage() uprobes/x86: Allow to probe a NOP instruction with 0x66 prefix x86/xen: Fix memory leak in xen_init_lock_cpu() MIPS: BCM63xx: Add check for NULL for clk in clk_enable fs: sysv: Fix sysv_nblocks() returns wrong value rapidio: fix possible UAF when kfifo_alloc() fails eventfd: change int to __u64 in eventfd_signal() ifndef CONFIG_EVENTFD hfs: Fix OOB Write in hfs_asc2mac rapidio: devices: fix missing put_device in mport_cdev_open wifi: ath9k: hif_usb: fix memory leak of urbs in ath9k_hif_usb_dealloc_tx_urbs() wifi: ath9k: hif_usb: Fix use-after-free in ath9k_hif_usb_reg_in_cb() media: i2c: ad5820: Fix error path media: vivid: fix compose size exceed boundary mtd: Fix device name leak when register device failed in add_mtd_device() ASoC: pxa: fix null-pointer dereference in filter() regulator: core: fix unbalanced of node refcount in regulator_dev_lookup() ima: Fix misuse of dereference of pointer in template_desc_init_fields() wifi: ath10k: Fix return value in ath10k_pci_init() mtd: lpddr2_nvm: Fix possible null-ptr-deref Input: elants_i2c - properly handle the reset GPIO when power is off media: solo6x10: fix possible memory leak in solo_sysfs_init() media: platform: exynos4-is: Fix error handling in fimc_md_init() HID: hid-sensor-custom: set fixed size for custom attributes ALSA: seq: fix undefined behavior in bit shift for SNDRV_SEQ_FILTER_USE_EVENT clk: rockchip: Fix memory leak in rockchip_clk_register_pll() mtd: maps: pxa2xx-flash: fix memory leak in probe media: imon: fix a race condition in send_packet() pinctrl: pinconf-generic: add missing of_node_put() media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer() NFSv4.2: Fix a memory stomp in decode_attr_security_label NFSv4: Fix a deadlock between nfs4_open_recover_helper() and delegreturn ALSA: asihpi: fix missing pci_disable_device() drm/radeon: Fix PCI device refcount leak in radeon_atrm_get_bios() drm/amdgpu: Fix PCI device refcount leak in amdgpu_atrm_get_bios() ASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe bonding: uninitialized variable in bond_miimon_inspect() regulator: core: fix module refcount leak in set_supply() media: saa7164: fix missing pci_disable_device() ALSA: mts64: fix possible null-ptr-defer in snd_mts64_interrupt SUNRPC: Fix missing release socket in rpc_sockname() mmc: moxart: fix return value check of mmc_add_host() mmc: mxcmmc: fix return value check of mmc_add_host() mmc: rtsx_usb_sdmmc: fix return value check of mmc_add_host() mmc: toshsd: fix return value check of mmc_add_host() mmc: vub300: fix return value check of mmc_add_host() mmc: via-sdmmc: fix return value check of mmc_add_host() mmc: wbsd: fix return value check of mmc_add_host() mmc: mmci: fix return value check of mmc_add_host() media: c8sectpfe: Add of_node_put() when breaking out of loop media: coda: Add check for dcoda_iram_alloc media: coda: Add check for kmalloc wifi: rtl8xxxu: Add __packed to struct rtl8723bu_c2h wifi: brcmfmac: Fix error return code in brcmf_sdio_download_firmware() blktrace: Fix output non-blktrace event when blk_classic option enabled net: vmw_vsock: vmci: Check memcpy_from_msg() net: defxx: Fix missing err handling in dfx_init() drivers: net: qlcnic: Fix potential memory leak in qlcnic_sriov_init() ethernet: s2io: don't call dev_kfree_skb() under spin_lock_irqsave() net: farsync: Fix kmemleak when rmmods farsync net/tunnel: wait until all sk_user_data reader finish before releasing the sock net: apple: mace: don't call dev_kfree_skb() under spin_lock_irqsave() net: apple: bmac: don't call dev_kfree_skb() under spin_lock_irqsave() net: emaclite: don't call dev_kfree_skb() under spin_lock_irqsave() net: ethernet: dnet: don't call dev_kfree_skb() under spin_lock_irqsave() hamradio: don't call dev_kfree_skb() under spin_lock_irqsave() net: amd: lance: don't call dev_kfree_skb() under spin_lock_irqsave() ntb_netdev: Use dev_kfree_skb_any() in interrupt context Bluetooth: btusb: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_qca: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_h5: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_bcsp: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_core: don't call kfree_skb() under spin_lock_irqsave() stmmac: fix potential division by 0 scsi: hpsa: Fix error handling in hpsa_add_sas_host() scsi: hpsa: Fix possible memory leak in hpsa_add_sas_device() scsi: fcoe: Fix possible name leak when device_register() fails scsi: ipr: Fix WARNING in ipr_init() scsi: fcoe: Fix transport not deattached when fcoe_if_init() fails scsi: snic: Fix possible UAF in snic_tgt_create() orangefs: Fix sysfs not cleanup when dev init failed crypto: img-hash - Fix variable dereferenced before check 'hdev->req' hwrng: amd - Fix PCI device refcount leak hwrng: geode - Fix PCI device refcount leak IB/IPoIB: Fix queue count inconsistency for PKEY child interfaces drivers: dio: fix possible memory leak in dio_init() vfio: platform: Do not pass return buffer to ACPI _RST method uio: uio_dmem_genirq: Fix missing unlock in irq configuration uio: uio_dmem_genirq: Fix deadlock between irq config and handling usb: fotg210-udc: Fix ages old endianness issues staging: vme_user: Fix possible UAF in tsi148_dma_list_add serial: amba-pl011: avoid SBSA UART accessing DMACR register serial: pch: Fix PCI device refcount leak in pch_request_dma() serial: sunsab: Fix error handling in sunsab_init() misc: tifm: fix possible memory leak in tifm_7xx1_switch_media() misc: sgi-gru: fix use-after-free error in gru_set_context_option, gru_fault and gru_handle_user_call_os cxl: fix possible null-ptr-deref in cxl_guest_init_afu|adapter() cxl: fix possible null-ptr-deref in cxl_pci_init_afu|adapter() drivers: mcb: fix resource leak in mcb_probe() mcb: mcb-parse: fix error handing in chameleon_parse_gdd() chardev: fix error handling in cdev_device_add() i2c: pxa-pci: fix missing pci_disable_device() on error in ce4100_i2c_probe staging: rtl8192u: Fix use after free in ieee80211_rx() staging: rtl8192e: Fix potential use-after-free in rtllib_rx_Monitor() vme: Fix error not catched in fake_init() i2c: ismt: Fix an out-of-bounds bug in ismt_access() usb: storage: Add check for kcalloc fbdev: ssd1307fb: Drop optional dependency fbdev: pm2fb: fix missing pci_disable_device() fbdev: via: Fix error in via_core_init() fbdev: vermilion: decrease reference count in error path fbdev: uvesafb: Fixes an error handling path in uvesafb_probe() HSI: omap_ssi_core: fix unbalanced pm_runtime_disable() HSI: omap_ssi_core: fix possible memory leak in ssi_probe() power: supply: fix residue sysfs file in error handle route of __power_supply_register() HSI: omap_ssi_core: Fix error handling in ssi_init() include/uapi/linux/swab: Fix potentially missing __always_inline rtc: snvs: Allow a time difference on clock register read iommu/fsl_pamu: Fix resource leak in fsl_pamu_probe() macintosh: fix possible memory leak in macio_add_one_device() macintosh/macio-adb: check the return value of ioremap() powerpc/52xx: Fix a resource leak in an error handling path powerpc/perf: callchain validate kernel stack pointer bounds powerpc/83xx/mpc832x_rdb: call platform_device_put() in error case in of_fsl_spi_probe() powerpc/hv-gpci: Fix hv_gpci event list selftests/powerpc: Fix resource leaks rtc: st-lpc: Add missing clk_disable_unprepare in st_rtc_probe() nfsd: under NFSv4.1, fix double svc_xprt_put on rpc_create failure mISDN: hfcsusb: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() mISDN: hfcpci: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() mISDN: hfcmulti: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() nfc: pn533: Clear nfc_target before being used r6040: Fix kmemleak in probe and remove openvswitch: Fix flow lookup to use unmasked key skbuff: Account for tail adjustment during pull operations net_sched: reject TCF_EM_SIMPLE case for complex ematch module myri10ge: Fix an error handling path in myri10ge_probe() net: stream: purge sk_error_queue in sk_stream_kill_queues() binfmt_misc: fix shift-out-of-bounds in check_special_flags fs: jfs: fix shift-out-of-bounds in dbAllocAG udf: Avoid double brelse() in udf_rename() fs: jfs: fix shift-out-of-bounds in dbDiscardAG ACPICA: Fix error code path in acpi_ds_call_control_method() nilfs2: fix shift-out-of-bounds/overflow in nilfs_sb2_bad_offset() acct: fix potential integer overflow in encode_comp_t() hfs: fix OOB Read in __hfs_brec_find wifi: ath9k: verify the expected usb_endpoints are present wifi: ar5523: Fix use-after-free on ar5523_cmd() timed out ipmi: fix memleak when unload ipmi driver net: ethernet: ti: Fix return type of netcp_ndo_start_xmit() hamradio: baycom_epp: Fix return type of baycom_send_packet() wifi: brcmfmac: Fix potential shift-out-of-bounds in brcmf_fw_alloc_request() igb: Do not free q_vector unless new one was allocated s390/ctcm: Fix return type of ctc{mp,}m_tx() s390/netiucv: Fix return type of netiucv_tx() s390/lcs: Fix return type of lcs_start_xmit() drm/sti: Use drm_mode_copy() md/raid1: stop mdx_raid1 thread when raid1 array run failed mrp: introduce active flags to prevent UAF when applicant uninit ppp: associate skb with a device at tx media: dvb-frontends: fix leak of memory fw media: dvb-usb: fix memory leak in dvb_usb_adapter_init() blk-mq: fix possible memleak when register 'hctx' failed mmc: f-sdh30: Add quirks for broken timeout clock capability media: si470x: Fix use-after-free in si470x_int_in_callback() clk: st: Fix memory leak in st_of_quadfs_setup() drm/fsl-dcu: Fix return type of fsl_dcu_drm_connector_mode_valid() drm/sti: Fix return type of sti_{dvo,hda,hdmi}_connector_mode_valid() orangefs: Fix kmemleak in orangefs_prepare_debugfs_help_string() ASoC: mediatek: mt8173-rt5650-rt5514: fix refcount leak in mt8173_rt5650_rt5514_dev_probe() ASoC: wm8994: Fix potential deadlock ASoC: rockchip: spdif: Add missing clk_disable_unprepare() in rk_spdif_runtime_resume() ASoC: rt5670: Remove unbalanced pm_runtime_put() HID: wacom: Ensure bootloader PID is usable in hidraw mode reiserfs: Add missing calls to reiserfs_security_free() iio: adc: ad_sigma_delta: do not use internal iio_dev lock gcov: add support for checksum field powerpc/rtas: avoid scheduling in rtas_os_term() HID: plantronics: Additional PIDs for double volume key presses quirk hfsplus: fix bug causing custom uid and gid being unable to be assigned with mount ALSA: line6: correct midi status byte when receiving data from podxt ALSA: line6: fix stack overflow in line6_midi_transmit pnode: terminate at peers of source md: fix a crash in mempool_free mmc: vub300: fix warning - do not call blocking ops when !TASK_RUNNING media: stv0288: use explicitly signed char ktest.pl minconfig: Unset configs instead of just removing them ARM: ux500: do not directly dereference __iomem dm cache: Fix ABBA deadlock between shrink_slab and dm_cache_metadata_abort dm thin: Use last transaction's pmd->root when commit failed dm thin: Fix UAF in run_timer_softirq() dm cache: Fix UAF in destroy() dm cache: set needs_check flag after aborting metadata tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line ARM: 9256/1: NWFPE: avoid compiler-generated __aeabi_uldivmod media: dvb-core: Fix double free in dvb_register_device() cifs: fix confusing debug message PCI/sysfs: Fix double free in error path crypto: n2 - add missing hash statesize iommu/amd: Fix ivrs_acpihid cmdline parsing code parisc: led: Fix potential null-ptr-deref in start_task() device_cgroup: Roll back to original exceptions after copy failure drm/connector: send hotplug uevent on connector cleanup drm/vmwgfx: Validate the box size for the snooped cursor ext4: add inode table check in __ext4_get_inode_loc to aovid possible infinite loop ext4: fix undefined behavior in bit shift for ext4_check_flag_values ext4: fix bug_on in __es_tree_search caused by bad boot loader inode ext4: init quota for 'old.inode' in 'ext4_rename' ext4: fix error code return to user-space in ext4_get_branch() ext4: avoid BUG_ON when creating xattrs ext4: initialize quota before expanding inode in setproject ioctl Linux 4.9.337 Change-Id: I923e3fef499ae1688b25c70a1a805b55a9f4f027 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
508 lines
10 KiB
C
508 lines
10 KiB
C
/*
|
|
* MEN Chameleon Bus.
|
|
*
|
|
* Copyright (C) 2013 MEN Mikroelektronik GmbH (www.men.de)
|
|
* Author: Johannes Thumshirn <johannes.thumshirn@men.de>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the Free
|
|
* Software Foundation; version 2 of the License.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/types.h>
|
|
#include <linux/idr.h>
|
|
#include <linux/mcb.h>
|
|
|
|
static DEFINE_IDA(mcb_ida);
|
|
|
|
static const struct mcb_device_id *mcb_match_id(const struct mcb_device_id *ids,
|
|
struct mcb_device *dev)
|
|
{
|
|
if (ids) {
|
|
while (ids->device) {
|
|
if (ids->device == dev->id)
|
|
return ids;
|
|
ids++;
|
|
}
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static int mcb_match(struct device *dev, struct device_driver *drv)
|
|
{
|
|
struct mcb_driver *mdrv = to_mcb_driver(drv);
|
|
struct mcb_device *mdev = to_mcb_device(dev);
|
|
const struct mcb_device_id *found_id;
|
|
|
|
found_id = mcb_match_id(mdrv->id_table, mdev);
|
|
if (found_id)
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int mcb_uevent(struct device *dev, struct kobj_uevent_env *env)
|
|
{
|
|
struct mcb_device *mdev = to_mcb_device(dev);
|
|
int ret;
|
|
|
|
ret = add_uevent_var(env, "MODALIAS=mcb:16z%03d", mdev->id);
|
|
if (ret)
|
|
return -ENOMEM;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int mcb_probe(struct device *dev)
|
|
{
|
|
struct mcb_driver *mdrv = to_mcb_driver(dev->driver);
|
|
struct mcb_device *mdev = to_mcb_device(dev);
|
|
const struct mcb_device_id *found_id;
|
|
struct module *carrier_mod;
|
|
int ret;
|
|
|
|
found_id = mcb_match_id(mdrv->id_table, mdev);
|
|
if (!found_id)
|
|
return -ENODEV;
|
|
|
|
carrier_mod = mdev->dev.parent->driver->owner;
|
|
if (!try_module_get(carrier_mod))
|
|
return -EINVAL;
|
|
|
|
get_device(dev);
|
|
ret = mdrv->probe(mdev, found_id);
|
|
if (ret) {
|
|
module_put(carrier_mod);
|
|
put_device(dev);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int mcb_remove(struct device *dev)
|
|
{
|
|
struct mcb_driver *mdrv = to_mcb_driver(dev->driver);
|
|
struct mcb_device *mdev = to_mcb_device(dev);
|
|
struct module *carrier_mod;
|
|
|
|
mdrv->remove(mdev);
|
|
|
|
carrier_mod = mdev->dev.parent->driver->owner;
|
|
module_put(carrier_mod);
|
|
|
|
put_device(&mdev->dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void mcb_shutdown(struct device *dev)
|
|
{
|
|
struct mcb_driver *mdrv = to_mcb_driver(dev->driver);
|
|
struct mcb_device *mdev = to_mcb_device(dev);
|
|
|
|
if (mdrv && mdrv->shutdown)
|
|
mdrv->shutdown(mdev);
|
|
}
|
|
|
|
static ssize_t revision_show(struct device *dev, struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct mcb_bus *bus = to_mcb_bus(dev);
|
|
|
|
return scnprintf(buf, PAGE_SIZE, "%d\n", bus->revision);
|
|
}
|
|
static DEVICE_ATTR_RO(revision);
|
|
|
|
static ssize_t model_show(struct device *dev, struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct mcb_bus *bus = to_mcb_bus(dev);
|
|
|
|
return scnprintf(buf, PAGE_SIZE, "%c\n", bus->model);
|
|
}
|
|
static DEVICE_ATTR_RO(model);
|
|
|
|
static ssize_t minor_show(struct device *dev, struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct mcb_bus *bus = to_mcb_bus(dev);
|
|
|
|
return scnprintf(buf, PAGE_SIZE, "%d\n", bus->minor);
|
|
}
|
|
static DEVICE_ATTR_RO(minor);
|
|
|
|
static ssize_t name_show(struct device *dev, struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct mcb_bus *bus = to_mcb_bus(dev);
|
|
|
|
return scnprintf(buf, PAGE_SIZE, "%s\n", bus->name);
|
|
}
|
|
static DEVICE_ATTR_RO(name);
|
|
|
|
static struct attribute *mcb_bus_attrs[] = {
|
|
&dev_attr_revision.attr,
|
|
&dev_attr_model.attr,
|
|
&dev_attr_minor.attr,
|
|
&dev_attr_name.attr,
|
|
NULL,
|
|
};
|
|
|
|
static const struct attribute_group mcb_carrier_group = {
|
|
.attrs = mcb_bus_attrs,
|
|
};
|
|
|
|
static const struct attribute_group *mcb_carrier_groups[] = {
|
|
&mcb_carrier_group,
|
|
NULL,
|
|
};
|
|
|
|
|
|
static struct bus_type mcb_bus_type = {
|
|
.name = "mcb",
|
|
.match = mcb_match,
|
|
.uevent = mcb_uevent,
|
|
.probe = mcb_probe,
|
|
.remove = mcb_remove,
|
|
.shutdown = mcb_shutdown,
|
|
};
|
|
|
|
static struct device_type mcb_carrier_device_type = {
|
|
.name = "mcb-carrier",
|
|
.groups = mcb_carrier_groups,
|
|
};
|
|
|
|
/**
|
|
* __mcb_register_driver() - Register a @mcb_driver at the system
|
|
* @drv: The @mcb_driver
|
|
* @owner: The @mcb_driver's module
|
|
* @mod_name: The name of the @mcb_driver's module
|
|
*
|
|
* Register a @mcb_driver at the system. Perform some sanity checks, if
|
|
* the .probe and .remove methods are provided by the driver.
|
|
*/
|
|
int __mcb_register_driver(struct mcb_driver *drv, struct module *owner,
|
|
const char *mod_name)
|
|
{
|
|
if (!drv->probe || !drv->remove)
|
|
return -EINVAL;
|
|
|
|
drv->driver.owner = owner;
|
|
drv->driver.bus = &mcb_bus_type;
|
|
drv->driver.mod_name = mod_name;
|
|
|
|
return driver_register(&drv->driver);
|
|
}
|
|
EXPORT_SYMBOL_GPL(__mcb_register_driver);
|
|
|
|
/**
|
|
* mcb_unregister_driver() - Unregister a @mcb_driver from the system
|
|
* @drv: The @mcb_driver
|
|
*
|
|
* Unregister a @mcb_driver from the system.
|
|
*/
|
|
void mcb_unregister_driver(struct mcb_driver *drv)
|
|
{
|
|
driver_unregister(&drv->driver);
|
|
}
|
|
EXPORT_SYMBOL_GPL(mcb_unregister_driver);
|
|
|
|
static void mcb_release_dev(struct device *dev)
|
|
{
|
|
struct mcb_device *mdev = to_mcb_device(dev);
|
|
|
|
mcb_bus_put(mdev->bus);
|
|
kfree(mdev);
|
|
}
|
|
|
|
/**
|
|
* mcb_device_register() - Register a mcb_device
|
|
* @bus: The @mcb_bus of the device
|
|
* @dev: The @mcb_device
|
|
*
|
|
* Register a specific @mcb_device at a @mcb_bus and the system itself.
|
|
*/
|
|
int mcb_device_register(struct mcb_bus *bus, struct mcb_device *dev)
|
|
{
|
|
int ret;
|
|
int device_id;
|
|
|
|
device_initialize(&dev->dev);
|
|
mcb_bus_get(bus);
|
|
dev->dev.bus = &mcb_bus_type;
|
|
dev->dev.parent = bus->dev.parent;
|
|
dev->dev.release = mcb_release_dev;
|
|
dev->dma_dev = bus->carrier;
|
|
|
|
device_id = dev->id;
|
|
dev_set_name(&dev->dev, "mcb%d-16z%03d-%d:%d:%d",
|
|
bus->bus_nr, device_id, dev->inst, dev->group, dev->var);
|
|
|
|
ret = device_add(&dev->dev);
|
|
if (ret < 0) {
|
|
pr_err("Failed registering device 16z%03d on bus mcb%d (%d)\n",
|
|
device_id, bus->bus_nr, ret);
|
|
goto out;
|
|
}
|
|
|
|
return 0;
|
|
|
|
out:
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(mcb_device_register);
|
|
|
|
static void mcb_free_bus(struct device *dev)
|
|
{
|
|
struct mcb_bus *bus = to_mcb_bus(dev);
|
|
|
|
put_device(bus->carrier);
|
|
ida_simple_remove(&mcb_ida, bus->bus_nr);
|
|
kfree(bus);
|
|
}
|
|
|
|
/**
|
|
* mcb_alloc_bus() - Allocate a new @mcb_bus
|
|
*
|
|
* Allocate a new @mcb_bus.
|
|
*/
|
|
struct mcb_bus *mcb_alloc_bus(struct device *carrier)
|
|
{
|
|
struct mcb_bus *bus;
|
|
int bus_nr;
|
|
int rc;
|
|
|
|
bus = kzalloc(sizeof(struct mcb_bus), GFP_KERNEL);
|
|
if (!bus)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
bus_nr = ida_simple_get(&mcb_ida, 0, 0, GFP_KERNEL);
|
|
if (bus_nr < 0) {
|
|
kfree(bus);
|
|
return ERR_PTR(bus_nr);
|
|
}
|
|
|
|
bus->bus_nr = bus_nr;
|
|
bus->carrier = get_device(carrier);
|
|
|
|
device_initialize(&bus->dev);
|
|
bus->dev.parent = carrier;
|
|
bus->dev.bus = &mcb_bus_type;
|
|
bus->dev.type = &mcb_carrier_device_type;
|
|
bus->dev.release = &mcb_free_bus;
|
|
|
|
dev_set_name(&bus->dev, "mcb:%d", bus_nr);
|
|
rc = device_add(&bus->dev);
|
|
if (rc)
|
|
goto err_put;
|
|
|
|
return bus;
|
|
|
|
err_put:
|
|
put_device(&bus->dev);
|
|
return ERR_PTR(rc);
|
|
}
|
|
EXPORT_SYMBOL_GPL(mcb_alloc_bus);
|
|
|
|
static int __mcb_devices_unregister(struct device *dev, void *data)
|
|
{
|
|
device_unregister(dev);
|
|
return 0;
|
|
}
|
|
|
|
static void mcb_devices_unregister(struct mcb_bus *bus)
|
|
{
|
|
bus_for_each_dev(&mcb_bus_type, NULL, NULL, __mcb_devices_unregister);
|
|
}
|
|
/**
|
|
* mcb_release_bus() - Free a @mcb_bus
|
|
* @bus: The @mcb_bus to release
|
|
*
|
|
* Release an allocated @mcb_bus from the system.
|
|
*/
|
|
void mcb_release_bus(struct mcb_bus *bus)
|
|
{
|
|
mcb_devices_unregister(bus);
|
|
}
|
|
EXPORT_SYMBOL_GPL(mcb_release_bus);
|
|
|
|
/**
|
|
* mcb_bus_put() - Increment refcnt
|
|
* @bus: The @mcb_bus
|
|
*
|
|
* Get a @mcb_bus' ref
|
|
*/
|
|
struct mcb_bus *mcb_bus_get(struct mcb_bus *bus)
|
|
{
|
|
if (bus)
|
|
get_device(&bus->dev);
|
|
|
|
return bus;
|
|
}
|
|
EXPORT_SYMBOL_GPL(mcb_bus_get);
|
|
|
|
/**
|
|
* mcb_bus_put() - Decrement refcnt
|
|
* @bus: The @mcb_bus
|
|
*
|
|
* Release a @mcb_bus' ref
|
|
*/
|
|
void mcb_bus_put(struct mcb_bus *bus)
|
|
{
|
|
if (bus)
|
|
put_device(&bus->dev);
|
|
}
|
|
EXPORT_SYMBOL_GPL(mcb_bus_put);
|
|
|
|
/**
|
|
* mcb_alloc_dev() - Allocate a device
|
|
* @bus: The @mcb_bus the device is part of
|
|
*
|
|
* Allocate a @mcb_device and add bus.
|
|
*/
|
|
struct mcb_device *mcb_alloc_dev(struct mcb_bus *bus)
|
|
{
|
|
struct mcb_device *dev;
|
|
|
|
dev = kzalloc(sizeof(struct mcb_device), GFP_KERNEL);
|
|
if (!dev)
|
|
return NULL;
|
|
|
|
dev->bus = bus;
|
|
|
|
return dev;
|
|
}
|
|
EXPORT_SYMBOL_GPL(mcb_alloc_dev);
|
|
|
|
/**
|
|
* mcb_free_dev() - Free @mcb_device
|
|
* @dev: The device to free
|
|
*
|
|
* Free a @mcb_device
|
|
*/
|
|
void mcb_free_dev(struct mcb_device *dev)
|
|
{
|
|
kfree(dev);
|
|
}
|
|
EXPORT_SYMBOL_GPL(mcb_free_dev);
|
|
|
|
static int __mcb_bus_add_devices(struct device *dev, void *data)
|
|
{
|
|
struct mcb_device *mdev = to_mcb_device(dev);
|
|
int retval;
|
|
|
|
if (mdev->is_added)
|
|
return 0;
|
|
|
|
retval = device_attach(dev);
|
|
if (retval < 0)
|
|
dev_err(dev, "Error adding device (%d)\n", retval);
|
|
|
|
mdev->is_added = true;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* mcb_bus_add_devices() - Add devices in the bus' internal device list
|
|
* @bus: The @mcb_bus we add the devices
|
|
*
|
|
* Add devices in the bus' internal device list to the system.
|
|
*/
|
|
void mcb_bus_add_devices(const struct mcb_bus *bus)
|
|
{
|
|
bus_for_each_dev(&mcb_bus_type, NULL, NULL, __mcb_bus_add_devices);
|
|
}
|
|
EXPORT_SYMBOL_GPL(mcb_bus_add_devices);
|
|
|
|
/**
|
|
* mcb_request_mem() - Request memory
|
|
* @dev: The @mcb_device the memory is for
|
|
* @name: The name for the memory reference.
|
|
*
|
|
* Request memory for a @mcb_device. If @name is NULL the driver name will
|
|
* be used.
|
|
*/
|
|
struct resource *mcb_request_mem(struct mcb_device *dev, const char *name)
|
|
{
|
|
struct resource *mem;
|
|
u32 size;
|
|
|
|
if (!name)
|
|
name = dev->dev.driver->name;
|
|
|
|
size = resource_size(&dev->mem);
|
|
|
|
mem = request_mem_region(dev->mem.start, size, name);
|
|
if (!mem)
|
|
return ERR_PTR(-EBUSY);
|
|
|
|
return mem;
|
|
}
|
|
EXPORT_SYMBOL_GPL(mcb_request_mem);
|
|
|
|
/**
|
|
* mcb_release_mem() - Release memory requested by device
|
|
* @dev: The @mcb_device that requested the memory
|
|
*
|
|
* Release memory that was prior requested via @mcb_request_mem().
|
|
*/
|
|
void mcb_release_mem(struct resource *mem)
|
|
{
|
|
u32 size;
|
|
|
|
size = resource_size(mem);
|
|
release_mem_region(mem->start, size);
|
|
}
|
|
EXPORT_SYMBOL_GPL(mcb_release_mem);
|
|
|
|
static int __mcb_get_irq(struct mcb_device *dev)
|
|
{
|
|
struct resource *irq = &dev->irq;
|
|
|
|
return irq->start;
|
|
}
|
|
|
|
/**
|
|
* mcb_get_irq() - Get device's IRQ number
|
|
* @dev: The @mcb_device the IRQ is for
|
|
*
|
|
* Get the IRQ number of a given @mcb_device.
|
|
*/
|
|
int mcb_get_irq(struct mcb_device *dev)
|
|
{
|
|
struct mcb_bus *bus = dev->bus;
|
|
|
|
if (bus->get_irq)
|
|
return bus->get_irq(dev);
|
|
|
|
return __mcb_get_irq(dev);
|
|
}
|
|
EXPORT_SYMBOL_GPL(mcb_get_irq);
|
|
|
|
static int mcb_init(void)
|
|
{
|
|
return bus_register(&mcb_bus_type);
|
|
}
|
|
|
|
static void mcb_exit(void)
|
|
{
|
|
ida_destroy(&mcb_ida);
|
|
bus_unregister(&mcb_bus_type);
|
|
}
|
|
|
|
/* mcb must be initialized after PCI but before the chameleon drivers.
|
|
* That means we must use some initcall between subsys_initcall and
|
|
* device_initcall.
|
|
*/
|
|
fs_initcall(mcb_init);
|
|
module_exit(mcb_exit);
|
|
|
|
MODULE_DESCRIPTION("MEN Chameleon Bus Driver");
|
|
MODULE_AUTHOR("Johannes Thumshirn <johannes.thumshirn@men.de>");
|
|
MODULE_LICENSE("GPL v2");
|