tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

scsi: sr: remove references to BLK_DEV_SR_VENDOR, leave it enabled

This kernel configuration is basically enabling/disabling sr driver quirks
detection. While these quirks are for fairly rare devices (very old CD
burners, and a glucometer), the additional detection of these models is a
very minimal amount of code.

The logic behind the quirks is always built into the sr driver.

This also removes the config from all the defconfig files that are enabling
this already.

Link: https://lore.kernel.org/r/20200223191144.726-1-flameeyes@flameeyes.com
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Diego Elio Pettenò and committed by
Martin K. Petersen 679b2ec8 30f6d494

-60
-1
arch/alpha/configs/defconfig
··· 36 36 CONFIG_SCSI=y 37 37 CONFIG_BLK_DEV_SD=y 38 38 CONFIG_BLK_DEV_SR=y 39 - CONFIG_BLK_DEV_SR_VENDOR=y 40 39 CONFIG_SCSI_AIC7XXX=m 41 40 CONFIG_AIC7XXX_CMDS_PER_DEVICE=253 42 41 # CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-1
arch/arm/configs/rpc_defconfig
··· 32 32 CONFIG_BLK_DEV_SD=y 33 33 CONFIG_CHR_DEV_ST=m 34 34 CONFIG_BLK_DEV_SR=y 35 - CONFIG_BLK_DEV_SR_VENDOR=y 36 35 CONFIG_CHR_DEV_SG=y 37 36 CONFIG_SCSI_CONSTANTS=y 38 37 CONFIG_SCSI_LOGGING=y
-1
arch/arm/configs/s3c2410_defconfig
··· 202 202 CONFIG_BLK_DEV_SD=y 203 203 CONFIG_CHR_DEV_ST=m 204 204 CONFIG_BLK_DEV_SR=y 205 - CONFIG_BLK_DEV_SR_VENDOR=y 206 205 CONFIG_CHR_DEV_SG=y 207 206 CONFIG_CHR_DEV_SCH=m 208 207 CONFIG_SCSI_CONSTANTS=y
-1
arch/ia64/configs/zx1_defconfig
··· 35 35 CONFIG_CHR_DEV_ST=y 36 36 CONFIG_CHR_DEV_OSST=y 37 37 CONFIG_BLK_DEV_SR=y 38 - CONFIG_BLK_DEV_SR_VENDOR=y 39 38 CONFIG_CHR_DEV_SG=y 40 39 CONFIG_SCSI_CONSTANTS=y 41 40 CONFIG_SCSI_LOGGING=y
-1
arch/m68k/configs/amiga_defconfig
··· 334 334 CONFIG_BLK_DEV_SD=y 335 335 CONFIG_CHR_DEV_ST=m 336 336 CONFIG_BLK_DEV_SR=y 337 - CONFIG_BLK_DEV_SR_VENDOR=y 338 337 CONFIG_CHR_DEV_SG=m 339 338 CONFIG_SCSI_CONSTANTS=y 340 339 CONFIG_SCSI_SAS_ATTRS=m
-1
arch/m68k/configs/apollo_defconfig
··· 319 319 CONFIG_BLK_DEV_SD=y 320 320 CONFIG_CHR_DEV_ST=m 321 321 CONFIG_BLK_DEV_SR=y 322 - CONFIG_BLK_DEV_SR_VENDOR=y 323 322 CONFIG_CHR_DEV_SG=m 324 323 CONFIG_SCSI_CONSTANTS=y 325 324 CONFIG_SCSI_SAS_ATTRS=m
-1
arch/m68k/configs/atari_defconfig
··· 334 334 CONFIG_BLK_DEV_SD=y 335 335 CONFIG_CHR_DEV_ST=m 336 336 CONFIG_BLK_DEV_SR=y 337 - CONFIG_BLK_DEV_SR_VENDOR=y 338 337 CONFIG_CHR_DEV_SG=m 339 338 CONFIG_SCSI_CONSTANTS=y 340 339 CONFIG_SCSI_SAS_ATTRS=m
-1
arch/m68k/configs/bvme6000_defconfig
··· 316 316 CONFIG_BLK_DEV_SD=y 317 317 CONFIG_CHR_DEV_ST=m 318 318 CONFIG_BLK_DEV_SR=y 319 - CONFIG_BLK_DEV_SR_VENDOR=y 320 319 CONFIG_CHR_DEV_SG=m 321 320 CONFIG_SCSI_CONSTANTS=y 322 321 CONFIG_SCSI_SAS_ATTRS=m
-1
arch/m68k/configs/hp300_defconfig
··· 318 318 CONFIG_BLK_DEV_SD=y 319 319 CONFIG_CHR_DEV_ST=m 320 320 CONFIG_BLK_DEV_SR=y 321 - CONFIG_BLK_DEV_SR_VENDOR=y 322 321 CONFIG_CHR_DEV_SG=m 323 322 CONFIG_SCSI_CONSTANTS=y 324 323 CONFIG_SCSI_SAS_ATTRS=m
-1
arch/m68k/configs/mac_defconfig
··· 325 325 CONFIG_BLK_DEV_SD=y 326 326 CONFIG_CHR_DEV_ST=m 327 327 CONFIG_BLK_DEV_SR=y 328 - CONFIG_BLK_DEV_SR_VENDOR=y 329 328 CONFIG_CHR_DEV_SG=m 330 329 CONFIG_SCSI_CONSTANTS=y 331 330 CONFIG_SCSI_SAS_ATTRS=m
-1
arch/m68k/configs/multi_defconfig
··· 358 358 CONFIG_BLK_DEV_SD=y 359 359 CONFIG_CHR_DEV_ST=m 360 360 CONFIG_BLK_DEV_SR=y 361 - CONFIG_BLK_DEV_SR_VENDOR=y 362 361 CONFIG_CHR_DEV_SG=m 363 362 CONFIG_SCSI_CONSTANTS=y 364 363 CONFIG_SCSI_SAS_ATTRS=m
-1
arch/m68k/configs/mvme147_defconfig
··· 315 315 CONFIG_BLK_DEV_SD=y 316 316 CONFIG_CHR_DEV_ST=m 317 317 CONFIG_BLK_DEV_SR=y 318 - CONFIG_BLK_DEV_SR_VENDOR=y 319 318 CONFIG_CHR_DEV_SG=m 320 319 CONFIG_SCSI_CONSTANTS=y 321 320 CONFIG_SCSI_SAS_ATTRS=m
-1
arch/m68k/configs/mvme16x_defconfig
··· 316 316 CONFIG_BLK_DEV_SD=y 317 317 CONFIG_CHR_DEV_ST=m 318 318 CONFIG_BLK_DEV_SR=y 319 - CONFIG_BLK_DEV_SR_VENDOR=y 320 319 CONFIG_CHR_DEV_SG=m 321 320 CONFIG_SCSI_CONSTANTS=y 322 321 CONFIG_SCSI_SAS_ATTRS=m
-1
arch/m68k/configs/q40_defconfig
··· 324 324 CONFIG_BLK_DEV_SD=y 325 325 CONFIG_CHR_DEV_ST=m 326 326 CONFIG_BLK_DEV_SR=y 327 - CONFIG_BLK_DEV_SR_VENDOR=y 328 327 CONFIG_CHR_DEV_SG=m 329 328 CONFIG_SCSI_CONSTANTS=y 330 329 CONFIG_SCSI_SAS_ATTRS=m
-1
arch/m68k/configs/sun3_defconfig
··· 313 313 CONFIG_BLK_DEV_SD=y 314 314 CONFIG_CHR_DEV_ST=m 315 315 CONFIG_BLK_DEV_SR=y 316 - CONFIG_BLK_DEV_SR_VENDOR=y 317 316 CONFIG_CHR_DEV_SG=m 318 317 CONFIG_SCSI_CONSTANTS=y 319 318 CONFIG_SCSI_SAS_ATTRS=m
-1
arch/m68k/configs/sun3x_defconfig
··· 313 313 CONFIG_BLK_DEV_SD=y 314 314 CONFIG_CHR_DEV_ST=m 315 315 CONFIG_BLK_DEV_SR=y 316 - CONFIG_BLK_DEV_SR_VENDOR=y 317 316 CONFIG_CHR_DEV_SG=m 318 317 CONFIG_SCSI_CONSTANTS=y 319 318 CONFIG_SCSI_SAS_ATTRS=m
-1
arch/mips/configs/bigsur_defconfig
··· 112 112 CONFIG_BLK_DEV_SD=y 113 113 CONFIG_CHR_DEV_ST=y 114 114 CONFIG_BLK_DEV_SR=y 115 - CONFIG_BLK_DEV_SR_VENDOR=y 116 115 CONFIG_CHR_DEV_SG=m 117 116 CONFIG_CHR_DEV_SCH=m 118 117 CONFIG_ATA=y
-1
arch/mips/configs/fuloong2e_defconfig
··· 99 99 CONFIG_ATA_OVER_ETH=m 100 100 CONFIG_BLK_DEV_SD=y 101 101 CONFIG_BLK_DEV_SR=y 102 - CONFIG_BLK_DEV_SR_VENDOR=y 103 102 CONFIG_CHR_DEV_SG=y 104 103 CONFIG_SCSI_CONSTANTS=y 105 104 # CONFIG_SCSI_LOWLEVEL is not set
-1
arch/mips/configs/ip27_defconfig
··· 99 99 CONFIG_BLK_DEV_SD=y 100 100 CONFIG_CHR_DEV_ST=y 101 101 CONFIG_BLK_DEV_SR=m 102 - CONFIG_BLK_DEV_SR_VENDOR=y 103 102 CONFIG_CHR_DEV_SG=m 104 103 CONFIG_CHR_DEV_SCH=m 105 104 CONFIG_SCSI_CONSTANTS=y
-1
arch/mips/configs/ip32_defconfig
··· 50 50 CONFIG_SCSI=y 51 51 CONFIG_BLK_DEV_SD=y 52 52 CONFIG_BLK_DEV_SR=y 53 - CONFIG_BLK_DEV_SR_VENDOR=y 54 53 CONFIG_CHR_DEV_SG=m 55 54 CONFIG_SCSI_CONSTANTS=y 56 55 CONFIG_SCSI_LOGGING=y
-1
arch/mips/configs/jazz_defconfig
··· 191 191 CONFIG_BLK_DEV_SD=y 192 192 CONFIG_CHR_DEV_ST=m 193 193 CONFIG_BLK_DEV_SR=m 194 - CONFIG_BLK_DEV_SR_VENDOR=y 195 194 CONFIG_SCSI_CONSTANTS=y 196 195 CONFIG_SCSI_SCAN_ASYNC=y 197 196 CONFIG_SCSI_FC_ATTRS=y
-1
arch/mips/configs/malta_defconfig
··· 239 239 CONFIG_CHR_DEV_ST=m 240 240 CONFIG_CHR_DEV_OSST=m 241 241 CONFIG_BLK_DEV_SR=y 242 - CONFIG_BLK_DEV_SR_VENDOR=y 243 242 CONFIG_CHR_DEV_SG=m 244 243 CONFIG_SCSI_CONSTANTS=y 245 244 CONFIG_SCSI_LOGGING=y
-1
arch/mips/configs/malta_kvm_defconfig
··· 247 247 CONFIG_CHR_DEV_ST=m 248 248 CONFIG_CHR_DEV_OSST=m 249 249 CONFIG_BLK_DEV_SR=y 250 - CONFIG_BLK_DEV_SR_VENDOR=y 251 250 CONFIG_CHR_DEV_SG=m 252 251 CONFIG_SCSI_CONSTANTS=y 253 252 CONFIG_SCSI_LOGGING=y
-1
arch/mips/configs/malta_kvm_guest_defconfig
··· 245 245 CONFIG_CHR_DEV_ST=m 246 246 CONFIG_CHR_DEV_OSST=m 247 247 CONFIG_BLK_DEV_SR=y 248 - CONFIG_BLK_DEV_SR_VENDOR=y 249 248 CONFIG_CHR_DEV_SG=m 250 249 CONFIG_SCSI_CONSTANTS=y 251 250 CONFIG_SCSI_LOGGING=y
-1
arch/mips/configs/maltaup_xpa_defconfig
··· 245 245 CONFIG_CHR_DEV_ST=m 246 246 CONFIG_CHR_DEV_OSST=m 247 247 CONFIG_BLK_DEV_SR=y 248 - CONFIG_BLK_DEV_SR_VENDOR=y 249 248 CONFIG_CHR_DEV_SG=m 250 249 CONFIG_SCSI_CONSTANTS=y 251 250 CONFIG_SCSI_LOGGING=y
-1
arch/mips/configs/rm200_defconfig
··· 203 203 CONFIG_BLK_DEV_SD=y 204 204 CONFIG_CHR_DEV_ST=m 205 205 CONFIG_BLK_DEV_SR=m 206 - CONFIG_BLK_DEV_SR_VENDOR=y 207 206 CONFIG_SCSI_CONSTANTS=y 208 207 CONFIG_SCSI_SCAN_ASYNC=y 209 208 CONFIG_SCSI_FC_ATTRS=y
-1
arch/powerpc/configs/85xx-hw.config
··· 2 2 CONFIG_AT803X_PHY=y 3 3 CONFIG_ATA=y 4 4 CONFIG_BLK_DEV_SD=y 5 - CONFIG_BLK_DEV_SR_VENDOR=y 6 5 CONFIG_BLK_DEV_SR=y 7 6 CONFIG_BROADCOM_PHY=y 8 7 CONFIG_C293_PCIE=y
-1
arch/powerpc/configs/amigaone_defconfig
··· 44 44 CONFIG_BLK_DEV_SD=y 45 45 CONFIG_CHR_DEV_ST=y 46 46 CONFIG_BLK_DEV_SR=y 47 - CONFIG_BLK_DEV_SR_VENDOR=y 48 47 CONFIG_CHR_DEV_SG=y 49 48 CONFIG_SCSI_CONSTANTS=y 50 49 CONFIG_SCSI_SYM53C8XX_2=y
-1
arch/powerpc/configs/chrp32_defconfig
··· 42 42 CONFIG_BLK_DEV_SD=y 43 43 CONFIG_CHR_DEV_ST=y 44 44 CONFIG_BLK_DEV_SR=y 45 - CONFIG_BLK_DEV_SR_VENDOR=y 46 45 CONFIG_CHR_DEV_SG=y 47 46 CONFIG_SCSI_CONSTANTS=y 48 47 CONFIG_SCSI_SYM53C8XX_2=y
-1
arch/powerpc/configs/g5_defconfig
··· 62 62 CONFIG_BLK_DEV_SD=y 63 63 CONFIG_CHR_DEV_ST=y 64 64 CONFIG_BLK_DEV_SR=y 65 - CONFIG_BLK_DEV_SR_VENDOR=y 66 65 CONFIG_CHR_DEV_SG=y 67 66 CONFIG_SCSI_CONSTANTS=y 68 67 CONFIG_SCSI_SPI_ATTRS=y
-1
arch/powerpc/configs/maple_defconfig
··· 41 41 # CONFIG_SCSI_PROC_FS is not set 42 42 CONFIG_BLK_DEV_SD=y 43 43 CONFIG_BLK_DEV_SR=y 44 - CONFIG_BLK_DEV_SR_VENDOR=y 45 44 CONFIG_CHR_DEV_SG=y 46 45 CONFIG_SCSI_IPR=y 47 46 CONFIG_ATA=y
-1
arch/powerpc/configs/pasemi_defconfig
··· 60 60 CONFIG_CHR_DEV_ST=y 61 61 CONFIG_CHR_DEV_OSST=y 62 62 CONFIG_BLK_DEV_SR=y 63 - CONFIG_BLK_DEV_SR_VENDOR=y 64 63 CONFIG_CHR_DEV_SG=y 65 64 CONFIG_CHR_DEV_SCH=y 66 65 CONFIG_SCSI_CONSTANTS=y
-1
arch/powerpc/configs/pmac32_defconfig
··· 117 117 CONFIG_BLK_DEV_SD=y 118 118 CONFIG_CHR_DEV_ST=y 119 119 CONFIG_BLK_DEV_SR=y 120 - CONFIG_BLK_DEV_SR_VENDOR=y 121 120 CONFIG_CHR_DEV_SG=y 122 121 CONFIG_SCSI_CONSTANTS=y 123 122 CONFIG_SCSI_FC_ATTRS=y
-1
arch/powerpc/configs/powernv_defconfig
··· 108 108 CONFIG_BLK_DEV_SD=y 109 109 CONFIG_CHR_DEV_ST=m 110 110 CONFIG_BLK_DEV_SR=m 111 - CONFIG_BLK_DEV_SR_VENDOR=y 112 111 CONFIG_CHR_DEV_SG=m 113 112 CONFIG_SCSI_CONSTANTS=y 114 113 CONFIG_SCSI_SCAN_ASYNC=y
-1
arch/powerpc/configs/ppc64_defconfig
··· 110 110 CONFIG_BLK_DEV_SD=y 111 111 CONFIG_CHR_DEV_ST=m 112 112 CONFIG_BLK_DEV_SR=y 113 - CONFIG_BLK_DEV_SR_VENDOR=y 114 113 CONFIG_CHR_DEV_SG=y 115 114 CONFIG_SCSI_CONSTANTS=y 116 115 CONFIG_SCSI_FC_ATTRS=y
-1
arch/powerpc/configs/ppc64e_defconfig
··· 60 60 CONFIG_BLK_DEV_SD=y 61 61 CONFIG_CHR_DEV_ST=y 62 62 CONFIG_BLK_DEV_SR=y 63 - CONFIG_BLK_DEV_SR_VENDOR=y 64 63 CONFIG_CHR_DEV_SG=y 65 64 CONFIG_SCSI_CONSTANTS=y 66 65 CONFIG_SCSI_FC_ATTRS=y
-1
arch/powerpc/configs/ppc6xx_defconfig
··· 368 368 CONFIG_CHR_DEV_ST=m 369 369 CONFIG_CHR_DEV_OSST=m 370 370 CONFIG_BLK_DEV_SR=m 371 - CONFIG_BLK_DEV_SR_VENDOR=y 372 371 CONFIG_CHR_DEV_SG=y 373 372 CONFIG_CHR_DEV_SCH=m 374 373 CONFIG_SCSI_ENCLOSURE=m
-1
arch/powerpc/configs/pseries_defconfig
··· 97 97 CONFIG_BLK_DEV_SD=y 98 98 CONFIG_CHR_DEV_ST=m 99 99 CONFIG_BLK_DEV_SR=y 100 - CONFIG_BLK_DEV_SR_VENDOR=y 101 100 CONFIG_CHR_DEV_SG=y 102 101 CONFIG_SCSI_CONSTANTS=y 103 102 CONFIG_SCSI_FC_ATTRS=y
-1
arch/powerpc/configs/skiroot_defconfig
··· 84 84 # CONFIG_OCXL is not set 85 85 CONFIG_BLK_DEV_SD=m 86 86 CONFIG_BLK_DEV_SR=m 87 - CONFIG_BLK_DEV_SR_VENDOR=y 88 87 CONFIG_CHR_DEV_SG=m 89 88 CONFIG_SCSI_CONSTANTS=y 90 89 CONFIG_SCSI_SCAN_ASYNC=y
-1
arch/sh/configs/sh03_defconfig
··· 46 46 CONFIG_SCSI=m 47 47 CONFIG_BLK_DEV_SD=m 48 48 CONFIG_BLK_DEV_SR=m 49 - CONFIG_BLK_DEV_SR_VENDOR=y 50 49 CONFIG_CHR_DEV_SG=m 51 50 CONFIG_NETDEVICES=y 52 51 CONFIG_NET_ETHERNET=y
-1
arch/sparc/configs/sparc64_defconfig
··· 73 73 CONFIG_SCSI=y 74 74 CONFIG_BLK_DEV_SD=y 75 75 CONFIG_BLK_DEV_SR=m 76 - CONFIG_BLK_DEV_SR_VENDOR=y 77 76 CONFIG_CHR_DEV_SG=m 78 77 CONFIG_SCSI_MULTI_LUN=y 79 78 CONFIG_SCSI_CONSTANTS=y
-1
arch/x86/configs/i386_defconfig
··· 137 137 CONFIG_BLK_DEV_LOOP=y 138 138 CONFIG_BLK_DEV_SD=y 139 139 CONFIG_BLK_DEV_SR=y 140 - CONFIG_BLK_DEV_SR_VENDOR=y 141 140 CONFIG_CHR_DEV_SG=y 142 141 CONFIG_SCSI_CONSTANTS=y 143 142 CONFIG_SCSI_SPI_ATTRS=y
-1
arch/x86/configs/x86_64_defconfig
··· 135 135 CONFIG_BLK_DEV_LOOP=y 136 136 CONFIG_BLK_DEV_SD=y 137 137 CONFIG_BLK_DEV_SR=y 138 - CONFIG_BLK_DEV_SR_VENDOR=y 139 138 CONFIG_CHR_DEV_SG=y 140 139 CONFIG_SCSI_CONSTANTS=y 141 140 CONFIG_SCSI_SPI_ATTRS=y
-9
drivers/scsi/Kconfig
··· 115 115 <file:Documentation/scsi/scsi.txt>. 116 116 The module will be called sr_mod. 117 117 118 - config BLK_DEV_SR_VENDOR 119 - bool "Enable vendor-specific extensions (for SCSI CDROM)" 120 - depends on BLK_DEV_SR 121 - help 122 - This enables the usage of vendor specific SCSI commands. This is 123 - required to support multisession CDs with old NEC/TOSHIBA cdrom 124 - drives (and HP Writers). If you have such a drive and get the first 125 - session only, try saying Y here; everybody else says N. 126 - 127 118 config CHR_DEV_SG 128 119 tristate "SCSI generic support" 129 120 depends on SCSI
-8
drivers/scsi/sr_vendor.c
··· 67 67 68 68 void sr_vendor_init(Scsi_CD *cd) 69 69 { 70 - #ifndef CONFIG_BLK_DEV_SR_VENDOR 71 - cd->vendor = VENDOR_SCSI3; 72 - #else 73 70 const char *vendor = cd->device->vendor; 74 71 const char *model = cd->device->model; 75 72 ··· 115 118 CDC_PLAY_AUDIO 116 119 ); 117 120 } 118 - #endif 119 121 } 120 122 121 123 ··· 128 132 struct ccs_modesel_head *modesel; 129 133 int rc, density = 0; 130 134 131 - #ifdef CONFIG_BLK_DEV_SR_VENDOR 132 135 if (cd->vendor == VENDOR_TOSHIBA) 133 136 density = (blocklength > 2048) ? 0x81 : 0x83; 134 - #endif 135 137 136 138 buffer = kmalloc(512, GFP_KERNEL | GFP_DMA); 137 139 if (!buffer) ··· 217 223 } 218 224 break; 219 225 220 - #ifdef CONFIG_BLK_DEV_SR_VENDOR 221 226 case VENDOR_NEC:{ 222 227 unsigned long min, sec, frame; 223 228 cgc.cmd[0] = 0xde; ··· 309 316 sector = buffer[11] + (buffer[10] << 8) + 310 317 (buffer[9] << 16) + (buffer[8] << 24); 311 318 break; 312 - #endif /* CONFIG_BLK_DEV_SR_VENDOR */ 313 319 314 320 default: 315 321 /* should not happen */