mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
![Masahiro Yamada](/assets/img/avatar_default.png)
The use of config_enabled() against config options is ambiguous. In practical terms, config_enabled() is equivalent to IS_BUILTIN(), but the author might have used it for the meaning of IS_ENABLED(). Using IS_ENABLED(), IS_BUILTIN(), IS_MODULE() etc. makes the intention clearer. This commit replaces config_enabled() with IS_ENABLED() where possible. This commit is only touching bool config options. I noticed two cases where config_enabled() is used against a tristate option: - config_enabled(CONFIG_HWMON) [ drivers/net/wireless/ath/ath10k/thermal.c ] - config_enabled(CONFIG_BACKLIGHT_CLASS_DEVICE) [ drivers/gpu/drm/gma500/opregion.c ] I did not touch them because they should be converted to IS_BUILTIN() in order to keep the logic, but I was not sure it was the authors' intention. Link: http://lkml.kernel.org/r/1465215656-20569-1-git-send-email-yamada.masahiro@socionext.com Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Kees Cook <keescook@chromium.org> Cc: Stas Sergeev <stsp@list.ru> Cc: Matt Redfearn <matt.redfearn@imgtec.com> Cc: Joshua Kinard <kumba@gentoo.org> Cc: Jiri Slaby <jslaby@suse.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Borislav Petkov <bp@suse.de> Cc: Markos Chandras <markos.chandras@imgtec.com> Cc: "Dmitry V. Levin" <ldv@altlinux.org> Cc: yu-cheng yu <yu-cheng.yu@intel.com> Cc: James Hogan <james.hogan@imgtec.com> Cc: Brian Gerst <brgerst@gmail.com> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Will Drewry <wad@chromium.org> Cc: Nikolay Martynov <mar.kolya@gmail.com> Cc: Huacai Chen <chenhc@lemote.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> Cc: Rafal Milecki <zajec5@gmail.com> Cc: James Cowgill <James.Cowgill@imgtec.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Alex Smith <alex.smith@imgtec.com> Cc: Adam Buchbinder <adam.buchbinder@gmail.com> Cc: Qais Yousef <qais.yousef@imgtec.com> Cc: Jiang Liu <jiang.liu@linux.intel.com> Cc: Mikko Rapeli <mikko.rapeli@iki.fi> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: Brian Norris <computersforpeace@gmail.com> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com> Cc: "Luis R. Rodriguez" <mcgrof@do-not-panic.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Ingo Molnar <mingo@redhat.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Cc: Roland McGrath <roland@hack.frob.com> Cc: Paul Burton <paul.burton@imgtec.com> Cc: Kalle Valo <kvalo@qca.qualcomm.com> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: Tony Wu <tung7970@gmail.com> Cc: Huaitong Han <huaitong.han@intel.com> Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Juergen Gross <jgross@suse.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Andrea Gelmini <andrea.gelmini@gelma.net> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Rabin Vincent <rabin@rab.in> Cc: "Maciej W. Rozycki" <macro@imgtec.com> Cc: David Daney <david.daney@cavium.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
164 lines
4.2 KiB
C
164 lines
4.2 KiB
C
/*
|
|
* Copyright 2016 Broadcom
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License, version 2, as
|
|
* published by the Free Software Foundation (the "GPL").
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License version 2 (GPLv2) for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* version 2 (GPLv2) along with this source code.
|
|
*/
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/io.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/pci-ecam.h>
|
|
#include <linux/slab.h>
|
|
|
|
/*
|
|
* On 64-bit systems, we do a single ioremap for the whole config space
|
|
* since we have enough virtual address range available. On 32-bit, we
|
|
* ioremap the config space for each bus individually.
|
|
*/
|
|
static const bool per_bus_mapping = !IS_ENABLED(CONFIG_64BIT);
|
|
|
|
/*
|
|
* Create a PCI config space window
|
|
* - reserve mem region
|
|
* - alloc struct pci_config_window with space for all mappings
|
|
* - ioremap the config space
|
|
*/
|
|
struct pci_config_window *pci_ecam_create(struct device *dev,
|
|
struct resource *cfgres, struct resource *busr,
|
|
struct pci_ecam_ops *ops)
|
|
{
|
|
struct pci_config_window *cfg;
|
|
unsigned int bus_range, bus_range_max, bsz;
|
|
struct resource *conflict;
|
|
int i, err;
|
|
|
|
if (busr->start > busr->end)
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);
|
|
if (!cfg)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
cfg->parent = dev;
|
|
cfg->ops = ops;
|
|
cfg->busr.start = busr->start;
|
|
cfg->busr.end = busr->end;
|
|
cfg->busr.flags = IORESOURCE_BUS;
|
|
bus_range = resource_size(&cfg->busr);
|
|
bus_range_max = resource_size(cfgres) >> ops->bus_shift;
|
|
if (bus_range > bus_range_max) {
|
|
bus_range = bus_range_max;
|
|
cfg->busr.end = busr->start + bus_range - 1;
|
|
dev_warn(dev, "ECAM area %pR can only accommodate %pR (reduced from %pR desired)\n",
|
|
cfgres, &cfg->busr, busr);
|
|
}
|
|
bsz = 1 << ops->bus_shift;
|
|
|
|
cfg->res.start = cfgres->start;
|
|
cfg->res.end = cfgres->end;
|
|
cfg->res.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
|
|
cfg->res.name = "PCI ECAM";
|
|
|
|
conflict = request_resource_conflict(&iomem_resource, &cfg->res);
|
|
if (conflict) {
|
|
err = -EBUSY;
|
|
dev_err(dev, "can't claim ECAM area %pR: address conflict with %s %pR\n",
|
|
&cfg->res, conflict->name, conflict);
|
|
goto err_exit;
|
|
}
|
|
|
|
if (per_bus_mapping) {
|
|
cfg->winp = kcalloc(bus_range, sizeof(*cfg->winp), GFP_KERNEL);
|
|
if (!cfg->winp)
|
|
goto err_exit_malloc;
|
|
for (i = 0; i < bus_range; i++) {
|
|
cfg->winp[i] = ioremap(cfgres->start + i * bsz, bsz);
|
|
if (!cfg->winp[i])
|
|
goto err_exit_iomap;
|
|
}
|
|
} else {
|
|
cfg->win = ioremap(cfgres->start, bus_range * bsz);
|
|
if (!cfg->win)
|
|
goto err_exit_iomap;
|
|
}
|
|
|
|
if (ops->init) {
|
|
err = ops->init(cfg);
|
|
if (err)
|
|
goto err_exit;
|
|
}
|
|
dev_info(dev, "ECAM at %pR for %pR\n", &cfg->res, &cfg->busr);
|
|
return cfg;
|
|
|
|
err_exit_iomap:
|
|
dev_err(dev, "ECAM ioremap failed\n");
|
|
err_exit_malloc:
|
|
err = -ENOMEM;
|
|
err_exit:
|
|
pci_ecam_free(cfg);
|
|
return ERR_PTR(err);
|
|
}
|
|
|
|
void pci_ecam_free(struct pci_config_window *cfg)
|
|
{
|
|
int i;
|
|
|
|
if (per_bus_mapping) {
|
|
if (cfg->winp) {
|
|
for (i = 0; i < resource_size(&cfg->busr); i++)
|
|
if (cfg->winp[i])
|
|
iounmap(cfg->winp[i]);
|
|
kfree(cfg->winp);
|
|
}
|
|
} else {
|
|
if (cfg->win)
|
|
iounmap(cfg->win);
|
|
}
|
|
if (cfg->res.parent)
|
|
release_resource(&cfg->res);
|
|
kfree(cfg);
|
|
}
|
|
|
|
/*
|
|
* Function to implement the pci_ops ->map_bus method
|
|
*/
|
|
void __iomem *pci_ecam_map_bus(struct pci_bus *bus, unsigned int devfn,
|
|
int where)
|
|
{
|
|
struct pci_config_window *cfg = bus->sysdata;
|
|
unsigned int devfn_shift = cfg->ops->bus_shift - 8;
|
|
unsigned int busn = bus->number;
|
|
void __iomem *base;
|
|
|
|
if (busn < cfg->busr.start || busn > cfg->busr.end)
|
|
return NULL;
|
|
|
|
busn -= cfg->busr.start;
|
|
if (per_bus_mapping)
|
|
base = cfg->winp[busn];
|
|
else
|
|
base = cfg->win + (busn << cfg->ops->bus_shift);
|
|
return base + (devfn << devfn_shift) + where;
|
|
}
|
|
|
|
/* ECAM ops */
|
|
struct pci_ecam_ops pci_generic_ecam_ops = {
|
|
.bus_shift = 20,
|
|
.pci_ops = {
|
|
.map_bus = pci_ecam_map_bus,
|
|
.read = pci_generic_config_read,
|
|
.write = pci_generic_config_write,
|
|
}
|
|
};
|