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

Commit f5718726 authored by David Gibson's avatar David Gibson Committed by Benjamin Herrenschmidt
Browse files

powerpc: Move Power Macintosh drivers to generic byteswappers 



ppc has special instruction forms to efficiently load and store values
in non-native endianness.  These can be accessed via the arch-specific
{ld,st}_le{16,32}() inlines in arch/powerpc/include/asm/swab.h.

However, gcc is perfectly capable of generating the byte-reversing
load/store instructions when using the normal, generic cpu_to_le*() and
le*_to_cpu() functions eaning the arch-specific functions don't have much
point.

Worse the "le" in the names of the arch specific functions is now
misleading, because they always generate byte-reversing forms, but some
ppc machines can now run a little-endian kernel.

To start getting rid of the arch-specific forms, this patch removes them
from all the old Power Macintosh drivers, replacing them with the
generic byteswappers.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 9eccca08

arch/powerpc/include/asm/dbdma.h

+6 −6
Original line number Diff line number Diff line
@@ -42,12 +42,12 @@ struct dbdma_regs { 
 * DBDMA command structure.  These fields are all little-endian!

 */

struct dbdma_cmd {

    unsigned short req_count;	/* requested byte transfer count */

    unsigned short command;	/* command word (has bit-fields) */

    unsigned int   phy_addr;	/* physical data address */

    unsigned int   cmd_dep;	/* command-dependent field */

    unsigned short res_count;	/* residual count after completion */

    unsigned short xfer_status;	/* transfer status */

	__le16 req_count;	/* requested byte transfer count */

	__le16 command;		/* command word (has bit-fields) */

	__le32 phy_addr;	/* physical data address */

	__le32 cmd_dep;		/* command-dependent field */

	__le16 res_count;	/* residual count after completion */

	__le16 xfer_status;	/* transfer status */

};



/* DBDMA command values in command field */

arch/powerpc/include/asm/vga.h

+2 −2
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@ 


static inline void scr_writew(u16 val, volatile u16 *addr)

{

    st_le16(addr, val);

	*addr = cpu_to_le16(val);

}



static inline u16 scr_readw(volatile const u16 *addr)

{

    return ld_le16(addr);

	return le16_to_cpu(*addr);

}



#define VT_BUF_HAVE_MEMCPYW

drivers/ata/pata_macio.c

+5 −5
Original line number Diff line number Diff line
@@ -540,9 +540,9 @@ static void pata_macio_qc_prep(struct ata_queued_cmd *qc) 
			BUG_ON (pi++ >= MAX_DCMDS);



			len = (sg_len < MAX_DBDMA_SEG) ? sg_len : MAX_DBDMA_SEG;

			st_le16(&table->command, write ? OUTPUT_MORE: INPUT_MORE);

			st_le16(&table->req_count, len);

			st_le32(&table->phy_addr, addr);

			table->command = cpu_to_le16(write ? OUTPUT_MORE: INPUT_MORE);

			table->req_count = cpu_to_le16(len);

			table->phy_addr = cpu_to_le32(addr);

			table->cmd_dep = 0;

			table->xfer_status = 0;

			table->res_count = 0;
@@ -557,12 +557,12 @@ static void pata_macio_qc_prep(struct ata_queued_cmd *qc) 


	/* Convert the last command to an input/output */

	table--;

	st_le16(&table->command, write ? OUTPUT_LAST: INPUT_LAST);

	table->command = cpu_to_le16(write ? OUTPUT_LAST: INPUT_LAST);

	table++;



	/* Add the stop command to the end of the list */

	memset(table, 0, sizeof(struct dbdma_cmd));

	st_le16(&table->command, DBDMA_STOP);

	table->command = cpu_to_le16(DBDMA_STOP);



	dev_dbgdma(priv->dev, "%s: %d DMA list entries\n", __func__, pi);

}

drivers/block/swim3.c

+6 −6
Original line number Diff line number Diff line
@@ -440,9 +440,9 @@ static inline void seek_track(struct floppy_state *fs, int n) 
static inline void init_dma(struct dbdma_cmd *cp, int cmd,

			    void *buf, int count)

{

	st_le16(&cp->req_count, count);

	st_le16(&cp->command, cmd);

	st_le32(&cp->phy_addr, virt_to_bus(buf));

	cp->req_count = cpu_to_le16(count);

	cp->command = cpu_to_le16(cmd);

	cp->phy_addr = cpu_to_le32(virt_to_bus(buf));

	cp->xfer_status = 0;

}
@@ -771,8 +771,8 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id) 
		}

		/* turn off DMA */

		out_le32(&dr->control, (RUN | PAUSE) << 16);

		stat = ld_le16(&cp->xfer_status);

		resid = ld_le16(&cp->res_count);

		stat = le16_to_cpu(cp->xfer_status);

		resid = le16_to_cpu(cp->res_count);

		if (intr & ERROR_INTR) {

			n = fs->scount - 1 - resid / 512;

			if (n > 0) {
@@ -1170,7 +1170,7 @@ static int swim3_add_device(struct macio_dev *mdev, int index) 


	fs->dma_cmd = (struct dbdma_cmd *) DBDMA_ALIGN(fs->dbdma_cmd_space);

	memset(fs->dma_cmd, 0, 2 * sizeof(struct dbdma_cmd));

	st_le16(&fs->dma_cmd[1].command, DBDMA_STOP);

	fs->dma_cmd[1].command = cpu_to_le16(DBDMA_STOP);



	if (mdev->media_bay == NULL || check_media_bay(mdev->media_bay) == MB_FD)

		swim3_mb_event(mdev, MB_FD);

drivers/ide/pmac.c

+5 −5
Original line number Diff line number Diff line
@@ -1497,9 +1497,9 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd) 
				       drive->name);

				return 0;

			}

			st_le16(&table->command, wr? OUTPUT_MORE: INPUT_MORE);

			st_le16(&table->req_count, tc);

			st_le32(&table->phy_addr, cur_addr);

			table->command = cpu_to_le16(wr? OUTPUT_MORE: INPUT_MORE);

			table->req_count = cpu_to_le16(tc);

			table->phy_addr = cpu_to_le32(cur_addr);

			table->cmd_dep = 0;

			table->xfer_status = 0;

			table->res_count = 0;
@@ -1513,10 +1513,10 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd) 


	/* convert the last command to an input/output last command */

	if (count) {

		st_le16(&table[-1].command, wr? OUTPUT_LAST: INPUT_LAST);

		table[-1].command = cpu_to_le16(wr? OUTPUT_LAST: INPUT_LAST);

		/* add the stop command to the end of the list */

		memset(table, 0, sizeof(struct dbdma_cmd));

		st_le16(&table->command, DBDMA_STOP);

		table->command = cpu_to_le16(DBDMA_STOP);

		mb();

		writel(hwif->dmatable_dma, &dma->cmdptr);

		return 1;