a5c57fd2e9
When a PCI device is dynamically added, the kernel oopses with a NULL pointer dereference: BUG: Kernel NULL pointer dereference on read at 0x00000030 Faulting instruction address: 0xc0000000006bbe5c Oops: Kernel access of bad area, sig: 11 [#1] LE PAGE_SIZE=64K MMU=Radix SMP NR_CPUS=2048 NUMA pSeries Modules linked in: rpadlpar_io rpaphp rpcsec_gss_krb5 auth_rpcgss nfsv4 dns_resolver nfs lockd grace fscache netfs xsk_diag bonding nft_compat nf_tables nfnetlink rfkill binfmt_misc dm_multipath rpcrdma sunrpc rdma_ucm ib_srpt ib_isert iscsi_target_mod target_core_mod ib_umad ib_iser libiscsi scsi_transport_iscsi ib_ipoib rdma_cm iw_cm ib_cm mlx5_ib ib_uverbs ib_core pseries_rng drm drm_panel_orientation_quirks xfs libcrc32c mlx5_core mlxfw sd_mod t10_pi sg tls ibmvscsi ibmveth scsi_transport_srp vmx_crypto pseries_wdt psample dm_mirror dm_region_hash dm_log dm_mod fuse CPU: 17 PID: 2685 Comm: drmgr Not tainted 6.7.0-203405+ #66 Hardware name: IBM,9080-HEX POWER10 (raw) 0x800200 0xf000006 of:IBM,FW1060.00 (NH1060_008) hv:phyp pSeries NIP: c0000000006bbe5c LR: c000000000a13e68 CTR: c0000000000579f8 REGS: c00000009924f240 TRAP: 0300 Not tainted (6.7.0-203405+) MSR: 8000000000009033 <SF,EE,ME,IR,DR,RI,LE> CR: 24002220 XER: 20040006 CFAR: c000000000a13e64 DAR: 0000000000000030 DSISR: 40000000 IRQMASK: 0 ... NIP sysfs_add_link_to_group+0x34/0x94 LR iommu_device_link+0x5c/0x118 Call Trace: iommu_init_device+0x26c/0x318 (unreliable) iommu_device_link+0x5c/0x118 iommu_init_device+0xa8/0x318 iommu_probe_device+0xc0/0x134 iommu_bus_notifier+0x44/0x104 notifier_call_chain+0xb8/0x19c blocking_notifier_call_chain+0x64/0x98 bus_notify+0x50/0x7c device_add+0x640/0x918 pci_device_add+0x23c/0x298 of_create_pci_dev+0x400/0x884 of_scan_pci_dev+0x124/0x1b0 __of_scan_bus+0x78/0x18c pcibios_scan_phb+0x2a4/0x3b0 init_phb_dynamic+0xb8/0x110 dlpar_add_slot+0x170/0x3b8 [rpadlpar_io] add_slot_store.part.0+0xb4/0x130 [rpadlpar_io] kobj_attr_store+0x2c/0x48 sysfs_kf_write+0x64/0x78 kernfs_fop_write_iter+0x1b0/0x290 vfs_write+0x350/0x4a0 ksys_write+0x84/0x140 system_call_exception+0x124/0x330 system_call_vectored_common+0x15c/0x2ec Commita940904443("powerpc/iommu: Add iommu_ops to report capabilities and allow blocking domains") broke DLPAR add of PCI devices. The above added iommu_device structure to pci_controller. During system boot, PCI devices are discovered and this newly added iommu_device structure is initialized by a call to iommu_device_register(). During DLPAR add of a PCI device, a new pci_controller structure is allocated but there are no calls made to iommu_device_register() interface. Fix is to register the iommu device during DLPAR add as well. Fixes:a940904443("powerpc/iommu: Add iommu_ops to report capabilities and allow blocking domains") Signed-off-by: Gaurav Batra <gbatra@linux.ibm.com> Reviewed-by: Brian King <brking@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20240215221833.4817-1-gbatra@linux.ibm.com
87 lines
2.8 KiB
C
87 lines
2.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* c 2001 PPC 64 Team, IBM Corp
|
|
*/
|
|
#ifndef _ASM_POWERPC_PPC_PCI_H
|
|
#define _ASM_POWERPC_PPC_PCI_H
|
|
#ifdef __KERNEL__
|
|
|
|
#ifdef CONFIG_PCI
|
|
|
|
#include <linux/pci.h>
|
|
#include <asm/pci-bridge.h>
|
|
|
|
extern unsigned long isa_io_base;
|
|
|
|
extern struct list_head hose_list;
|
|
|
|
extern struct pci_dev *isa_bridge_pcidev; /* may be NULL if no ISA bus */
|
|
|
|
/** Bus Unit ID macros; get low and hi 32-bits of the 64-bit BUID */
|
|
#define BUID_HI(buid) upper_32_bits(buid)
|
|
#define BUID_LO(buid) lower_32_bits(buid)
|
|
|
|
/* PCI device_node operations */
|
|
struct device_node;
|
|
struct pci_dn;
|
|
|
|
void *pci_traverse_device_nodes(struct device_node *start,
|
|
void *(*fn)(struct device_node *, void *),
|
|
void *data);
|
|
extern void pci_devs_phb_init_dynamic(struct pci_controller *phb);
|
|
|
|
#if defined(CONFIG_IOMMU_API) && (defined(CONFIG_PPC_PSERIES) || \
|
|
defined(CONFIG_PPC_POWERNV))
|
|
extern void ppc_iommu_register_device(struct pci_controller *phb);
|
|
extern void ppc_iommu_unregister_device(struct pci_controller *phb);
|
|
#else
|
|
static inline void ppc_iommu_register_device(struct pci_controller *phb) { }
|
|
static inline void ppc_iommu_unregister_device(struct pci_controller *phb) { }
|
|
#endif
|
|
|
|
|
|
/* From rtas_pci.h */
|
|
extern void init_pci_config_tokens (void);
|
|
extern unsigned long get_phb_buid (struct device_node *);
|
|
extern int rtas_setup_phb(struct pci_controller *phb);
|
|
|
|
int rtas_pci_dn_read_config(struct pci_dn *pdn, int where, int size, u32 *val);
|
|
int rtas_pci_dn_write_config(struct pci_dn *pdn, int where, int size, u32 val);
|
|
|
|
#ifdef CONFIG_EEH
|
|
|
|
void eeh_addr_cache_insert_dev(struct pci_dev *dev);
|
|
void eeh_addr_cache_rmv_dev(struct pci_dev *dev);
|
|
struct eeh_dev *eeh_addr_cache_get_dev(unsigned long addr);
|
|
void eeh_slot_error_detail(struct eeh_pe *pe, int severity);
|
|
int eeh_pci_enable(struct eeh_pe *pe, int function);
|
|
int eeh_pe_reset_full(struct eeh_pe *pe, bool include_passed);
|
|
void eeh_save_bars(struct eeh_dev *edev);
|
|
void eeh_pe_state_mark(struct eeh_pe *pe, int state);
|
|
void eeh_pe_mark_isolated(struct eeh_pe *pe);
|
|
void eeh_pe_state_clear(struct eeh_pe *pe, int state, bool include_passed);
|
|
void eeh_pe_state_mark_with_cfg(struct eeh_pe *pe, int state);
|
|
void eeh_pe_dev_mode_mark(struct eeh_pe *pe, int mode);
|
|
|
|
void eeh_sysfs_add_device(struct pci_dev *pdev);
|
|
void eeh_sysfs_remove_device(struct pci_dev *pdev);
|
|
|
|
#endif /* CONFIG_EEH */
|
|
|
|
#ifdef CONFIG_FSL_ULI1575
|
|
void __init uli_init(void);
|
|
#endif /* CONFIG_FSL_ULI1575 */
|
|
|
|
#define PCI_BUSNO(bdfn) ((bdfn >> 8) & 0xff)
|
|
|
|
#else /* CONFIG_PCI */
|
|
static inline void init_pci_config_tokens(void) { }
|
|
#endif /* !CONFIG_PCI */
|
|
|
|
#if !defined(CONFIG_PCI) || !defined(CONFIG_FSL_ULI1575)
|
|
static inline void __init uli_init(void) {}
|
|
#endif /* !defined(CONFIG_PCI) || !defined(CONFIG_FSL_ULI1575) */
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* _ASM_POWERPC_PPC_PCI_H */
|