Gitlab 现已全面支持 git over ssh 与 git over https。通过 HTTPS 访问请配置带有 read_repository / write_repository 权限的 Personal access token。通过 SSH 端口访问请使用 22 端口或 13389 端口。如果使用CAS注册了账户但不知道密码，可以自行至设置中更改；如有其他问题，请发邮件至 service@cra.moe 寻求协助。

Commit 062f9f02 authored Feb 01, 2008 by Bartlomiej Zolnierkiewicz

ide: use ide_build_sglist() and ide_destroy_dmatable() in non-PCI host drivers



* Make ide_build_sglist() and ide_destroy_dmatable() available also when
  CONFIG_BLK_DEV_IDEDMA_PCI=n.

* Use ide_build_sglist() and ide_destroy_dmatable() in {ics,au1xxx-}ide.c
  and remove no longer needed {ics,au}ide_build_sglist().

There should be no functionality changes caused by this patch.

Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

parent 5c05ff68

drivers/ide/arm/icside.c

+2 −19

Original line number	Original line	Diff line number	Diff line
	@@ -204,22 +204,6 @@ static void icside_maskproc(ide_drive_t *drive, int mask)
	* interfaces use the same IRQ, which should guarantee this.		* interfaces use the same IRQ, which should guarantee this.
	*/		*/

	static void icside_build_sglist(ide_drive_t drive, struct request rq)
	{
	ide_hwif_t *hwif = drive->hwif;
	struct scatterlist *sg = hwif->sg_table;

	ide_map_sg(drive, rq);

	if (rq_data_dir(rq) == READ)
	hwif->sg_dma_direction = DMA_FROM_DEVICE;
	else
	hwif->sg_dma_direction = DMA_TO_DEVICE;

	hwif->sg_nents = dma_map_sg(hwif->dev, sg, hwif->sg_nents,
	hwif->sg_dma_direction);
	}

	/*		/*
	* Configure the IOMD to give the appropriate timings for the transfer		* Configure the IOMD to give the appropriate timings for the transfer
	* mode being requested. We take the advice of the ATA standards, and		* mode being requested. We take the advice of the ATA standards, and
	@@ -298,8 +282,7 @@ static int icside_dma_end(ide_drive_t *drive)
	disable_dma(ec->dma);		disable_dma(ec->dma);

	/* Teardown mappings after DMA has completed. */		/* Teardown mappings after DMA has completed. */
	dma_unmap_sg(hwif->dev, hwif->sg_table, hwif->sg_nents,		ide_destroy_dmatable(drive);
	hwif->sg_dma_direction);

	return get_dma_residue(ec->dma) != 0;		return get_dma_residue(ec->dma) != 0;
	}		}
	@@ -331,7 +314,7 @@ static int icside_dma_setup(ide_drive_t *drive)
	*/		*/
	BUG_ON(dma_channel_active(ec->dma));		BUG_ON(dma_channel_active(ec->dma));

	icside_build_sglist(drive, rq);		hwif->sg_nents = ide_build_sglist(drive, rq);

	/*		/*
	* Ensure that we have the right interrupt routed.		* Ensure that we have the right interrupt routed.

drivers/ide/ide-dma.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -170,7 +170,6 @@ static int ide_dma_good_drive(ide_drive_t *drive)
	return ide_in_drive_list(drive->id, drive_whitelist);		return ide_in_drive_list(drive->id, drive_whitelist);
	}		}

	#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
	/**		/**
	* ide_build_sglist - map IDE scatter gather for DMA I/O		* ide_build_sglist - map IDE scatter gather for DMA I/O
	* @drive: the drive to build the DMA table for		* @drive: the drive to build the DMA table for
	@@ -200,6 +199,7 @@ int ide_build_sglist(ide_drive_t drive, struct request rq)

	EXPORT_SYMBOL_GPL(ide_build_sglist);		EXPORT_SYMBOL_GPL(ide_build_sglist);

			#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
	/**		/**
	* ide_build_dmatable - build IDE DMA table		* ide_build_dmatable - build IDE DMA table
	*		*
	@@ -294,6 +294,7 @@ use_pio_instead:
	}		}

	EXPORT_SYMBOL_GPL(ide_build_dmatable);		EXPORT_SYMBOL_GPL(ide_build_dmatable);
			#endif

	/**		/**
	* ide_destroy_dmatable - clean up DMA mapping		* ide_destroy_dmatable - clean up DMA mapping
	@@ -316,6 +317,7 @@ void ide_destroy_dmatable (ide_drive_t *drive)

	EXPORT_SYMBOL_GPL(ide_destroy_dmatable);		EXPORT_SYMBOL_GPL(ide_destroy_dmatable);

			#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
	/**		/**
	* config_drive_for_dma - attempt to activate IDE DMA		* config_drive_for_dma - attempt to activate IDE DMA
	* @drive: the drive to place in DMA mode		* @drive: the drive to place in DMA mode

drivers/ide/mips/au1xxx-ide.c

+3 −25

Original line number	Original line	Diff line number	Diff line
	@@ -209,23 +209,6 @@ static void auide_set_dma_mode(ide_drive_t *drive, const u8 speed)
	*/		*/

	#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA		#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA

	static int auide_build_sglist(ide_drive_t drive, struct request rq)
	{
	ide_hwif_t *hwif = drive->hwif;
	struct scatterlist *sg = hwif->sg_table;

	ide_map_sg(drive, rq);

	if (rq_data_dir(rq) == READ)
	hwif->sg_dma_direction = DMA_FROM_DEVICE;
	else
	hwif->sg_dma_direction = DMA_TO_DEVICE;

	return dma_map_sg(hwif->dev, sg, hwif->sg_nents,
	hwif->sg_dma_direction);
	}

	static int auide_build_dmatable(ide_drive_t *drive)		static int auide_build_dmatable(ide_drive_t *drive)
	{		{
	int i, iswrite, count = 0;		int i, iswrite, count = 0;
	@@ -240,8 +223,7 @@ static int auide_build_dmatable(ide_drive_t *drive)
	/* Save for interrupt context */		/* Save for interrupt context */
	ahwif->drive = drive;		ahwif->drive = drive;

	/* Build sglist */		hwif->sg_nents = i = ide_build_sglist(drive, rq);
	hwif->sg_nents = i = auide_build_sglist(drive, rq);

	if (!i)		if (!i)
	return 0;		return 0;
	@@ -299,10 +281,7 @@ static int auide_build_dmatable(ide_drive_t *drive)
	return 1;		return 1;

	use_pio_instead:		use_pio_instead:
	dma_unmap_sg(hwif->dev,		ide_destroy_dmatable(drive);
	hwif->sg_table,
	hwif->sg_nents,
	hwif->sg_dma_direction);

	return 0; /* revert to PIO for this request */		return 0; /* revert to PIO for this request */
	}		}
	@@ -312,8 +291,7 @@ static int auide_dma_end(ide_drive_t *drive)
	ide_hwif_t *hwif = HWIF(drive);		ide_hwif_t *hwif = HWIF(drive);

	if (hwif->sg_nents) {		if (hwif->sg_nents) {
	dma_unmap_sg(hwif->dev, hwif->sg_table, hwif->sg_nents,		ide_destroy_dmatable(drive);
	hwif->sg_dma_direction);
	hwif->sg_nents = 0;		hwif->sg_nents = 0;
	}		}

include/linux/ide.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1155,10 +1155,11 @@ void ide_dma_on(ide_drive_t *);
	int ide_set_dma(ide_drive_t *);		int ide_set_dma(ide_drive_t *);
	ide_startstop_t ide_dma_intr(ide_drive_t *);		ide_startstop_t ide_dma_intr(ide_drive_t *);

			int ide_build_sglist(ide_drive_t , struct request );
			void ide_destroy_dmatable(ide_drive_t *);

	#ifdef CONFIG_BLK_DEV_IDEDMA_PCI		#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
	extern int ide_build_sglist(ide_drive_t , struct request );
	extern int ide_build_dmatable(ide_drive_t , struct request );		extern int ide_build_dmatable(ide_drive_t , struct request );
	extern void ide_destroy_dmatable(ide_drive_t *);
	extern int ide_release_dma(ide_hwif_t *);		extern int ide_release_dma(ide_hwif_t *);
	extern void ide_setup_dma(ide_hwif_t *, unsigned long);		extern void ide_setup_dma(ide_hwif_t *, unsigned long);

CRA Git | Maintained and supported by SUSTech CRA and CCSE