Changes in 4.9.331 uas: add no-uas quirk for Hiksemi usb_disk usb-storage: Add Hiksemi USB3-FW to IGNORE_UAS uas: ignore UAS for Thinkplus chips net: usb: qmi_wwan: Add new usb-id for Dell branded EM7455 ntfs: fix BUG_ON in ntfs_lookup_inode_by_name() mmc: moxart: fix 4-bit bus width and remove 8-bit bus width mm: prevent page_frag_alloc() from corrupting the memory Revert "drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time" Input: melfas_mip4 - fix return value check in mip4_probe() usbnet: Fix memory leak in usbnet_disconnect() nvme: add new line after variable declatation nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices selftests: Fix the if conditions of in test_extra_filter() clk: iproc: Minor tidy up of iproc pll data structures clk: iproc: Do not rely on node name for correct PLL setup Makefile.extrawarn: Move -Wcast-function-type-strict to W=1 ARM: fix function graph tracer and unwinder dependencies fs: fix UAF/GPF bug in nilfs_mdt_destroy dmaengine: xilinx_dma: cleanup for fetching xlnx,num-fstores property dmaengine: xilinx_dma: Report error in case of dma_set_mask_and_coherent API failure ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer net/ieee802154: fix uninit value bug in dgram_sendmsg um: Cleanup syscall_handler_t cast in syscalls_32.h um: Cleanup compiler warning in arch/x86/um/tls_32.c usb: mon: make mmapped memory read only USB: serial: ftdi_sio: fix 300 bps rate for SIO nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level() nilfs2: fix leak of nilfs_root in case of writer thread creation failure nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure ceph: don't truncate file in atomic_open random: clamp credited irq bits to maximum mixed ALSA: hda: Fix position reporting on Poulsbo scsi: stex: Properly zero out the passthrough command structure USB: serial: qcserial: add new usb-id for Dell branded EM7455 random: avoid reading two cache lines on irq randomness wifi: mac80211_hwsim: avoid mac80211 warning on bad rate random: restore O_NONBLOCK support Input: xpad - add supported devices as contributed on github Input: xpad - fix wireless 360 controller breaking after suspend random: use expired timer rather than wq for mixing fast pool ALSA: oss: Fix potential deadlock at unregistration ALSA: rawmidi: Drop register_mutex in snd_rawmidi_free() ALSA: usb-audio: Fix potential memory leaks ALSA: usb-audio: Fix NULL dererence at error path iio: dac: ad5593r: Fix i2c read protocol requirements fs: dlm: fix race between test_bit() and queue_work() fs: dlm: handle -EBUSY first in lock arg validation quota: Check next/prev free block number after reading from quota file regulator: qcom_rpm: Fix circular deferral regression parisc: fbdev/stifb: Align graphics memory size to 4MB UM: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK PCI: Sanitise firmware BAR assignments behind a PCI-PCI bridge fbdev: smscufx: Fix use-after-free in ufx_ops_open() nilfs2: fix use-after-free bug of struct nilfs_root ext4: avoid crash when inline data creation follows DIO write ext4: fix null-ptr-deref in ext4_write_info ext4: make ext4_lazyinit_thread freezable ext4: place buffer head allocation before handle start ring-buffer: Allow splice to read previous partially read pages ring-buffer: Check pending waiters when doing wake ups as well ring-buffer: Fix race between reset page and reading page KVM: x86/emulator: Fix handing of POP SS to correctly set interruptibility selinux: use "grep -E" instead of "egrep" sh: machvec: Use char[] for section boundaries wifi: ath10k: add peer map clean up for peer delete in ath10k_sta_state() wifi: mac80211: allow bw change during channel switch in mesh wifi: rtl8xxxu: tighten bounds checking in rtl8xxxu_read_efuse() spi: qup: add missing clk_disable_unprepare on error in spi_qup_resume() spi: qup: add missing clk_disable_unprepare on error in spi_qup_pm_resume_runtime() wifi: rtl8xxxu: gen2: Fix mistake in path B IQ calibration net: fs_enet: Fix wrong check in do_pd_setup spi/omap100k:Fix PM disable depth imbalance in omap1_spi100k_probe mISDN: fix use-after-free bugs in l1oip timer handlers tcp: fix tcp_cwnd_validate() to not forget is_cwnd_limited net: rds: don't hold sock lock when cancelling work from rds_tcp_reset_callbacks() bnx2x: fix potential memory leak in bnx2x_tpa_stop() drm/mipi-dsi: Detach devices when removing the host platform/x86: msi-laptop: Fix old-ec check for backlight registering mmc: au1xmmc: Fix an error handling path in au1xmmc_probe() ASoC: eureka-tlv320: Hold reference returned from of_find_xxx API ALSA: dmaengine: increment buffer pointer atomically memory: of: Fix refcount leak bug in of_get_ddr_timings() soc: qcom: smsm: Fix refcount leak bugs in qcom_smsm_probe() soc: qcom: smem_state: Add refcounting for the 'state->of_node' ARM: dts: kirkwood: lsxl: fix serial line ARM: dts: kirkwood: lsxl: remove first ethernet port ARM: Drop CMDLINE_* dependency on ATAGS ARM: dts: exynos: fix polarity of VBUS GPIO of Origen iio: adc: at91-sama5d2_adc: fix AT91_SAMA5D2_MR_TRACKTIM_MAX iio: inkern: only release the device node when done with it iio: ABI: Fix wrong format of differential capacitance channel ABI. clk: tegra: Fix refcount leak in tegra210_clock_init clk: tegra: Fix refcount leak in tegra114_clock_init clk: tegra20: Fix refcount leak in tegra20_clock_init HSI: omap_ssi: Fix refcount leak in ssi_probe HSI: omap_ssi_port: Fix dma_map_sg error check media: exynos4-is: fimc-is: Add of_node_put() when breaking out of loop tty: xilinx_uartps: Fix the ignore_status media: xilinx: vipp: Fix refcount leak in xvip_graph_dma_init RDMA/rxe: Fix "kernel NULL pointer dereference" error RDMA/rxe: Fix the error caused by qp->sk dyndbg: fix module.dyndbg handling dyndbg: let query-modname override actual module name ata: fix ata_id_sense_reporting_enabled() and ata_id_has_sense_reporting() ata: fix ata_id_has_devslp() ata: fix ata_id_has_ncq_autosense() ata: fix ata_id_has_dipm() drivers: serial: jsm: fix some leaks in probe firmware: google: Test spinlock on panic path to avoid lockups serial: 8250: Fix restoring termios speed after suspend mfd: intel_soc_pmic: Fix an error handling path in intel_soc_pmic_i2c_probe() mfd: lp8788: Fix an error handling path in lp8788_probe() mfd: lp8788: Fix an error handling path in lp8788_irq_init() and lp8788_irq_init() mfd: sm501: Add check for platform_driver_register() dmaengine: ioat: stop mod_timer from resurrecting deleted timer in __cleanup() clk: bcm2835: fix bcm2835_clock_rate_from_divisor declaration clk: ti: dra7-atl: Fix reference leak in of_dra7_atl_clk_probe powerpc/math_emu/efp: Include module.h powerpc/pci_dn: Add missing of_node_put() powerpc: Fix SPE Power ISA properties for e500v1 platforms iommu/omap: Fix buffer overflow in debugfs f2fs: fix race condition on setting FI_NO_EXTENT flag ACPI: video: Add Toshiba Satellite/Portege Z830 quirk MIPS: BCM47XX: Cast memcmp() of function to (void *) powercap: intel_rapl: fix UBSAN shift-out-of-bounds issue thermal: intel_powerclamp: Use get_cpu() instead of smp_processor_id() to avoid crash openvswitch: Fix double reporting of drops in dropwatch openvswitch: Fix overreporting of drops in dropwatch tcp: annotate data-race around tcp_md5sig_pool_populated xfrm: Update ipcomp_scratches with NULL when freed Bluetooth: L2CAP: initialize delayed works at l2cap_chan_create() Bluetooth: hci_sysfs: Fix attempting to call device_add multiple times can: bcm: check the result of can_send() in bcm_can_tx() wifi: rt2x00: don't run Rt5592 IQ calibration on MT7620 Bluetooth: L2CAP: Fix user-after-free r8152: Rate limit overflow messages drm: Use size_t type for len variable in drm_copy_field() drm: Prevent drm_copy_field() to attempt copying a NULL pointer platform/x86: msi-laptop: Change DMI match / alias strings to fix module autoloading drm/amdgpu: fix initial connector audio value ARM: dts: imx7d-sdb: config the max pressure for tsc2046 ARM: dts: imx6q: add missing properties for sram ARM: dts: imx6dl: add missing properties for sram ARM: dts: imx6qp: add missing properties for sram ARM: dts: imx6sl: add missing properties for sram media: cx88: Fix a null-ptr-deref bug in buffer_prepare() scsi: 3w-9xxx: Avoid disabling device if failing to enable it HID: roccat: Fix use-after-free in roccat_read() usb: host: xhci: Fix potential memory leak in xhci_alloc_stream_info() usb: musb: Fix musb_gadget.c rxstate overflow bug Revert "usb: storage: Add quirk for Samsung Fit flash" usb: idmouse: fix an uninit-value in idmouse_open perf intel-pt: Fix segfault in intel_pt_print_info() with uClibc net: ieee802154: return -EINVAL for unknown addr type net/ieee802154: don't warn zero-sized raw_sendmsg() ext4: continue to expand file system when the target size doesn't reach inet: fully convert sk->sk_rx_dst to RCU rules thermal: intel_powerclamp: Use first online CPU as control_cpu gcov: support GCC 12.1 and newer compilers Linux 4.9.331 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I105d6215a29d200abe3330f328ce3c2009ba0df9
443 lines
11 KiB
C
443 lines
11 KiB
C
/*
|
|
* drivers/pci/setup-res.c
|
|
*
|
|
* Extruded from code written by
|
|
* Dave Rusling (david.rusling@reo.mts.dec.com)
|
|
* David Mosberger (davidm@cs.arizona.edu)
|
|
* David Miller (davem@redhat.com)
|
|
*
|
|
* Support routines for initializing a PCI subsystem.
|
|
*/
|
|
|
|
/* fixed for multiple pci buses, 1999 Andrea Arcangeli <andrea@suse.de> */
|
|
|
|
/*
|
|
* Nov 2000, Ivan Kokshaysky <ink@jurassic.park.msu.ru>
|
|
* Resource sorting
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/export.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/cache.h>
|
|
#include <linux/slab.h>
|
|
#include "pci.h"
|
|
|
|
static void pci_std_update_resource(struct pci_dev *dev, int resno)
|
|
{
|
|
struct pci_bus_region region;
|
|
bool disable;
|
|
u16 cmd;
|
|
u32 new, check, mask;
|
|
int reg;
|
|
struct resource *res = dev->resource + resno;
|
|
|
|
/* Per SR-IOV spec 3.4.1.11, VF BARs are RO zero */
|
|
if (dev->is_virtfn)
|
|
return;
|
|
|
|
/*
|
|
* Ignore resources for unimplemented BARs and unused resource slots
|
|
* for 64 bit BARs.
|
|
*/
|
|
if (!res->flags)
|
|
return;
|
|
|
|
if (res->flags & IORESOURCE_UNSET)
|
|
return;
|
|
|
|
/*
|
|
* Ignore non-moveable resources. This might be legacy resources for
|
|
* which no functional BAR register exists or another important
|
|
* system resource we shouldn't move around.
|
|
*/
|
|
if (res->flags & IORESOURCE_PCI_FIXED)
|
|
return;
|
|
|
|
pcibios_resource_to_bus(dev->bus, ®ion, res);
|
|
new = region.start;
|
|
|
|
if (res->flags & IORESOURCE_IO) {
|
|
mask = (u32)PCI_BASE_ADDRESS_IO_MASK;
|
|
new |= res->flags & ~PCI_BASE_ADDRESS_IO_MASK;
|
|
} else if (resno == PCI_ROM_RESOURCE) {
|
|
mask = PCI_ROM_ADDRESS_MASK;
|
|
} else {
|
|
mask = (u32)PCI_BASE_ADDRESS_MEM_MASK;
|
|
new |= res->flags & ~PCI_BASE_ADDRESS_MEM_MASK;
|
|
}
|
|
|
|
if (resno < PCI_ROM_RESOURCE) {
|
|
reg = PCI_BASE_ADDRESS_0 + 4 * resno;
|
|
} else if (resno == PCI_ROM_RESOURCE) {
|
|
|
|
/*
|
|
* Apparently some Matrox devices have ROM BARs that read
|
|
* as zero when disabled, so don't update ROM BARs unless
|
|
* they're enabled. See https://lkml.org/lkml/2005/8/30/138.
|
|
*/
|
|
if (!(res->flags & IORESOURCE_ROM_ENABLE))
|
|
return;
|
|
|
|
reg = dev->rom_base_reg;
|
|
new |= PCI_ROM_ADDRESS_ENABLE;
|
|
} else
|
|
return;
|
|
|
|
/*
|
|
* We can't update a 64-bit BAR atomically, so when possible,
|
|
* disable decoding so that a half-updated BAR won't conflict
|
|
* with another device.
|
|
*/
|
|
disable = (res->flags & IORESOURCE_MEM_64) && !dev->mmio_always_on;
|
|
if (disable) {
|
|
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
|
pci_write_config_word(dev, PCI_COMMAND,
|
|
cmd & ~PCI_COMMAND_MEMORY);
|
|
}
|
|
|
|
pci_write_config_dword(dev, reg, new);
|
|
pci_read_config_dword(dev, reg, &check);
|
|
|
|
if ((new ^ check) & mask) {
|
|
dev_err(&dev->dev, "BAR %d: error updating (%#08x != %#08x)\n",
|
|
resno, new, check);
|
|
}
|
|
|
|
if (res->flags & IORESOURCE_MEM_64) {
|
|
new = region.start >> 16 >> 16;
|
|
pci_write_config_dword(dev, reg + 4, new);
|
|
pci_read_config_dword(dev, reg + 4, &check);
|
|
if (check != new) {
|
|
dev_err(&dev->dev, "BAR %d: error updating (high %#08x != %#08x)\n",
|
|
resno, new, check);
|
|
}
|
|
}
|
|
|
|
if (disable)
|
|
pci_write_config_word(dev, PCI_COMMAND, cmd);
|
|
}
|
|
|
|
void pci_update_resource(struct pci_dev *dev, int resno)
|
|
{
|
|
if (resno <= PCI_ROM_RESOURCE)
|
|
pci_std_update_resource(dev, resno);
|
|
#ifdef CONFIG_PCI_IOV
|
|
else if (resno >= PCI_IOV_RESOURCES && resno <= PCI_IOV_RESOURCE_END)
|
|
pci_iov_update_resource(dev, resno);
|
|
#endif
|
|
}
|
|
|
|
int pci_claim_resource(struct pci_dev *dev, int resource)
|
|
{
|
|
struct resource *res = &dev->resource[resource];
|
|
struct resource *root, *conflict;
|
|
|
|
if (res->flags & IORESOURCE_UNSET) {
|
|
dev_info(&dev->dev, "can't claim BAR %d %pR: no address assigned\n",
|
|
resource, res);
|
|
return -EINVAL;
|
|
}
|
|
|
|
/*
|
|
* If we have a shadow copy in RAM, the PCI device doesn't respond
|
|
* to the shadow range, so we don't need to claim it, and upstream
|
|
* bridges don't need to route the range to the device.
|
|
*/
|
|
if (res->flags & IORESOURCE_ROM_SHADOW)
|
|
return 0;
|
|
|
|
root = pci_find_parent_resource(dev, res);
|
|
if (!root) {
|
|
dev_info(&dev->dev, "can't claim BAR %d %pR: no compatible bridge window\n",
|
|
resource, res);
|
|
res->flags |= IORESOURCE_UNSET;
|
|
return -EINVAL;
|
|
}
|
|
|
|
conflict = request_resource_conflict(root, res);
|
|
if (conflict) {
|
|
dev_info(&dev->dev, "can't claim BAR %d %pR: address conflict with %s %pR\n",
|
|
resource, res, conflict->name, conflict);
|
|
res->flags |= IORESOURCE_UNSET;
|
|
return -EBUSY;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(pci_claim_resource);
|
|
|
|
void pci_disable_bridge_window(struct pci_dev *dev)
|
|
{
|
|
dev_info(&dev->dev, "disabling bridge mem windows\n");
|
|
|
|
/* MMIO Base/Limit */
|
|
pci_write_config_dword(dev, PCI_MEMORY_BASE, 0x0000fff0);
|
|
|
|
/* Prefetchable MMIO Base/Limit */
|
|
pci_write_config_dword(dev, PCI_PREF_LIMIT_UPPER32, 0);
|
|
pci_write_config_dword(dev, PCI_PREF_MEMORY_BASE, 0x0000fff0);
|
|
pci_write_config_dword(dev, PCI_PREF_BASE_UPPER32, 0xffffffff);
|
|
}
|
|
|
|
/*
|
|
* Generic function that returns a value indicating that the device's
|
|
* original BIOS BAR address was not saved and so is not available for
|
|
* reinstatement.
|
|
*
|
|
* Can be over-ridden by architecture specific code that implements
|
|
* reinstatement functionality rather than leaving it disabled when
|
|
* normal allocation attempts fail.
|
|
*/
|
|
resource_size_t __weak pcibios_retrieve_fw_addr(struct pci_dev *dev, int idx)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev,
|
|
int resno, resource_size_t size)
|
|
{
|
|
struct resource *root, *conflict;
|
|
resource_size_t fw_addr, start, end;
|
|
|
|
fw_addr = pcibios_retrieve_fw_addr(dev, resno);
|
|
if (!fw_addr)
|
|
return -ENOMEM;
|
|
|
|
start = res->start;
|
|
end = res->end;
|
|
res->start = fw_addr;
|
|
res->end = res->start + size - 1;
|
|
res->flags &= ~IORESOURCE_UNSET;
|
|
|
|
root = pci_find_parent_resource(dev, res);
|
|
if (!root) {
|
|
/*
|
|
* If dev is behind a bridge, accesses will only reach it
|
|
* if res is inside the relevant bridge window.
|
|
*/
|
|
if (pci_upstream_bridge(dev))
|
|
return -ENXIO;
|
|
|
|
/*
|
|
* On the root bus, assume the host bridge will forward
|
|
* everything.
|
|
*/
|
|
if (res->flags & IORESOURCE_IO)
|
|
root = &ioport_resource;
|
|
else
|
|
root = &iomem_resource;
|
|
}
|
|
|
|
dev_info(&dev->dev, "BAR %d: trying firmware assignment %pR\n",
|
|
resno, res);
|
|
conflict = request_resource_conflict(root, res);
|
|
if (conflict) {
|
|
dev_info(&dev->dev, "BAR %d: %pR conflicts with %s %pR\n",
|
|
resno, res, conflict->name, conflict);
|
|
res->start = start;
|
|
res->end = end;
|
|
res->flags |= IORESOURCE_UNSET;
|
|
return -EBUSY;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev,
|
|
int resno, resource_size_t size, resource_size_t align)
|
|
{
|
|
struct resource *res = dev->resource + resno;
|
|
resource_size_t min;
|
|
int ret;
|
|
|
|
min = (res->flags & IORESOURCE_IO) ? PCIBIOS_MIN_IO : PCIBIOS_MIN_MEM;
|
|
|
|
/*
|
|
* First, try exact prefetching match. Even if a 64-bit
|
|
* prefetchable bridge window is below 4GB, we can't put a 32-bit
|
|
* prefetchable resource in it because pbus_size_mem() assumes a
|
|
* 64-bit window will contain no 32-bit resources. If we assign
|
|
* things differently than they were sized, not everything will fit.
|
|
*/
|
|
ret = pci_bus_alloc_resource(bus, res, size, align, min,
|
|
IORESOURCE_PREFETCH | IORESOURCE_MEM_64,
|
|
pcibios_align_resource, dev);
|
|
if (ret == 0)
|
|
return 0;
|
|
|
|
/*
|
|
* If the prefetchable window is only 32 bits wide, we can put
|
|
* 64-bit prefetchable resources in it.
|
|
*/
|
|
if ((res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) ==
|
|
(IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) {
|
|
ret = pci_bus_alloc_resource(bus, res, size, align, min,
|
|
IORESOURCE_PREFETCH,
|
|
pcibios_align_resource, dev);
|
|
if (ret == 0)
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* If we didn't find a better match, we can put any memory resource
|
|
* in a non-prefetchable window. If this resource is 32 bits and
|
|
* non-prefetchable, the first call already tried the only possibility
|
|
* so we don't need to try again.
|
|
*/
|
|
if (res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64))
|
|
ret = pci_bus_alloc_resource(bus, res, size, align, min, 0,
|
|
pcibios_align_resource, dev);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int _pci_assign_resource(struct pci_dev *dev, int resno,
|
|
resource_size_t size, resource_size_t min_align)
|
|
{
|
|
struct pci_bus *bus;
|
|
int ret;
|
|
|
|
bus = dev->bus;
|
|
while ((ret = __pci_assign_resource(bus, dev, resno, size, min_align))) {
|
|
if (!bus->parent || !bus->self->transparent)
|
|
break;
|
|
bus = bus->parent;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
int pci_assign_resource(struct pci_dev *dev, int resno)
|
|
{
|
|
struct resource *res = dev->resource + resno;
|
|
resource_size_t align, size;
|
|
int ret;
|
|
|
|
if (res->flags & IORESOURCE_PCI_FIXED)
|
|
return 0;
|
|
|
|
res->flags |= IORESOURCE_UNSET;
|
|
align = pci_resource_alignment(dev, res);
|
|
if (!align) {
|
|
dev_info(&dev->dev, "BAR %d: can't assign %pR (bogus alignment)\n",
|
|
resno, res);
|
|
return -EINVAL;
|
|
}
|
|
|
|
size = resource_size(res);
|
|
ret = _pci_assign_resource(dev, resno, size, align);
|
|
|
|
/*
|
|
* If we failed to assign anything, let's try the address
|
|
* where firmware left it. That at least has a chance of
|
|
* working, which is better than just leaving it disabled.
|
|
*/
|
|
if (ret < 0) {
|
|
dev_info(&dev->dev, "BAR %d: no space for %pR\n", resno, res);
|
|
ret = pci_revert_fw_address(res, dev, resno, size);
|
|
}
|
|
|
|
if (ret < 0) {
|
|
dev_info(&dev->dev, "BAR %d: failed to assign %pR\n", resno,
|
|
res);
|
|
return ret;
|
|
}
|
|
|
|
res->flags &= ~IORESOURCE_UNSET;
|
|
res->flags &= ~IORESOURCE_STARTALIGN;
|
|
dev_info(&dev->dev, "BAR %d: assigned %pR\n", resno, res);
|
|
if (resno < PCI_BRIDGE_RESOURCES)
|
|
pci_update_resource(dev, resno);
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(pci_assign_resource);
|
|
|
|
int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsize,
|
|
resource_size_t min_align)
|
|
{
|
|
struct resource *res = dev->resource + resno;
|
|
unsigned long flags;
|
|
resource_size_t new_size;
|
|
int ret;
|
|
|
|
if (res->flags & IORESOURCE_PCI_FIXED)
|
|
return 0;
|
|
|
|
flags = res->flags;
|
|
res->flags |= IORESOURCE_UNSET;
|
|
if (!res->parent) {
|
|
dev_info(&dev->dev, "BAR %d: can't reassign an unassigned resource %pR\n",
|
|
resno, res);
|
|
return -EINVAL;
|
|
}
|
|
|
|
/* already aligned with min_align */
|
|
new_size = resource_size(res) + addsize;
|
|
ret = _pci_assign_resource(dev, resno, new_size, min_align);
|
|
if (ret) {
|
|
res->flags = flags;
|
|
dev_info(&dev->dev, "BAR %d: %pR (failed to expand by %#llx)\n",
|
|
resno, res, (unsigned long long) addsize);
|
|
return ret;
|
|
}
|
|
|
|
res->flags &= ~IORESOURCE_UNSET;
|
|
res->flags &= ~IORESOURCE_STARTALIGN;
|
|
dev_info(&dev->dev, "BAR %d: reassigned %pR (expanded by %#llx)\n",
|
|
resno, res, (unsigned long long) addsize);
|
|
if (resno < PCI_BRIDGE_RESOURCES)
|
|
pci_update_resource(dev, resno);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int pci_enable_resources(struct pci_dev *dev, int mask)
|
|
{
|
|
u16 cmd, old_cmd;
|
|
int i;
|
|
struct resource *r;
|
|
|
|
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
|
old_cmd = cmd;
|
|
|
|
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
|
if (!(mask & (1 << i)))
|
|
continue;
|
|
|
|
r = &dev->resource[i];
|
|
|
|
if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
|
|
continue;
|
|
if ((i == PCI_ROM_RESOURCE) &&
|
|
(!(r->flags & IORESOURCE_ROM_ENABLE)))
|
|
continue;
|
|
|
|
if (r->flags & IORESOURCE_UNSET) {
|
|
dev_err(&dev->dev, "can't enable device: BAR %d %pR not assigned\n",
|
|
i, r);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (!r->parent) {
|
|
dev_err(&dev->dev, "can't enable device: BAR %d %pR not claimed\n",
|
|
i, r);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (r->flags & IORESOURCE_IO)
|
|
cmd |= PCI_COMMAND_IO;
|
|
if (r->flags & IORESOURCE_MEM)
|
|
cmd |= PCI_COMMAND_MEMORY;
|
|
}
|
|
|
|
if (cmd != old_cmd) {
|
|
dev_info(&dev->dev, "enabling device (%04x -> %04x)\n",
|
|
old_cmd, cmd);
|
|
pci_write_config_word(dev, PCI_COMMAND, cmd);
|
|
}
|
|
return 0;
|
|
}
|