Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 806dace6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull second set of s390 patches from Martin Schwidefsky:
 "The handling of the PCI hotplug notifications has been improved, the
  zfcp dumper can now detect the HSA size dynamically and the default
  install kernel has been changed to the compressed bzImage.  And two
  bug-fixes for scm and 3720"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/pci: implement hotplug notifications
  s390/scm_block: do not hide eadm subchannel dependency
  s390/sclp: Consolidate early sclp init calls to sclp_early_detect()
  s390/sclp: Move early code from sclp_cmd.c to sclp_early.c
  s390/sclp: Determine HSA size dynamically for zfcpdump
  s390/sclp: Move declarations for sclp_sdias into separate header file
  s390/pci: implement pcibios_remove_bus
  s390/pci: improve handling of bus resources
  s390/3270: fix missing device_destroy() call
  s390/boot: Install bzImage as default kernel image
parents cdc7ef89 d795ddad

arch/s390/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ $(obj)/bzImage: $(obj)/compressed/vmlinux FORCE 
$(obj)/compressed/vmlinux: FORCE

	$(Q)$(MAKE) $(build)=$(obj)/compressed $@



install: $(CONFIGURE) $(obj)/image

	sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/image \

install: $(CONFIGURE) $(obj)/bzImage

	sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \

	      System.map "$(INSTALL_PATH)"

arch/s390/include/asm/ctl_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
#ifndef __ASM_CTL_REG_H

#define __ASM_CTL_REG_H



#include <linux/bug.h>



#ifdef CONFIG_64BIT

# define __CTL_LOAD	"lctlg"

# define __CTL_STORE	"stctg"

arch/s390/include/asm/eadm.h

+1 −12
Original line number Diff line number Diff line
@@ -111,18 +111,7 @@ struct scm_driver { 
int scm_driver_register(struct scm_driver *scmdrv);

void scm_driver_unregister(struct scm_driver *scmdrv);



int scm_start_aob(struct aob *aob);

int eadm_start_aob(struct aob *aob);

void scm_irq_handler(struct aob *aob, int error);



struct eadm_ops {

	int (*eadm_start) (struct aob *aob);

	struct module *owner;

};



int scm_get_ref(void);

void scm_put_ref(void);



void register_eadm_ops(struct eadm_ops *ops);

void unregister_eadm_ops(struct eadm_ops *ops);



#endif /* _ASM_S390_EADM_H */

arch/s390/include/asm/pci.h

+3 −3
Original line number Diff line number Diff line
@@ -63,9 +63,10 @@ enum zpci_state { 
};



struct zpci_bar_struct {

	struct resource *res;		/* bus resource */

	u32		val;		/* bar start & 3 flag bits */

	u8		size;		/* order 2 exponent */

	u16		map_idx;	/* index into bar mapping array */

	u8		size;		/* order 2 exponent */

};



/* Private data per function */
@@ -97,6 +98,7 @@ struct zpci_dev { 
	unsigned long	iommu_pages;

	unsigned int	next_bit;



	char res_name[16];

	struct zpci_bar_struct bars[PCI_BAR_COUNT];



	u64		start_dma;	/* Start of available DMA addresses */
@@ -122,12 +124,10 @@ static inline bool zdev_enabled(struct zpci_dev *zdev) 
  Prototypes

----------------------------------------------------------------------------- */

/* Base stuff */

struct zpci_dev *zpci_alloc_device(void);

int zpci_create_device(struct zpci_dev *);

int zpci_enable_device(struct zpci_dev *);

int zpci_disable_device(struct zpci_dev *);

void zpci_stop_device(struct zpci_dev *);

void zpci_free_device(struct zpci_dev *);

int zpci_register_ioat(struct zpci_dev *, u8, u64, u64, u64);

int zpci_unregister_ioat(struct zpci_dev *, u8);

arch/s390/include/asm/sclp.h

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ struct sclp_cpu_info { 
int sclp_get_cpu_info(struct sclp_cpu_info *info);

int sclp_cpu_configure(u8 cpu);

int sclp_cpu_deconfigure(u8 cpu);

void sclp_facilities_detect(void);

unsigned long long sclp_get_rnmax(void);

unsigned long long sclp_get_rzm(void);

int sclp_sdias_blk_count(void);
@@ -57,5 +56,7 @@ bool sclp_has_vt220(void); 
int sclp_pci_configure(u32 fid);

int sclp_pci_deconfigure(u32 fid);

int memcpy_hsa(void *dest, unsigned long src, size_t count, int mode);

unsigned long sclp_get_hsa_size(void);

void sclp_early_detect(void);



#endif /* _ASM_S390_SCLP_H */