From 5e06f491762866b7c48de48195ef59ba3e7b9b0a Mon Sep 17 00:00:00 2001 From: VikasSource Date: Sat, 11 Aug 2018 11:14:24 +0530 Subject: [PATCH 1/6] Add .gitignore and oneplus3_defconfig --- .gitignore | 105 +++++ arch/arm64/configs/oneplus3_defconfig | 648 ++++++++++++++++++++++++++ 2 files changed, 753 insertions(+) create mode 100644 .gitignore create mode 100644 arch/arm64/configs/oneplus3_defconfig diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..f1e9527bff63 --- /dev/null +++ b/.gitignore @@ -0,0 +1,105 @@ +# +# NOTE! Don't add files that are generated in specific +# subdirectories here. Add them in the ".gitignore" file +# in that subdirectory instead. +# +# NOTE! Please use 'git ls-files -i --exclude-standard' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. +# +# Normal rules +# +.* +*.o +*.o.* +*.a +*.s +*.ko +*.so +*.so.dbg +*.mod.c +*.i +*.lst +*.symtypes +*.order +*.elf +*.bin +*.gz +*.bz2 +*.lzma +*.xz +*.lz4 +*.lzo +*.patch +*.gcno +modules.builtin +Module.symvers +*.dwo + +# +# Top-level generic files +# +/tags +/TAGS +/linux +/vmlinux +/vmlinuz +/System.map +/Module.markers + +# +# Debian directory (make deb-pkg) +# +/debian/ + +# +# git files that we don't want to ignore even it they are dot-files +# +!.gitignore +!.mailmap + +# +# Generated include files +# +include/config +include/generated +arch/*/include/generated + +# stgit generated dirs +patches-* + +# quilt's files +patches +series + +# cscope files +cscope.* +ncscope.* + +# gnu global files +GPATH +GRTAGS +GSYMS +GTAGS + +*.orig +*~ +\#*# + +# +# Leavings from module signing +# +extra_certificates +signing_key.priv +signing_key.x509 +x509.genkey + +# Kconfig presets +all.config + + +# compiled stuff +out/ + +# Wireguard +net/wireguard/ diff --git a/arch/arm64/configs/oneplus3_defconfig b/arch/arm64/configs/oneplus3_defconfig new file mode 100644 index 000000000000..9345508c6969 --- /dev/null +++ b/arch/arm64/configs/oneplus3_defconfig @@ -0,0 +1,648 @@ +CONFIG_LOCALVERSION="-VRishu-FunOS-Oreo" +# CONFIG_USELIB is not set +CONFIG_AUDIT=y +# CONFIG_AUDITSYSCALL is not set +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_TASKSTATS=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_RCU_FAST_NO_HZ=y +CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_ALL=y +CONFIG_LOG_CPU_MAX_BUF_SHIFT=15 +CONFIG_CGROUPS=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_SCHED_HMP=y +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_PID_NS is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_KALLSYMS_ALL=y +CONFIG_EMBEDDED=y +# CONFIG_SLUB_DEBUG is not set +CONFIG_PROFILING=y +CONFIG_CC_STACKPROTECTOR_STRONG=y +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=16 +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_IOSCHED_TEST=y +CONFIG_IOSCHED_BFQ=y +CONFIG_CGROUP_BFQIO=y +CONFIG_ARCH_MSM=y +CONFIG_ARCH_MSM8996=y +CONFIG_PCI_MSM=y +CONFIG_ENABLE_FP_SIMD_SETTINGS=y +CONFIG_MSM_APP_SETTINGS=y +CONFIG_SCHED_MC=y +CONFIG_NR_CPUS=4 +CONFIG_PREEMPT=y +CONFIG_CMA=y +CONFIG_CMA_DEBUGFS=y +CONFIG_ZSMALLOC=y +CONFIG_BALANCE_ANON_FILE_RECLAIM=y +CONFIG_KSWAPD_CPU_AFFINITY_MASK="f" +CONFIG_FORCE_ALLOC_FROM_DMA_ZONE=y +CONFIG_SECCOMP=y +CONFIG_ARMV8_DEPRECATED=y +CONFIG_SWP_EMULATION=y +CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_COMPAT=y +CONFIG_PM_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=0 +# CONFIG_PM_WAKELOCKS_GC is not set +CONFIG_PM_RUNTIME=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_FREQ=y +CONFIG_SCHED_FREQ_INPUT=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_INTERACTIVE=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_BOOST=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM_USER=y +CONFIG_XFRM_STATISTICS=y +CONFIG_NET_KEY=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_INET_AH=y +CONFIG_INET_ESP=y +CONFIG_INET_IPCOMP=y +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG_DESTROY=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_WESTWOOD=y +CONFIG_TCP_CONG_HTCP=y +CONFIG_TCP_CONG_HSTCP=y +CONFIG_TCP_CONG_HYBLA=y +CONFIG_TCP_CONG_SCALABLE=y +CONFIG_TCP_CONG_LP=y +CONFIG_TCP_CONG_VENO=y +CONFIG_TCP_CONG_YEAH=y +CONFIG_TCP_CONG_ILLINOIS=y +CONFIG_TCP_CONG_DCTCP=y +CONFIG_DEFAULT_WESTWOOD=y +CONFIG_IPV6=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=y +CONFIG_INET6_ESP=y +CONFIG_INET6_IPCOMP=y +CONFIG_IPV6_MIP6=y +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_NETFILTER=y +CONFIG_BRIDGE_NETFILTER=y +CONFIG_NF_CONNTRACK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_CONNTRACK_AMANDA=y +CONFIG_NF_CONNTRACK_FTP=y +CONFIG_NF_CONNTRACK_H323=y +CONFIG_NF_CONNTRACK_IRC=y +CONFIG_NF_CONNTRACK_NETBIOS_NS=y +CONFIG_NF_CONNTRACK_PPTP=y +CONFIG_NF_CONNTRACK_SANE=y +CONFIG_NF_CONNTRACK_TFTP=y +CONFIG_NF_CT_NETLINK=y +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y +CONFIG_NETFILTER_XT_TARGET_CONNMARK=y +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y +CONFIG_NETFILTER_XT_TARGET_HARDIDLETIMER=y +CONFIG_NETFILTER_XT_TARGET_LOG=y +CONFIG_NETFILTER_XT_TARGET_MARK=y +CONFIG_NETFILTER_XT_TARGET_NFLOG=y +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y +CONFIG_NETFILTER_XT_TARGET_NOTRACK=y +CONFIG_NETFILTER_XT_TARGET_TEE=y +CONFIG_NETFILTER_XT_TARGET_TPROXY=y +CONFIG_NETFILTER_XT_TARGET_TRACE=y +CONFIG_NETFILTER_XT_TARGET_SECMARK=y +CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +CONFIG_NETFILTER_XT_MATCH_COMMENT=y +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y +CONFIG_NETFILTER_XT_MATCH_CONNMARK=y +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y +CONFIG_NETFILTER_XT_MATCH_DSCP=y +CONFIG_NETFILTER_XT_MATCH_ESP=y +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y +CONFIG_NETFILTER_XT_MATCH_HELPER=y +CONFIG_NETFILTER_XT_MATCH_IPRANGE=y +# CONFIG_NETFILTER_XT_MATCH_L2TP is not set +CONFIG_NETFILTER_XT_MATCH_LENGTH=y +CONFIG_NETFILTER_XT_MATCH_LIMIT=y +CONFIG_NETFILTER_XT_MATCH_MAC=y +CONFIG_NETFILTER_XT_MATCH_MARK=y +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y +CONFIG_NETFILTER_XT_MATCH_POLICY=y +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y +CONFIG_NETFILTER_XT_MATCH_QTAGUID=y +CONFIG_NETFILTER_XT_MATCH_QUOTA=y +CONFIG_NETFILTER_XT_MATCH_QUOTA2=y +CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y +CONFIG_NETFILTER_XT_MATCH_SOCKET=y +CONFIG_NETFILTER_XT_MATCH_STATE=y +CONFIG_NETFILTER_XT_MATCH_STATISTIC=y +CONFIG_NETFILTER_XT_MATCH_STRING=y +CONFIG_NETFILTER_XT_MATCH_TIME=y +CONFIG_NETFILTER_XT_MATCH_U32=y +CONFIG_NF_CONNTRACK_IPV4=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_MATCH_AH=y +CONFIG_IP_NF_MATCH_ECN=y +CONFIG_IP_NF_MATCH_RPFILTER=y +CONFIG_IP_NF_MATCH_TTL=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_NETMAP=y +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_NF_MANGLE=y +CONFIG_IP_NF_RAW=y +CONFIG_IP_NF_SECURITY=y +CONFIG_IP_NF_ARPTABLES=y +CONFIG_IP_NF_ARPFILTER=y +CONFIG_IP_NF_ARP_MANGLE=y +CONFIG_NF_CONNTRACK_IPV6=y +CONFIG_IP6_NF_IPTABLES=y +CONFIG_IP6_NF_MATCH_RPFILTER=y +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_TARGET_REJECT=y +CONFIG_IP6_NF_MANGLE=y +CONFIG_IP6_NF_RAW=y +CONFIG_BRIDGE_NF_EBTABLES=y +CONFIG_BRIDGE_EBT_BROUTE=y +CONFIG_L2TP=y +CONFIG_L2TP_DEBUGFS=y +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=y +CONFIG_L2TP_ETH=y +CONFIG_BRIDGE=y +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_HTB=y +CONFIG_NET_SCH_PRIO=y +CONFIG_NET_SCH_MULTIQ=y +CONFIG_NET_SCH_INGRESS=y +CONFIG_NET_CLS_FW=y +CONFIG_NET_CLS_U32=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_FLOW=y +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_CMP=y +CONFIG_NET_EMATCH_NBYTE=y +CONFIG_NET_EMATCH_U32=y +CONFIG_NET_EMATCH_META=y +CONFIG_NET_EMATCH_TEXT=y +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_GACT=y +CONFIG_NET_ACT_MIRRED=y +CONFIG_NET_ACT_SKBEDIT=y +CONFIG_RMNET_DATA=y +CONFIG_RMNET_DATA_FC=y +CONFIG_SOCKEV_NLMCAST=y +CONFIG_BT=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=y +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=y +CONFIG_MSM_BT_POWER=y +CONFIG_CFG80211=y +CONFIG_CFG80211_INTERNAL_REGDB=y +CONFIG_RFKILL=y +CONFIG_NFC_NQ=y +CONFIG_IPC_ROUTER=y +CONFIG_IPC_ROUTER_SECURITY=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_DMA_CMA=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_UID_STAT=y +CONFIG_QSEECOM=y +CONFIG_HDCP_QSEECOM=y +CONFIG_UID_SYS_STATS=y +CONFIG_TUSB320_TYPE_C=y +CONFIG_FUSB301_TYPE_C=y +CONFIG_PTN5150_TYPE_C=y +CONFIG_TI_DRV2667=y +CONFIG_FORCE_FAST_CHARGE=y +CONFIG_EEPROM_AT24=y +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_UFSHCD=y +CONFIG_SCSI_UFSHCD_PLATFORM=y +CONFIG_SCSI_UFS_QCOM=y +CONFIG_SCSI_UFS_QCOM_ICE=y +CONFIG_SCSI_UFS_TEST=y +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_CRYPT=y +CONFIG_DM_REQ_CRYPT=y +CONFIG_DM_UEVENT=y +CONFIG_DM_VERITY=y +CONFIG_DM_VERITY_FEC=y +CONFIG_NETDEVICES=y +CONFIG_BONDING=y +CONFIG_DUMMY=y +CONFIG_TUN=y +CONFIG_ATL1C=y +CONFIG_MSM_RMNET_MHI=y +CONFIG_RNDIS_IPA=y +CONFIG_PPP=y +CONFIG_PPP_BSDCOMP=y +CONFIG_PPP_DEFLATE=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=y +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOE=y +CONFIG_PPPOL2TP=y +CONFIG_PPPOLAC=y +CONFIG_PPPOPNS=y +CONFIG_PPP_ASYNC=y +CONFIG_PPP_SYNC_TTY=y +CONFIG_USB_USBNET=y +CONFIG_USB_NET_QMI_WWAN=y +CONFIG_WCNSS_MEM_PRE_ALLOC=y +CONFIG_CNSS_CRYPTO=y +CONFIG_ATH_CARDS=y +CONFIG_WIL6210=y +CONFIG_CNSS=y +CONFIG_CNSS_PCI=y +CONFIG_CLD_LL_CORE=y +CONFIG_BUS_AUTO_SUSPEND=y +CONFIG_WLAN_FEATURE_RX_WAKELOCK=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_EVBUG=y +CONFIG_INPUT_KEYRESET=y +CONFIG_KEYBOARD_GPIO=y +# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_XPAD=y +CONFIG_INPUT_TABLET=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_SYNAPTICS_S1302_I2C_RMI=y +CONFIG_TOUCHSCREEN_SYNAPTICS_S3320_I2C_RMI=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_HBTP_INPUT=y +CONFIG_INPUT_KEYCHORD=y +CONFIG_INPUT_UINPUT=y +CONFIG_INPUT_GPIO=y +CONFIG_TRI_STATE_KEY=y +CONFIG_FINGERPRINT_FPC1022=y +# CONFIG_VT is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_DEVMEM is not set +# CONFIG_DEVKMEM is not set +CONFIG_SERIAL_MSM_HS=y +CONFIG_SERIAL_MSM_HSL=y +CONFIG_SERIAL_MSM_HSL_CONSOLE=y +CONFIG_SERIAL_MSM_SMD=y +CONFIG_DIAG_CHAR=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_MSM_LEGACY=y +# CONFIG_DEVPORT is not set +CONFIG_MSM_SMD_PKT=y +CONFIG_MSM_ADSPRPC=y +CONFIG_MSM_RDBG=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MSM_V2=y +CONFIG_SLIMBUS_MSM_NGD=y +CONFIG_SOUNDWIRE=y +CONFIG_SPI=y +CONFIG_SPI_QUP=y +CONFIG_SPI_SPIDEV=y +CONFIG_PINCTRL_MSM8996=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_QPNP_PIN=y +CONFIG_SMB1351_USB_CHARGER=y +CONFIG_QPNP_SMBCHARGER=y +CONFIG_QPNP_FG=y +CONFIG_FG_BQ27541=y +CONFIG_ONEPLUS_FASTCHG=y +CONFIG_BATTERY_BCL=y +CONFIG_MSM_BCL_CTL=y +CONFIG_MSM_BCL_PERIPHERAL_CTL=y +CONFIG_POWER_RESET_MSM=y +CONFIG_MSM_DLOAD_MODE=y +CONFIG_MSM_PM=y +CONFIG_APSS_CORE_EA=y +CONFIG_MSM_APM=y +CONFIG_SENSORS_EPM_ADC=y +CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y +CONFIG_SENSORS_QPNP_ADC_CURRENT=y +CONFIG_THERMAL=y +CONFIG_THERMAL_TSENS8974=y +CONFIG_LIMITS_MONITOR=y +CONFIG_LIMITS_LITE_HW=y +CONFIG_THERMAL_MONITOR=y +CONFIG_THERMAL_QPNP=y +CONFIG_THERMAL_QPNP_ADC_TM=y +CONFIG_WCD9330_CODEC=y +CONFIG_WCD9335_CODEC=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_PROXY_CONSUMER=y +CONFIG_REGULATOR_STUB=y +CONFIG_REGULATOR_FAN53555=y +CONFIG_REGULATOR_MEM_ACC=y +CONFIG_REGULATOR_RPM_SMD=y +CONFIG_REGULATOR_QPNP=y +CONFIG_REGULATOR_QPNP_LABIBB=y +CONFIG_REGULATOR_SPM=y +CONFIG_REGULATOR_CPR3_HMSS=y +CONFIG_REGULATOR_CPR3_MMSS=y +CONFIG_REGULATOR_KRYO=y +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_SOC_CAMERA=y +CONFIG_SOC_CAMERA_PLATFORM=y +CONFIG_MSM_VIDC_V4L2=y +CONFIG_MSM_VIDC_VMEM=y +CONFIG_MSM_VIDC_GOVERNORS=y +CONFIG_MSM_CAMERA=y +CONFIG_MSMB_CAMERA=y +CONFIG_MSM_CAMERA_SENSOR=y +CONFIG_MSM_CPP=y +CONFIG_MSM_CCI=y +CONFIG_MSM_CSI20_HEADER=y +CONFIG_MSM_CSI22_HEADER=y +CONFIG_MSM_CSI30_HEADER=y +CONFIG_MSM_CSI31_HEADER=y +CONFIG_MSM_CSIPHY=y +CONFIG_MSM_CSID=y +CONFIG_MSM_EEPROM=y +CONFIG_MSM_ISPIF=y +CONFIG_IMX134=y +CONFIG_IMX132=y +CONFIG_OV9724=y +CONFIG_OV5648=y +CONFIG_GC0339=y +CONFIG_OV8825=y +CONFIG_OV8865=y +CONFIG_s5k4e1=y +CONFIG_OV12830=y +CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y +CONFIG_MSMB_JPEG=y +CONFIG_MSM_FD=y +CONFIG_MSM_JPEGDMA=y +CONFIG_RADIO_SILABS=y +CONFIG_MSM_KGSL=y +CONFIG_FB=y +CONFIG_FB_MSM=y +CONFIG_FB_MSM_MDSS=y +CONFIG_FB_MSM_MDSS_WRITEBACK=y +CONFIG_FB_MSM_MDSS_HDMI_PANEL=y +CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y +CONFIG_FB_MSM_MDSS_KCAL_CTRL=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_USB_AUDIO=y +CONFIG_SND_SOC=y +CONFIG_SND_SOC_MSM8996=y +CONFIG_HIDRAW=y +CONFIG_UHID=y +CONFIG_HID_APPLE=y +CONFIG_HID_ELECOM=y +CONFIG_HID_MAGICMOUSE=y +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MULTITOUCH=y +CONFIG_USB_HIDDEV=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +CONFIG_USB_MON=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_STORAGE_ALAUDA=y +CONFIG_USB_STORAGE_KARMA=y +CONFIG_USB_STORAGE_CYPRESS_ATACB=y +CONFIG_USB_DWC3=y +CONFIG_USB_SERIAL=y +CONFIG_USB_EHSET_TEST_FIXTURE=y +CONFIG_USB_QTI_KS_BRIDGE=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_MSM_SSPHY_QMP=y +CONFIG_MSM_QUSB_PHY=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DEBUG_FS=y +CONFIG_USB_GADGET_VBUS_DRAW=500 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=4 +CONFIG_USB_G_ANDROID=y +CONFIG_MMC=y +CONFIG_MMC_PERF_PROFILING=y +CONFIG_MMC_CLKGATE=y +CONFIG_MMC_PARANOID_SD_INIT=y +CONFIG_MMC_BLOCK_MINORS=32 +CONFIG_MMC_TEST=y +CONFIG_MMC_BLOCK_TEST=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_MSM=y +CONFIG_MMC_SDHCI_MSM_ICE=y +CONFIG_MMC_CQ_HCI=y +CONFIG_LEDS_QPNP=y +CONFIG_LEDS_QPNP_FLASH=y +CONFIG_LEDS_QPNP_WLED=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_SWITCH=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_QPNP=y +CONFIG_ESOC=y +CONFIG_ESOC_DEV=y +CONFIG_ESOC_CLIENT=y +CONFIG_ESOC_MDM_4x=y +CONFIG_ESOC_MDM_DRV=y +CONFIG_DMADEVICES=y +CONFIG_QCOM_SPS_DMA=y +CONFIG_UIO=y +CONFIG_UIO_MSM_SHAREDMEM=y +CONFIG_STAGING=y +CONFIG_ANDROID=y +CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ASHMEM=y +CONFIG_ANDROID_TIMED_GPIO=y +CONFIG_ANDROID_LOW_MEMORY_KILLER=y +CONFIG_SW_SYNC_USER=y +CONFIG_ION=y +CONFIG_ION_MSM=y +CONFIG_MSM_AVTIMER=y +CONFIG_MSM_BUS_SCALING=y +CONFIG_BUS_TOPOLOGY_ADHOC=y +CONFIG_QPNP_POWER_ON=y +CONFIG_QPNP_REVID=y +CONFIG_QPNP_COINCELL=y +CONFIG_SPS=y +CONFIG_USB_BAM=y +CONFIG_SPS_SUPPORT_NDP_BAM=y +CONFIG_IPA=y +CONFIG_RMNET_IPA=y +CONFIG_MSM_MHI=y +CONFIG_MSM_MHI_UCI=y +CONFIG_SEEMP_CORE=y +CONFIG_QPNP_HAPTIC=y +CONFIG_GPIO_USB_DETECT=y +CONFIG_MSM_SPMI=y +CONFIG_MSM_SPMI_PMIC_ARB=y +CONFIG_MSM_QPNP_INT=y +CONFIG_MSM_CLK_CONTROLLER_V2=y +CONFIG_MSM_MDSS_PLL=y +CONFIG_REMOTE_SPINLOCK_MSM=y +CONFIG_IOMMU_IO_PGTABLE_FAST=y +CONFIG_ARM_SMMU=y +CONFIG_MSM_ADSP_LOADER=y +CONFIG_MSM_MEMORY_DUMP_V2=y +CONFIG_MSM_BOOT_STATS=y +CONFIG_MSM_WATCHDOG_V2=y +CONFIG_MSM_FORCE_WDOG_BITE_ON_PANIC=y +CONFIG_MSM_CACHE_M4M_ERP64=y +CONFIG_MSM_CACHE_M4M_ERP64_PANIC_ON_UE=y +CONFIG_MSM_RPM_SMD=y +CONFIG_MSM_RPM_LOG=y +CONFIG_MSM_RPM_STATS_LOG=y +CONFIG_MSM_RUN_QUEUE_STATS=y +CONFIG_MSM_SCM=y +CONFIG_MSM_SCM_ERRATA=y +CONFIG_MSM_MPM_OF=y +CONFIG_MSM_SMEM=y +CONFIG_MSM_SMD=y +CONFIG_MSM_GLINK=y +CONFIG_MSM_GLINK_LOOPBACK_SERVER=y +CONFIG_MSM_GLINK_SMD_XPRT=y +CONFIG_MSM_GLINK_SMEM_NATIVE_XPRT=y +CONFIG_MSM_SMEM_LOGGING=y +CONFIG_MSM_SMP2P=y +CONFIG_MSM_SMP2P_TEST=y +CONFIG_MSM_SPM=y +CONFIG_MSM_L2_SPM=y +CONFIG_MSM_QMI_INTERFACE=y +CONFIG_MSM_EVENT_TIMER=y +CONFIG_MSM_SYSMON_GLINK_COMM=y +CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y +CONFIG_MSM_GLINK_PKT=y +CONFIG_MSM_SUBSYSTEM_RESTART=y +CONFIG_MSM_PIL=y +CONFIG_MSM_PIL_SSR_GENERIC=y +CONFIG_MSM_PIL_MSS_QDSP6V5=y +CONFIG_TRACER_PKT=y +CONFIG_MSM_PERFORMANCE=y +CONFIG_MSM_POWER=y +CONFIG_MSM_QBT1000=y +CONFIG_MSM_KERNEL_PROTECT=y +CONFIG_QCOM_SMCINVOKE=y +CONFIG_QCOM_EARLY_RANDOM=y +CONFIG_RF_CABLE_DETECT=y +CONFIG_MEM_SHARE_QMI_SERVICE=y +CONFIG_SPDM_SCM=y +CONFIG_DEVFREQ_SPDM=y +CONFIG_PWM=y +CONFIG_PWM_QPNP=y +CONFIG_ARM_GIC_V3_ACL=y +CONFIG_SENSORS_SSC=y +CONFIG_MSM_TZ_LOG=y +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_FUSE_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_NTFS_FS=y +CONFIG_EXFAT_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_SDCARD_FS=y +CONFIG_PSTORE=y +CONFIG_PSTORE_CONSOLE=y +CONFIG_PSTORE_PMSG=y +CONFIG_PSTORE_RAM=y +CONFIG_F2FS_FS=y +CONFIG_F2FS_FS_SECURITY=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_INFO=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_PANIC_TIMEOUT=5 +CONFIG_PANIC_ON_RECURSIVE_FAULT=y +# CONFIG_SCHED_DEBUG is not set +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_IPC_LOGGING=y +CONFIG_CPU_FREQ_SWITCH_PROFILER=y +CONFIG_DEBUG_SET_MODULE_RONX=y +CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +CONFIG_HARDENED_USERCOPY=y +CONFIG_SECURITY_SELINUX=y +# CONFIG_INTEGRITY is not set +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_XCBC=y +CONFIG_CRYPTO_MD4=y +CONFIG_CRYPTO_TWOFISH=y +CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_DEV_QCRYPTO=y +CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y +CONFIG_CRYPTO_DEV_QCEDEV=y +CONFIG_CRYPTO_DEV_OTA_CRYPTO=y +CONFIG_CRYPTO_DEV_QCOM_ICE=y +CONFIG_ARM64_CRYPTO=y +CONFIG_CRYPTO_SHA1_ARM64_CE=y +CONFIG_CRYPTO_SHA2_ARM64_CE=y +CONFIG_CRYPTO_GHASH_ARM64_CE=y +CONFIG_CRYPTO_AES_ARM64_CE=y +CONFIG_CRYPTO_AES_ARM64_CE_CCM=y +CONFIG_CRYPTO_AES_ARM64_CE_BLK=y +CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y +CONFIG_QMI_ENCDEC=y From 4ed1a92198e8f56feb4a479d9949f863e4115ee3 Mon Sep 17 00:00:00 2001 From: VikasSource Date: Sat, 11 Aug 2018 11:26:09 +0530 Subject: [PATCH 2/6] Disable Verity --- arch/arm64/boot/dts/15801_DVT/msm8996.dtsi | 2 +- arch/arm64/boot/dts/15801_PVT/msm8996.dtsi | 2 +- arch/arm64/boot/dts/15811_PVT/msm8996.dtsi | 2 +- arch/arm64/boot/dts/15811_PVT2/msm8996.dtsi | 2 +- arch/arm64/boot/dts/15811_PVT3/msm8996.dtsi | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/15801_DVT/msm8996.dtsi b/arch/arm64/boot/dts/15801_DVT/msm8996.dtsi index 400c5b5c2762..3de763a47b6e 100644 --- a/arch/arm64/boot/dts/15801_DVT/msm8996.dtsi +++ b/arch/arm64/boot/dts/15801_DVT/msm8996.dtsi @@ -170,7 +170,7 @@ dev = "/dev/block/platform/soc/624000.ufshc/by-name/system"; type = "ext4"; mnt_flags = "ro,barrier=1,discard"; - fsmgr_flags = "wait,verify"; + fsmgr_flags = "wait"; status = "ok"; }; diff --git a/arch/arm64/boot/dts/15801_PVT/msm8996.dtsi b/arch/arm64/boot/dts/15801_PVT/msm8996.dtsi index d5d44bd19e82..e1eb6dcdfabc 100644 --- a/arch/arm64/boot/dts/15801_PVT/msm8996.dtsi +++ b/arch/arm64/boot/dts/15801_PVT/msm8996.dtsi @@ -170,7 +170,7 @@ dev = "/dev/block/platform/soc/624000.ufshc/by-name/system"; type = "ext4"; mnt_flags = "ro,barrier=1,discard"; - fsmgr_flags = "wait,verify"; + fsmgr_flags = "wait"; status = "ok"; }; diff --git a/arch/arm64/boot/dts/15811_PVT/msm8996.dtsi b/arch/arm64/boot/dts/15811_PVT/msm8996.dtsi index b8ca11ed7f49..102c0e1dd45c 100644 --- a/arch/arm64/boot/dts/15811_PVT/msm8996.dtsi +++ b/arch/arm64/boot/dts/15811_PVT/msm8996.dtsi @@ -170,7 +170,7 @@ dev = "/dev/block/platform/soc/624000.ufshc/by-name/system"; type = "ext4"; mnt_flags = "ro,barrier=1,discard"; - fsmgr_flags = "wait,verify"; + fsmgr_flags = "wait"; status = "ok"; }; diff --git a/arch/arm64/boot/dts/15811_PVT2/msm8996.dtsi b/arch/arm64/boot/dts/15811_PVT2/msm8996.dtsi index ad9d11ac3fbe..41d09e44e628 100644 --- a/arch/arm64/boot/dts/15811_PVT2/msm8996.dtsi +++ b/arch/arm64/boot/dts/15811_PVT2/msm8996.dtsi @@ -170,7 +170,7 @@ dev = "/dev/block/platform/soc/624000.ufshc/by-name/system"; type = "ext4"; mnt_flags = "ro,barrier=1,discard"; - fsmgr_flags = "wait,verify"; + fsmgr_flags = "wait"; status = "ok"; }; diff --git a/arch/arm64/boot/dts/15811_PVT3/msm8996.dtsi b/arch/arm64/boot/dts/15811_PVT3/msm8996.dtsi index 50fd578fcdcc..69a3c6a05009 100644 --- a/arch/arm64/boot/dts/15811_PVT3/msm8996.dtsi +++ b/arch/arm64/boot/dts/15811_PVT3/msm8996.dtsi @@ -170,7 +170,7 @@ dev = "/dev/block/platform/soc/624000.ufshc/by-name/system"; type = "ext4"; mnt_flags = "ro,barrier=1,discard"; - fsmgr_flags = "wait,verify"; + fsmgr_flags = "wait"; status = "ok"; }; From 9a8a973604b7100bef61ef45df78e16a503dee13 Mon Sep 17 00:00:00 2001 From: VikasSource Date: Sat, 11 Aug 2018 11:31:03 +0530 Subject: [PATCH 3/6] Add WireGuard --- net/Kconfig | 1 + net/Makefile | 1 + scripts/Kbuild.include | 1 + scripts/fetch-latest-wireguard.sh | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+) create mode 100755 scripts/fetch-latest-wireguard.sh diff --git a/net/Kconfig b/net/Kconfig index 4dd633e3b820..0d521b7e9809 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -87,6 +87,7 @@ config INET Short answer: say Y. if INET +source "net/wireguard/Kconfig" source "net/ipv4/Kconfig" source "net/ipv6/Kconfig" source "net/netlabel/Kconfig" diff --git a/net/Makefile b/net/Makefile index aba84d3dad4e..e70e049da562 100644 --- a/net/Makefile +++ b/net/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_NET) += $(tmp-y) obj-$(CONFIG_LLC) += llc/ obj-$(CONFIG_NET) += ethernet/ 802/ sched/ netlink/ obj-$(CONFIG_NETFILTER) += netfilter/ +obj-$(CONFIG_WIREGUARD) += wireguard/ obj-$(CONFIG_INET) += ipv4/ obj-$(CONFIG_XFRM) += xfrm/ obj-$(CONFIG_UNIX) += unix/ diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 5374b1bdf02f..21113e1614e2 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -294,3 +294,4 @@ why = \ echo-why = $(call escsq, $(strip $(why))) endif +$(shell cd "$(srctree)" && ./scripts/fetch-latest-wireguard.sh) diff --git a/scripts/fetch-latest-wireguard.sh b/scripts/fetch-latest-wireguard.sh new file mode 100755 index 000000000000..dcc25dec71fb --- /dev/null +++ b/scripts/fetch-latest-wireguard.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -e +USER_AGENT="WireGuard-AndroidROMBuild/0.1 ($(uname -a))" + +[[ $(( $(date +%s) - $(stat -c %Y "net/wireguard/.check" 2>/dev/null || echo 0) )) -gt 86400 ]] || exit 0 + +[[ $(curl -A "$USER_AGENT" -LSs https://git.zx2c4.com/WireGuard/refs/) =~ snapshot/WireGuard-([0-9.]+)\.tar\.xz ]] + +if [[ -f net/wireguard/version.h && $(< net/wireguard/version.h) == *${BASH_REMATCH[1]}* ]]; then + touch net/wireguard/.check + exit 0 +fi + +rm -rf net/wireguard +mkdir -p net/wireguard +curl -A "$USER_AGENT" -LsS "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${BASH_REMATCH[1]}.tar.xz" | tar -C "net/wireguard" -xJf - --strip-components=2 "WireGuard-${BASH_REMATCH[1]}/src" +sed -i 's/tristate/bool/;s/default m/default y/;' net/wireguard/Kconfig +touch net/wireguard/.check From 676305ee6e69a3315da1d7cd9050649a18014af7 Mon Sep 17 00:00:00 2001 From: VikasSource Date: Sat, 11 Aug 2018 11:49:16 +0530 Subject: [PATCH 4/6] GCC 7.3.1 Compilation --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index bf477e432a67..c728d1f87e92 100644 --- a/Makefile +++ b/Makefile @@ -353,7 +353,7 @@ include $(srctree)/scripts/Kbuild.include # Make variables (CC, etc...) AS = $(CROSS_COMPILE)as LD = $(CROSS_COMPILE)ld -REAL_CC = $(CROSS_COMPILE)gcc +CC = $(CROSS_COMPILE)gcc CPP = $(CC) -E AR = $(CROSS_COMPILE)ar NM = $(CROSS_COMPILE)nm @@ -368,9 +368,6 @@ PERL = perl PYTHON = python CHECK = sparse -# Use the wrapper for the compiler. This wrapper scans for new -# warnings and causes the build to stop upon encountering them. -CC = $(srctree)/scripts/gcc-wrapper.py $(REAL_CC) CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ -Wbitwise -Wno-return-void $(CF) @@ -632,6 +629,8 @@ endif # Tell gcc to never replace conditional load with a non-conditional one KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0) +# Needed to unbreak GCC 7.x and above +KBUILD_CFLAGS += $(call cc-option,-fno-store-merging,) ifdef CONFIG_READABLE_ASM # Disable optimizations that make assembler listings hard to read. # reorder blocks reorders the control in the function From 36f1079e5df59426aa3adce48440a9c6700c4892 Mon Sep 17 00:00:00 2001 From: VikasSource Date: Sun, 12 Aug 2018 11:15:39 +0530 Subject: [PATCH 5/6] Remove GCC Wrapper --- scripts/gcc-wrapper.py | 102 ----------------------------------------- 1 file changed, 102 deletions(-) delete mode 100755 scripts/gcc-wrapper.py diff --git a/scripts/gcc-wrapper.py b/scripts/gcc-wrapper.py deleted file mode 100755 index bb0ecb977165..000000000000 --- a/scripts/gcc-wrapper.py +++ /dev/null @@ -1,102 +0,0 @@ -#! /usr/bin/env python2 -# -*- coding: utf-8 -*- - -# Copyright (c) 2011-2015, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of The Linux Foundation nor -# the names of its contributors may be used to endorse or promote -# products derived from this software without specific prior written -# permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Invoke gcc, looking for warnings, and causing a failure if there are -# non-whitelisted warnings. - -import errno -import re -import os -import sys -import subprocess - -# Note that gcc uses unicode, which may depend on the locale. TODO: -# force LANG to be set to en_US.UTF-8 to get consistent warnings. - -allowed_warnings = set([ - "fdt.c:932", - "hid-magicmouse.c:579", - "sysrq.c:956", - "hci_sock.c:980", - "pppopns.c:296", - "pppopns.c:305", - "pppopns.c:336", - ]) - -# Capture the name of the object file, can find it. -ofile = None - -warning_re = re.compile(r'''(.*/|)([^/]+\.[a-z]+:\d+):(\d+:)? warning:''') -def interpret_warning(line): - """Decode the message from gcc. The messages we care about have a filename, and a warning""" - line = line.rstrip('\n') - m = warning_re.match(line) - if m and m.group(2) not in allowed_warnings: - print "error, forbidden warning:", m.group(2) - - # If there is a warning, remove any object if it exists. - if ofile: - try: - os.remove(ofile) - except OSError: - pass - sys.exit(1) - -def run_gcc(): - args = sys.argv[1:] - # Look for -o - try: - i = args.index('-o') - global ofile - ofile = args[i+1] - except (ValueError, IndexError): - pass - - compiler = sys.argv[0] - - try: - proc = subprocess.Popen(args, stderr=subprocess.PIPE) - for line in proc.stderr: - print line, - interpret_warning(line) - - result = proc.wait() - except OSError as e: - result = e.errno - if result == errno.ENOENT: - print args[0] + ':',e.strerror - print 'Is your PATH set correctly?' - else: - print ' '.join(args), str(e) - - return result - -if __name__ == '__main__': - status = run_gcc() - sys.exit(status) From 7de211ab328d1243f1166680ecb03dd2b1963d19 Mon Sep 17 00:00:00 2001 From: VikasSource Date: Sun, 12 Aug 2018 13:26:10 +0530 Subject: [PATCH 6/6] Fix GCC 7.3.1 Compilation Warning Tree Wide --- drivers/crypto/msm/qce50.c | 2 +- drivers/esoc/esoc-mdm-drv.c | 10 +++---- drivers/esoc/esoc.h | 2 +- drivers/esoc/esoc_dev.c | 2 +- drivers/i2c/busses/i2c-msm-v2.c | 2 +- .../touchscreen/synaptics_driver_s1302.c | 6 ++--- .../touchscreen/synaptics_driver_s3320.c | 8 +++--- .../platform/msm/camera_v2/isp/msm_isp40.c | 4 +-- .../platform/msm/camera_v2/isp/msm_isp44.c | 4 +-- drivers/media/platform/msm/camera_v2/msm.c | 4 +-- .../msm/camera_v2/sensor/msm_sensor_driver.c | 4 +-- .../media/platform/msm/vidc/msm_vidc_common.c | 6 ++--- drivers/misc/hdcp.c | 2 +- drivers/misc/qcom/qdsp6v2/audio_amrwbplus.c | 2 +- drivers/platform/msm/mhi/mhi_main.c | 6 ++--- drivers/platform/msm/mhi/mhi_states.c | 2 +- drivers/power/op_dash_adapter.c | 2 +- drivers/regulator/cpr3-regulator.c | 3 ++- drivers/slimbus/slimbus.c | 3 ++- drivers/soc/qcom/qbt1000.c | 3 ++- drivers/soc/qcom/subsystem_notif.c | 6 ++--- drivers/usb/gadget/function/u_ctrl_hsic.c | 2 +- drivers/usb/gadget/function/u_data_hsic.c | 2 +- drivers/video/msm/mdss/mdss_dsi_panel.c | 3 ++- drivers/video/msm/mdss/mdss_mdp_debug.c | 8 +++--- drivers/video/msm/mdss/mdss_mdp_debug.h | 4 +-- drivers/video/msm/mdss/mdss_mdp_intf_video.c | 2 +- drivers/video/msm/mdss/mdss_panel.h | 2 +- drivers/video/msm/mdss/msm_mdss_io_8974.c | 18 ++++++------- fs/exfat/exfat_core.c | 2 +- include/linux/msm_mhi.h | 4 +-- scripts/Kbuild.include | 1 + sound/soc/codecs/tfa9890/tfa98xx.c | 26 ++++++++----------- sound/soc/codecs/tfa9890/tfa_container.c | 2 +- sound/soc/codecs/wcd9xxx-mbhc.c | 8 +++--- .../soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c | 4 +-- sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c | 6 ++--- sound/soc/msm/qdsp6v2/msm-pcm-voice-v2.c | 2 +- 38 files changed, 90 insertions(+), 89 deletions(-) diff --git a/drivers/crypto/msm/qce50.c b/drivers/crypto/msm/qce50.c index 3060077aa15e..bc6f2ffda070 100644 --- a/drivers/crypto/msm/qce50.c +++ b/drivers/crypto/msm/qce50.c @@ -4620,7 +4620,7 @@ static int select_mode(struct qce_device *pce_dev, pce_dev->intr_cadence = 0; atomic_set(&pce_dev->bunch_cmd_seq, 0); atomic_set(&pce_dev->last_intr_seq, 0); - pce_dev->cadence_flag = ~pce_dev->cadence_flag; + pce_dev->cadence_flag = !pce_dev->cadence_flag; } } diff --git a/drivers/esoc/esoc-mdm-drv.c b/drivers/esoc/esoc-mdm-drv.c index ea389737f3ac..2735a87bc7f1 100644 --- a/drivers/esoc/esoc-mdm-drv.c +++ b/drivers/esoc/esoc-mdm-drv.c @@ -48,7 +48,7 @@ static int esoc_msm_restart_handler(struct notifier_block *nb, struct mdm_drv *mdm_drv = container_of(nb, struct mdm_drv, esoc_restart); struct esoc_clink *esoc_clink = mdm_drv->esoc_clink; - const struct esoc_clink_ops const *clink_ops = esoc_clink->clink_ops; + const struct esoc_clink_ops *clink_ops = esoc_clink->clink_ops; if (action == SYS_RESTART) { if (mdm_dbg_stall_notify(ESOC_PRIMARY_REBOOT)) return NOTIFY_OK; @@ -110,7 +110,7 @@ static void mdm_crash_shutdown(const struct subsys_desc *mdm_subsys) container_of(mdm_subsys, struct esoc_clink, subsys); - const struct esoc_clink_ops const *clink_ops = esoc_clink->clink_ops; + const struct esoc_clink_ops *clink_ops = esoc_clink->clink_ops; if (mdm_dbg_stall_notify(ESOC_PRIMARY_CRASH)) return; clink_ops->notify(ESOC_PRIMARY_CRASH, esoc_clink); @@ -123,7 +123,7 @@ static int mdm_subsys_shutdown(const struct subsys_desc *crashed_subsys, struct esoc_clink *esoc_clink = container_of(crashed_subsys, struct esoc_clink, subsys); struct mdm_drv *mdm_drv = esoc_get_drv_data(esoc_clink); - const struct esoc_clink_ops const *clink_ops = esoc_clink->clink_ops; + const struct esoc_clink_ops *clink_ops = esoc_clink->clink_ops; if (mdm_drv->mode == CRASH || mdm_drv->mode == PEER_CRASH) { if (mdm_dbg_stall_cmd(ESOC_PREPARE_DEBUG)) @@ -168,7 +168,7 @@ static int mdm_subsys_powerup(const struct subsys_desc *crashed_subsys) container_of(crashed_subsys, struct esoc_clink, subsys); struct mdm_drv *mdm_drv = esoc_get_drv_data(esoc_clink); - const struct esoc_clink_ops const *clink_ops = esoc_clink->clink_ops; + const struct esoc_clink_ops *clink_ops = esoc_clink->clink_ops; int timeout = INT_MAX; if (!esoc_clink->auto_boot && !esoc_req_eng_enabled(esoc_clink)) { @@ -220,7 +220,7 @@ static int mdm_subsys_ramdumps(int want_dumps, struct esoc_clink *esoc_clink = container_of(crashed_subsys, struct esoc_clink, subsys); - const struct esoc_clink_ops const *clink_ops = esoc_clink->clink_ops; + const struct esoc_clink_ops *clink_ops = esoc_clink->clink_ops; if (want_dumps) { ret = clink_ops->cmd_exe(ESOC_EXE_DEBUG, esoc_clink); diff --git a/drivers/esoc/esoc.h b/drivers/esoc/esoc.h index ee54908ce486..3b2955f2f05e 100644 --- a/drivers/esoc/esoc.h +++ b/drivers/esoc/esoc.h @@ -76,7 +76,7 @@ struct esoc_clink { struct platform_device *pdev; unsigned int id; struct module *owner; - const struct esoc_clink_ops const *clink_ops; + const struct esoc_clink_ops *clink_ops; struct esoc_eng *req_eng; struct esoc_eng *cmd_eng; spinlock_t notify_lock; diff --git a/drivers/esoc/esoc_dev.c b/drivers/esoc/esoc_dev.c index eaef90454a9c..50d4d43215b6 100644 --- a/drivers/esoc/esoc_dev.c +++ b/drivers/esoc/esoc_dev.c @@ -179,7 +179,7 @@ static long esoc_dev_ioctl(struct file *file, unsigned int cmd, struct esoc_uhandle *uhandle = file->private_data; struct esoc_udev *esoc_udev = uhandle->esoc_udev; struct esoc_clink *esoc_clink = uhandle->esoc_clink; - const struct esoc_clink_ops const *clink_ops = esoc_clink->clink_ops; + const struct esoc_clink_ops *clink_ops = esoc_clink->clink_ops; void __user *uarg = (void __user *)arg; switch (cmd) { diff --git a/drivers/i2c/busses/i2c-msm-v2.c b/drivers/i2c/busses/i2c-msm-v2.c index ff9d1d83487d..f6783e71af4f 100644 --- a/drivers/i2c/busses/i2c-msm-v2.c +++ b/drivers/i2c/busses/i2c-msm-v2.c @@ -2850,7 +2850,7 @@ static const struct i2c_algorithm i2c_msm_frmwrk_algrtm = { .functionality = i2c_msm_frmwrk_func, }; -static const char const *i2c_msm_adapter_name = "MSM-I2C-v2-adapter"; +static const char *i2c_msm_adapter_name = "MSM-I2C-v2-adapter"; static int i2c_msm_frmwrk_reg(struct platform_device *pdev, struct i2c_msm_ctrl *ctrl) diff --git a/drivers/input/touchscreen/synaptics_driver_s1302.c b/drivers/input/touchscreen/synaptics_driver_s1302.c index d4bac27f9762..3bc464e8df57 100644 --- a/drivers/input/touchscreen/synaptics_driver_s1302.c +++ b/drivers/input/touchscreen/synaptics_driver_s1302.c @@ -1168,9 +1168,9 @@ static ssize_t synaptics_s1302_radd_write(struct file *file, const char __user * { printk("reg=0x%x\n",reg[i]); } - } - else + } else { block = temp_block; + } return count; } static int synaptics_s1302_radd_open(struct inode *inode, struct file *file) @@ -2134,7 +2134,7 @@ static int synaptics_ts_probe(struct i2c_client *client, const struct i2c_device TPD_ERR("CURRENT_FIRMWARE_ID = 0x%x\n", CURRENT_FIRMWARE_ID); sprintf(ts->fw_id,"0x%x",CURRENT_FIRMWARE_ID); - memset(ts->fw_name,TP_FW_NAME_MAX_LEN,0); + memset(ts->fw_name,0,TP_FW_NAME_MAX_LEN); strcpy(ts->fw_name,"tp/fw_synaptics_touchkey.img"); TPD_DEBUG("synatpitcs_fw: fw_name = %s \n",ts->fw_name); diff --git a/drivers/input/touchscreen/synaptics_driver_s3320.c b/drivers/input/touchscreen/synaptics_driver_s3320.c index b3a434440111..aa14c73877b3 100644 --- a/drivers/input/touchscreen/synaptics_driver_s3320.c +++ b/drivers/input/touchscreen/synaptics_driver_s3320.c @@ -1817,9 +1817,9 @@ static ssize_t synap_write_address(struct file *file, const char __user *buffer, { TPD_DEBUG("reg=0x%x\n",reg[i]); } - } - else + } else { block = temp_block; + } return count; } @@ -4039,8 +4039,8 @@ static int synaptics_ts_probe(struct i2c_client *client, const struct i2c_device TP_FW = CURRENT_FIRMWARE_ID; sprintf(ts->fw_id,"0x%x",TP_FW); - memset(ts->fw_name,TP_FW_NAME_MAX_LEN,0); - memset(ts->test_limit_name,TP_FW_NAME_MAX_LEN,0); + memset(ts->fw_name,0,TP_FW_NAME_MAX_LEN); + memset(ts->test_limit_name,0,TP_FW_NAME_MAX_LEN); //sprintf(ts->manu_name, "TP_SYNAPTICS"); synaptics_rmi4_i2c_read_block(ts->client, F01_RMI_QUERY11,10, ts->manu_name); diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp40.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp40.c index 4c1fc359550c..ecf84139cb6b 100644 --- a/drivers/media/platform/msm/camera_v2/isp/msm_isp40.c +++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp40.c @@ -232,8 +232,8 @@ static int32_t msm_vfe40_init_qos_parms(struct vfe_device *vfe_dev, for (i = 0; i < ds_entries; i++) msm_camera_io_w(ds_settings[i], vfebase + ds_regs[i]); - kfree(ds_regs); - kfree(ds_settings); + kfree(ds_regs); + kfree(ds_settings); } } else { kfree(ds_regs); diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp44.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp44.c index e422d35a2e48..998a4787b515 100644 --- a/drivers/media/platform/msm/camera_v2/isp/msm_isp44.c +++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp44.c @@ -516,8 +516,8 @@ static void msm_vfe44_process_epoch_irq(struct vfe_device *vfe_dev, msm_isp_notify(vfe_dev, ISP_EVENT_SOF, VFE_PIX_0, ts); if (vfe_dev->axi_data.stream_update[VFE_PIX_0]) msm_isp_axi_stream_update(vfe_dev, VFE_PIX_0); - vfe_dev->hw_info->vfe_ops.core_ops.reg_update( - vfe_dev, VFE_PIX_0); + vfe_dev->hw_info->vfe_ops.core_ops.reg_update( + vfe_dev, VFE_PIX_0); } } } diff --git a/drivers/media/platform/msm/camera_v2/msm.c b/drivers/media/platform/msm/camera_v2/msm.c index dc7f85636d20..0fbc43d8b07f 100644 --- a/drivers/media/platform/msm/camera_v2/msm.c +++ b/drivers/media/platform/msm/camera_v2/msm.c @@ -1230,8 +1230,8 @@ static int msm_probe(struct platform_device *pdev) if (WARN_ON(rc < 0)) goto media_fail; - if (WARN_ON((rc == media_entity_init(&pvdev->vdev->entity, - 0, NULL, 0)) < 0)) + rc = media_entity_init(&pvdev->vdev->entity, 0, NULL, 0); + if (WARN_ON(rc < 0)) goto entity_fail; pvdev->vdev->entity.type = MEDIA_ENT_T_DEVNODE_V4L; diff --git a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c index 3ecbbe5e71d0..662ae9b9d0ce 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c +++ b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c @@ -1005,9 +1005,9 @@ int32_t msm_sensor_driver_probe(void *setting, push_component_info(CameraID,match_tbl[i].sensor_name, match_tbl[i].vendor_name); - msm_sensor_fill_sensor_info(s_ctrl, probed_info, entity_name); + msm_sensor_fill_sensor_info(s_ctrl, probed_info, entity_name); - return rc; + return rc; camera_power_down: s_ctrl->func_tbl->sensor_power_down(s_ctrl); diff --git a/drivers/media/platform/msm/vidc/msm_vidc_common.c b/drivers/media/platform/msm/vidc/msm_vidc_common.c index b77ba6c9a108..089ba46fbb67 100644 --- a/drivers/media/platform/msm/vidc/msm_vidc_common.c +++ b/drivers/media/platform/msm/vidc/msm_vidc_common.c @@ -3755,17 +3755,17 @@ int msm_comm_qbuf(struct msm_vidc_inst *inst, struct vb2_buffer *vb) * Don't queue if: * 1) Hardware isn't ready (that's simple) */ - defer = defer ?: inst->state != MSM_VIDC_START_DONE; + defer = defer || inst->state != MSM_VIDC_START_DONE; /* * 2) The client explicitly tells us not to because it wants this * buffer to be batched with future frames. The batch size (on both * capabilities) is completely determined by the client. */ - defer = defer ?: vb && vb->v4l2_buf.flags & V4L2_MSM_BUF_FLAG_DEFER; + defer = defer || (vb && vb->v4l2_buf.flags & V4L2_MSM_BUF_FLAG_DEFER); /* 3) If we're in batch mode, we must have full batches of both types */ - defer = defer ?: batch_mode && (!output_count || !capture_count); + defer = defer || (batch_mode && (!output_count || !capture_count)); if (defer) { dprintk(VIDC_DBG, "Deferring queue of %pK\n", vb); diff --git a/drivers/misc/hdcp.c b/drivers/misc/hdcp.c index 6f293e3a529d..bd7cb70aa585 100644 --- a/drivers/misc/hdcp.c +++ b/drivers/misc/hdcp.c @@ -1299,7 +1299,7 @@ static void hdcp_lib_msg_recvd(struct hdcp_lib_handle *handle) HDCP_TXMTR_SUBSTATE_WAITING_FOR_RECIEVERID_LIST) && (rsp_buf->timeout > 0)) handle->repeater_flag = true; - handle->update_stream = true; + handle->update_stream = true; } memset(handle->listener_buf, 0, MAX_TX_MESSAGE_SIZE); diff --git a/drivers/misc/qcom/qdsp6v2/audio_amrwbplus.c b/drivers/misc/qcom/qdsp6v2/audio_amrwbplus.c index 3c3f1c4927fd..cce33790a80f 100644 --- a/drivers/misc/qcom/qdsp6v2/audio_amrwbplus.c +++ b/drivers/misc/qcom/qdsp6v2/audio_amrwbplus.c @@ -106,7 +106,7 @@ static long audio_ioctl_shared(struct file *file, unsigned int cmd, audio->enabled); if (audio->stopped == 1) audio->stopped = 0; - break; + break; } default: pr_err("%s: Unknown ioctl cmd = %d", __func__, cmd); diff --git a/drivers/platform/msm/mhi/mhi_main.c b/drivers/platform/msm/mhi/mhi_main.c index 224f20c4f992..a4c0c16e2cd4 100644 --- a/drivers/platform/msm/mhi/mhi_main.c +++ b/drivers/platform/msm/mhi/mhi_main.c @@ -471,11 +471,11 @@ int mhi_open_channel(struct mhi_client_handle *client_handle) } EXPORT_SYMBOL(mhi_open_channel); -bool mhi_is_device_ready(const struct device const *dev, +bool mhi_is_device_ready(const struct device *dev, const char *node_name) { struct mhi_device_ctxt *itr; - const struct device_node const *of_node; + const struct device_node *of_node; bool match_found = false; if (!mhi_device_drv) @@ -505,7 +505,7 @@ int mhi_register_channel(struct mhi_client_handle **client_handle, struct mhi_client_info_t *client_info) { struct mhi_device_ctxt *mhi_dev_ctxt = NULL, *itr; - const struct device_node const *of_node; + const struct device_node *of_node; struct mhi_client_config *client_config; const char *node_name; enum MHI_CLIENT_CHANNEL chan; diff --git a/drivers/platform/msm/mhi/mhi_states.c b/drivers/platform/msm/mhi/mhi_states.c index 4a7fc892c962..38c0496db045 100644 --- a/drivers/platform/msm/mhi/mhi_states.c +++ b/drivers/platform/msm/mhi/mhi_states.c @@ -150,7 +150,7 @@ void mhi_set_m_state(struct mhi_device_ctxt *mhi_dev_ctxt, * L3: LD_ERR_FATAL_DETECT <--> LD_ERR_FATAL_DETECT * LD_ERR_FATAL_DETECT -> SHUTDOWN_PROCESS */ -static const struct mhi_pm_transitions const mhi_state_transitions[] = { +static const struct mhi_pm_transitions mhi_state_transitions[] = { /* L0 States */ { MHI_PM_DISABLE, diff --git a/drivers/power/op_dash_adapter.c b/drivers/power/op_dash_adapter.c index 5c74faf01c3f..09c7119d2092 100644 --- a/drivers/power/op_dash_adapter.c +++ b/drivers/power/op_dash_adapter.c @@ -90,7 +90,7 @@ static void dash_uart_tx_bit( else dash_uart_gpio_set_value( chip, chip->uart_tx_gpio, 0); - tx_bit++; + tx_bit++; break; case BIT_STOP: case BIT_IDLE: diff --git a/drivers/regulator/cpr3-regulator.c b/drivers/regulator/cpr3-regulator.c index ba354472ac89..933448af95cd 100644 --- a/drivers/regulator/cpr3-regulator.c +++ b/drivers/regulator/cpr3-regulator.c @@ -6097,11 +6097,12 @@ int cpr3_regulator_unregister(struct cpr3_controller *ctrl) if (ctrl->irq && !cpumask_empty(&ctrl->irq_affinity_mask)) unregister_hotcpu_notifier(&ctrl->cpu_hotplug_notifier); - if (ctrl->ctrl_type == CPR_CTRL_TYPE_CPR4) + if (ctrl->ctrl_type == CPR_CTRL_TYPE_CPR4) { rc = cpr3_ctrl_clear_cpr4_config(ctrl); if (rc) cpr3_err(ctrl, "failed to clear CPR4 configuration,rc=%d\n", rc); + } cpr3_ctrl_loop_disable(ctrl); diff --git a/drivers/slimbus/slimbus.c b/drivers/slimbus/slimbus.c index a01a226be8b5..938ae029f247 100644 --- a/drivers/slimbus/slimbus.c +++ b/drivers/slimbus/slimbus.c @@ -2742,9 +2742,10 @@ static void slim_change_existing_chans(struct slim_controller *ctrl, int coeff) for (i = 0; i < len; i++) { struct slim_ich *slc = arr[i]; if (slc->state == SLIM_CH_ACTIVE || - slc->state == SLIM_CH_SUSPENDED) + slc->state == SLIM_CH_SUSPENDED) { slc->offset = slc->newoff; slc->interval = slc->newintr; + } } } static void slim_chan_changes(struct slim_device *sb, bool revert) diff --git a/drivers/soc/qcom/qbt1000.c b/drivers/soc/qcom/qbt1000.c index 335333098a49..f33460814cef 100644 --- a/drivers/soc/qcom/qbt1000.c +++ b/drivers/soc/qcom/qbt1000.c @@ -1175,11 +1175,12 @@ static int qbt1000_read_spi_conn_properties(struct device_node *node, clock_name); if (IS_ERR(drvdata->clocks[index])) { rc = PTR_ERR(drvdata->clocks[index]); - if (rc != -EPROBE_DEFER) + if (rc != -EPROBE_DEFER) { dev_err(drvdata->dev, "%s: Failed get %s\n", __func__, clock_name); return rc; + } } if (!strcmp(clock_name, "spi_clk")) diff --git a/drivers/soc/qcom/subsystem_notif.c b/drivers/soc/qcom/subsystem_notif.c index 8b24008b5abe..3a89366a7509 100644 --- a/drivers/soc/qcom/subsystem_notif.c +++ b/drivers/soc/qcom/subsystem_notif.c @@ -160,9 +160,9 @@ int subsys_notif_queue_notification(void *subsys_handle, if (notif_type < 0 || notif_type >= SUBSYS_NOTIF_TYPE_COUNT) return -EINVAL; - ret = srcu_notifier_call_chain( - &subsys->subsys_notif_rcvr_list, notif_type, - data); + ret = srcu_notifier_call_chain( + &subsys->subsys_notif_rcvr_list, notif_type, + data); return ret; } EXPORT_SYMBOL(subsys_notif_queue_notification); diff --git a/drivers/usb/gadget/function/u_ctrl_hsic.c b/drivers/usb/gadget/function/u_ctrl_hsic.c index 6a12422760d9..4c1d3a98bf70 100644 --- a/drivers/usb/gadget/function/u_ctrl_hsic.c +++ b/drivers/usb/gadget/function/u_ctrl_hsic.c @@ -544,7 +544,7 @@ int ghsic_ctrl_setup(unsigned int num_ports, enum gadget_type gtype) free_ports: for (i = first_port_id; i < no_ctrl_ports; i++) ghsic_ctrl_port_free(i); - no_ctrl_ports = first_port_id; + no_ctrl_ports = first_port_id; return ret; } diff --git a/drivers/usb/gadget/function/u_data_hsic.c b/drivers/usb/gadget/function/u_data_hsic.c index 403f8ffbf226..4dc38cc75de7 100644 --- a/drivers/usb/gadget/function/u_data_hsic.c +++ b/drivers/usb/gadget/function/u_data_hsic.c @@ -1196,7 +1196,7 @@ int ghsic_data_setup(unsigned num_ports, enum gadget_type gtype) free_ports: for (i = first_port_id; i < no_data_ports; i++) ghsic_data_port_free(i); - no_data_ports = first_port_id; + no_data_ports = first_port_id; return ret; } diff --git a/drivers/video/msm/mdss/mdss_dsi_panel.c b/drivers/video/msm/mdss/mdss_dsi_panel.c index c6b80b2e4818..9cd9d9801990 100644 --- a/drivers/video/msm/mdss/mdss_dsi_panel.c +++ b/drivers/video/msm/mdss/mdss_dsi_panel.c @@ -730,9 +730,10 @@ int mdss_dsi_panel_reset(struct mdss_panel_data *pdata, int enable) usleep_range(10 * 1000,10 * 1000); gpio_set_value((ctrl_pdata->rst_gpio), 0); gpio_free(ctrl_pdata->rst_gpio); - if (gpio_is_valid(ctrl_pdata->mode_gpio)) + if (gpio_is_valid(ctrl_pdata->mode_gpio)) { gpio_free(ctrl_pdata->mode_gpio); usleep_range(10 * 1000,10 * 1000); + } } exit: diff --git a/drivers/video/msm/mdss/mdss_mdp_debug.c b/drivers/video/msm/mdss/mdss_mdp_debug.c index fc7daf1eacaf..b85200da41b5 100644 --- a/drivers/video/msm/mdss/mdss_mdp_debug.c +++ b/drivers/video/msm/mdss/mdss_mdp_debug.c @@ -1015,20 +1015,20 @@ static void __print_buf(struct seq_file *s, struct mdss_mdp_data *buf, { char tmpbuf[20]; int i; - const char const *buf_stat_stmap[] = { + const char *buf_stat_stmap[] = { [MDP_BUF_STATE_UNUSED] = "UNUSED ", [MDP_BUF_STATE_READY] = "READY ", [MDP_BUF_STATE_ACTIVE] = "ACTIVE ", [MDP_BUF_STATE_CLEANUP] = "CLEANUP", }; - const char const *domain_stmap[] = { + const char *domain_stmap[] = { [MDSS_IOMMU_DOMAIN_UNSECURE] = "mdp_unsecure", [MDSS_IOMMU_DOMAIN_ROT_UNSECURE] = "rot_unsecure", [MDSS_IOMMU_DOMAIN_SECURE] = "mdp_secure", [MDSS_IOMMU_DOMAIN_ROT_SECURE] = "rot_secure", [MDSS_IOMMU_MAX_DOMAIN] = "undefined", }; - const char const *dma_data_dir_stmap[] = { + const char *dma_data_dir_stmap[] = { [DMA_BIDIRECTIONAL] = "read/write", [DMA_TO_DEVICE] = "read", [DMA_FROM_DEVICE] = "read/write", @@ -1075,7 +1075,7 @@ static void __dump_pipe(struct seq_file *s, struct mdss_mdp_pipe *pipe) pipe->mixer_stage, pipe->alpha, pipe->transp, pipe->blend_op); if (pipe->multirect.max_rects > 1) { - const char const *fmodes[] = { + const char *fmodes[] = { [MDSS_MDP_PIPE_MULTIRECT_PARALLEL] = "parallel", [MDSS_MDP_PIPE_MULTIRECT_SERIAL] = "serial", [MDSS_MDP_PIPE_MULTIRECT_NONE] = "single", diff --git a/drivers/video/msm/mdss/mdss_mdp_debug.h b/drivers/video/msm/mdss/mdss_mdp_debug.h index 9a72577432ca..929ec18ee283 100644 --- a/drivers/video/msm/mdss/mdss_mdp_debug.h +++ b/drivers/video/msm/mdss/mdss_mdp_debug.h @@ -31,7 +31,7 @@ static inline const char *mdss_mdp_pipetype2str(u32 ptype) { - static const char const *strings[] = { + static const char *strings[] = { #define PIPE_TYPE(t) [MDSS_MDP_PIPE_TYPE_ ## t] = __stringify(t) PIPE_TYPE(VIG), PIPE_TYPE(RGB), @@ -48,7 +48,7 @@ static inline const char *mdss_mdp_pipetype2str(u32 ptype) static inline const char *mdss_mdp_format2str(u32 format) { - static const char const *strings[] = { + static const char *strings[] = { #define FORMAT_NAME(f) [MDP_ ## f] = __stringify(f) FORMAT_NAME(RGB_565), FORMAT_NAME(BGR_565), diff --git a/drivers/video/msm/mdss/mdss_mdp_intf_video.c b/drivers/video/msm/mdss/mdss_mdp_intf_video.c index 03bcd9c46e02..9116dfc3e498 100644 --- a/drivers/video/msm/mdss/mdss_mdp_intf_video.c +++ b/drivers/video/msm/mdss/mdss_mdp_intf_video.c @@ -72,7 +72,7 @@ struct mdss_mdp_video_ctx { u8 ref_cnt; u8 timegen_en; - bool polling_en; + int polling_en; u32 poll_cnt; struct completion vsync_comp; int wait_pending; diff --git a/drivers/video/msm/mdss/mdss_panel.h b/drivers/video/msm/mdss/mdss_panel.h index bfa96485b6be..b7c3039e80aa 100755 --- a/drivers/video/msm/mdss/mdss_panel.h +++ b/drivers/video/msm/mdss/mdss_panel.h @@ -68,7 +68,7 @@ enum fps_resolution { static inline const char *mdss_panel2str(u32 panel) { - static const char const *names[] = { + static const char *names[] = { #define PANEL_NAME(n) [n ## _PANEL] = __stringify(n) PANEL_NAME(MIPI_VIDEO), PANEL_NAME(MIPI_CMD), diff --git a/drivers/video/msm/mdss/msm_mdss_io_8974.c b/drivers/video/msm/mdss/msm_mdss_io_8974.c index fcc8545a12ed..2eea4d8604e4 100644 --- a/drivers/video/msm/mdss/msm_mdss_io_8974.c +++ b/drivers/video/msm/mdss/msm_mdss_io_8974.c @@ -1146,15 +1146,15 @@ static void mdss_dsi_phy_regulator_ctrl(struct mdss_dsi_ctrl_pdata *ctrl, mdss_dsi_20nm_phy_regulator_enable(ctrl); break; default: - /* - * For dual dsi case, do not reconfigure dsi phy - * regulator if the other dsi controller is still - * active. - */ - if (!mdss_dsi_is_hw_config_dual(sdata) || - (other_ctrl && (!other_ctrl->is_phyreg_enabled - || other_ctrl->mmss_clamp))) - mdss_dsi_28nm_phy_regulator_enable(ctrl); + /* + * For dual dsi case, do not reconfigure dsi phy + * regulator if the other dsi controller is still + * active. + */ + if (!mdss_dsi_is_hw_config_dual(sdata) || + (other_ctrl && (!other_ctrl->is_phyreg_enabled + || other_ctrl->mmss_clamp))) + mdss_dsi_28nm_phy_regulator_enable(ctrl); break; } } diff --git a/fs/exfat/exfat_core.c b/fs/exfat/exfat_core.c index d48514189f5b..e5182c2d3292 100644 --- a/fs/exfat/exfat_core.c +++ b/fs/exfat/exfat_core.c @@ -183,7 +183,7 @@ s32 ffsMountVol(struct super_block *sb) if (sector_read(sb, 0, &tmp_bh, 1) != FFS_SUCCESS) return FFS_MEDIAERR; - p_fs->PBR_sector = 0; + p_fs->PBR_sector = 0; p_pbr = (PBR_SECTOR_T *) tmp_bh->b_data; diff --git a/include/linux/msm_mhi.h b/include/linux/msm_mhi.h index 08dc3a23abfa..9efa56bda099 100644 --- a/include/linux/msm_mhi.h +++ b/include/linux/msm_mhi.h @@ -107,7 +107,7 @@ struct mhi_cb_info { struct mhi_client_info_t { enum MHI_CLIENT_CHANNEL chan; - const struct device const *dev; + const struct device *dev; const char *node_name; void (*mhi_client_cb)(struct mhi_cb_info *); bool pre_allocate; @@ -181,7 +181,7 @@ enum mhi_rddm_segment { * * @Return true if ready */ -bool mhi_is_device_ready(const struct device const *dev, +bool mhi_is_device_ready(const struct device *dev, const char *node_name); /** diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 21113e1614e2..61a74145e50c 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -294,4 +294,5 @@ why = \ echo-why = $(call escsq, $(strip $(why))) endif + $(shell cd "$(srctree)" && ./scripts/fetch-latest-wireguard.sh) diff --git a/sound/soc/codecs/tfa9890/tfa98xx.c b/sound/soc/codecs/tfa9890/tfa98xx.c index 236c768366f9..780466e119f2 100644 --- a/sound/soc/codecs/tfa9890/tfa98xx.c +++ b/sound/soc/codecs/tfa9890/tfa98xx.c @@ -889,13 +889,13 @@ static int tfa98xx_i2c_probe(struct i2c_client *i2c, struct tfa98xx *tfa98xx; int ret; struct device_node *np = i2c->dev.of_node; - int error = 0; + int error = 0; - pr_err("%s\n",__func__); + pr_err("%s\n",__func__); - if(np!=NULL) - tfa_codec_np =np; + if(np!=NULL) + tfa_codec_np =np; if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_I2C)) { dev_err(&i2c->dev, "check_functionality failed\n"); @@ -940,7 +940,7 @@ static int tfa98xx_i2c_probe(struct i2c_client *i2c, INIT_WORK(&tfa98xx->init_work, tfa98xx_dsp_init); INIT_WORK(&tfa98xx->stop_work, tfa98xx_stop); - tfa98xx->stop_ref = 0; + tfa98xx->stop_ref = 0; /* register codec */ ret = snd_soc_register_codec(&i2c->dev, &tfa98xx_soc_codec, @@ -954,16 +954,13 @@ static int tfa98xx_i2c_probe(struct i2c_client *i2c, error = sysfs_create_file(&i2c->dev.kobj, &tfa98xx_state_attr.attr); - if(error < 0) - { - pr_err("%s sysfs_create_file tfa98xx_state_attr err.",__func__); - } -/* zhiguang.su@MultiMedia.AudioDrv on 2015-11-09, add for debug*/ + if (error < 0) + pr_err("%s sysfs_create_file tfa98xx_state_attr err.",__func__); + + /* zhiguang.su@MultiMedia.AudioDrv on 2015-11-09, add for debug*/ error = sysfs_create_file(&i2c->dev.kobj, &tfa98xx_Log_state_attr.attr); - if(error < 0) - { - pr_err("%s sysfs_create_file tfa98xx_Log_state_attr err.",__func__); - } + if (error < 0) + pr_err("%s sysfs_create_file tfa98xx_Log_state_attr err.",__func__); return ret; @@ -972,7 +969,6 @@ static int tfa98xx_i2c_probe(struct i2c_client *i2c, gpio_fail: wq_fail: snd_soc_unregister_codec(&i2c->dev); - return ret; } diff --git a/sound/soc/codecs/tfa9890/tfa_container.c b/sound/soc/codecs/tfa9890/tfa_container.c index 6b5e05ebbedb..5caba6ca4fc9 100644 --- a/sound/soc/codecs/tfa9890/tfa_container.c +++ b/sound/soc/codecs/tfa9890/tfa_container.c @@ -289,7 +289,7 @@ int tfaContWriteRegsProf(struct tfa98xx *tfa98xx, int profile) err = tfaRunWriteBitfield(tfa98xx, tfaContDsc2Bf(prof->list[i])); } - if (!prof->list[i].type == dscRegister) { + if (prof->list[i].type == dscRegister) { err = tfaRunWriteRegister(tfa98xx, (struct nxpTfaRegpatch *)(base + prof->list[i].offset)); } diff --git a/sound/soc/codecs/wcd9xxx-mbhc.c b/sound/soc/codecs/wcd9xxx-mbhc.c index b6e6157f80bd..89cda67589be 100644 --- a/sound/soc/codecs/wcd9xxx-mbhc.c +++ b/sound/soc/codecs/wcd9xxx-mbhc.c @@ -401,10 +401,10 @@ static bool __wcd9xxx_switch_micbias(struct wcd9xxx_mbhc *mbhc, restartpolling) wcd9xxx_pause_hs_polling(mbhc); - snd_soc_update_bits(codec, WCD9XXX_A_MAD_ANA_CTRL, - 0x10, 0x10); - snd_soc_update_bits(codec, WCD9XXX_A_LDO_H_MODE_1, - 0x20, 0x20); + snd_soc_update_bits(codec, WCD9XXX_A_MAD_ANA_CTRL, + 0x10, 0x10); + snd_soc_update_bits(codec, WCD9XXX_A_LDO_H_MODE_1, + 0x20, 0x20); /* Reprogram thresholds */ if (d->micb_mv != VDDIO_MICBIAS_MV) { cfilt_k_val = diff --git a/sound/soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c b/sound/soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c index 1286d3185780..45c44e087038 100644 --- a/sound/soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c +++ b/sound/soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c @@ -79,7 +79,7 @@ int msm_audio_effects_enable_extn(struct audio_client *ac, if (effects->virtualizer.enable_flag) q6asm_send_audio_effects_params(ac, (char *)&updt_params[0], params_length); - memset(updt_params, 0, MAX_ENABLE_CMD_SIZE); + memset(updt_params, 0, sizeof(updt_params)); params_length = 0; updt_params[0] = AUDPROC_MODULE_ID_BASS_BOOST; updt_params[1] = AUDPROC_PARAM_ID_ENABLE; @@ -89,7 +89,7 @@ int msm_audio_effects_enable_extn(struct audio_client *ac, if (effects->bass_boost.enable_flag) q6asm_send_audio_effects_params(ac, (char *)&updt_params[0], params_length); - memset(updt_params, 0, MAX_ENABLE_CMD_SIZE); + memset(updt_params, 0, sizeof(updt_params)); params_length = 0; updt_params[0] = AUDPROC_MODULE_ID_POPLESS_EQUALIZER; updt_params[1] = AUDPROC_PARAM_ID_ENABLE; diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c index 7930da874864..4b18a840bc75 100644 --- a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c +++ b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c @@ -9751,15 +9751,15 @@ static const char * const mi2s_rx_vi_fb_tx_mux_text[] = { "ZERO", "SENARY_TX" }; -static const int const slim0_rx_vi_fb_tx_lch_value[] = { +static const int slim0_rx_vi_fb_tx_lch_value[] = { MSM_BACKEND_DAI_MAX, MSM_BACKEND_DAI_SLIMBUS_4_TX }; -static const int const slim0_rx_vi_fb_tx_rch_value[] = { +static const int slim0_rx_vi_fb_tx_rch_value[] = { MSM_BACKEND_DAI_MAX, MSM_BACKEND_DAI_SLIMBUS_4_TX }; -static const int const mi2s_rx_vi_fb_tx_value[] = { +static const int mi2s_rx_vi_fb_tx_value[] = { MSM_BACKEND_DAI_MAX, MSM_BACKEND_DAI_SENARY_MI2S_TX }; diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-voice-v2.c b/sound/soc/msm/qdsp6v2/msm-pcm-voice-v2.c index 286fff1eb4a8..618d831d4021 100644 --- a/sound/soc/msm/qdsp6v2/msm-pcm-voice-v2.c +++ b/sound/soc/msm/qdsp6v2/msm-pcm-voice-v2.c @@ -494,7 +494,7 @@ static int msm_voice_rx_device_mute_put(struct snd_kcontrol *kcontrol, -static const char const *tty_mode[] = {"OFF", "HCO", "VCO", "FULL"}; +static const char *tty_mode[] = {"OFF", "HCO", "VCO", "FULL"}; static const struct soc_enum msm_tty_mode_enum[] = { SOC_ENUM_SINGLE_EXT(4, tty_mode), };